现场一些bug问题修改

diff --git a/payapi/src/main/resources/data.sql b/payapi/src/main/resources/data.sql
index 362bc3c..0e592a6 100644 (file)
--- a/payapi/src/main/resources/data.sql
+++ b/payapi/src/main/resources/data.sql
@@ -568,12 +568,12 @@ VALUES ('DAYENDSETTLETASK', '日终结算', '0', '20190619100600', '{tenantid}')
 INSERT INTO "tb_shop" ("shopid", "shopname", "shoptype", "fshopid", "status", "opendate", "tenantid")
 VALUES (1, '支付中心', 'root', 0, 'normal', '20190517', '{tenantid}');
 
-INSERT INTO "tb_transcode" ("transcode", "transname", "tenantid")
-VALUES (3010, '市民卡代扣', '{tenantid}');
-INSERT INTO "tb_transcode" ("transcode", "transname", "tenantid")
-VALUES (1002, '支付码聚合付', '{tenantid}');
-INSERT INTO "tb_transcode" ("transcode", "transname", "tenantid")
-VALUES (3500, '账户充值', '{tenantid}');
+INSERT INTO "tb_transcode" ("transcode_id", "transcode", "transname", "tenantid")
+VALUES (1, 3010, '市民卡代扣', '{tenantid}');
+INSERT INTO "tb_transcode" ("transcode_id", "transcode", "transname", "tenantid")
+VALUES (2, 1002, '支付码聚合付', '{tenantid}');
+INSERT INTO "tb_transcode" ("transcode_id", "transcode", "transname", "tenantid")
+VALUES (3, 3500, '账户充值', '{tenantid}');
 
 INSERT INTO "tb_dictionary" ("id", "dictval", "dicttype", "dictcaption", "dicttypename", "tenantid")
 VALUES (1, 'cancel', 'reverseFlagList', '被撤销', '冲正状态', '{tenantid}');

diff --git a/payapi/src/main/resources/static/libs/custom.js b/payapi/src/main/resources/static/libs/custom.js
index 12564c2..c2b560a 100644 (file)
--- a/payapi/src/main/resources/static/libs/custom.js
+++ b/payapi/src/main/resources/static/libs/custom.js
@@ -66,6 +66,7 @@
                     .addNewDict("sexList")
                     .addNewDict("accountStatusList")
                     .addNewDict("allSubjectList")
+                    .addNewDict("transcodeList")
             },
             getDict: function (dictType) {
                 var dict, that = this;

diff --git a/payapi/src/main/resources/templates/system/dtl/shopdtl.html b/payapi/src/main/resources/templates/system/dtl/shopdtl.html
index ecebe4e..5720449 100644 (file)
--- a/payapi/src/main/resources/templates/system/dtl/shopdtl.html
+++ b/payapi/src/main/resources/templates/system/dtl/shopdtl.html
@@ -27,7 +27,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">支付方式</label>
                     <div class="layui-input-block" style="height: 38px;">
-                        <select name="sourceType" id="shopdtl-search-sourceType" class="layui-select">
+                        <select name="sourcetype" id="shopdtl-search-sourcetype" class="layui-select">
                             <option value=""> 全部</option>
                             <option th:each="pt:${paytypelist}" th:value="${pt.sourceType}"
                                     th:text="${pt.paydesc}"></option>
@@ -38,7 +38,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">状态</label>
                     <div class="layui-input-block" style="height: 38px;">
-                        <select name="transStatus" id="shopdtl-search-transStatus" class="layui-select">
+                        <select name="status" id="shopdtl-search-status" class="layui-select">
                             <option value=""> 全部</option>
                             <option th:each="st:${dtlStatusList}" th:value="${st.dictval}"
                                     th:text="${st.dictcaption}"></option>
@@ -182,12 +182,12 @@
                     endAccdate: $("#shopdtl-search-endAccdate").val(),
                     startTransdate: $("#shopdtl-search-startTransdate").val(),
                     endTransdate: $("#shopdtl-search-endTransdate").val(),
-                    personname: $("#shopdtl-search-personname").val(),
+                    shopname: $("#shopdtl-search-shopname").val(),
                     shopaccno: $("#shopdtl-search-shopaccno").val(),
-                    sourceType: $("#shopdtl-search-sourceType").val(),
+                    sourcetype: $("#shopdtl-search-sourcetype").val(),
                     tradeflag: $("#shopdtl-search-tradeflag").val(),
                     transcode: $("#shopdtl-search-transcode").val(),
-                    transStatus: $("#shopdtl-search-transStatus").val()
+                    status: $("#shopdtl-search-status").val()
                 }, page: {curr: 1}
             });
         });
@@ -200,10 +200,10 @@
                 "endTransdate": "",
                 "shopname": "",
                 "shopaccno": "",
-                "sourceType": "",
+                "sourcetype": "",
                 "tradeflag": "",
                 "transcode": "",
-                "transStatus": ""
+                "status": ""
             });
             form.render("select");
             treeSelect.revokeNode('shopdtl-search-shopaccno-filter');

diff --git a/payapi/src/main/resources/templates/system/report/shopbusiness.html b/payapi/src/main/resources/templates/system/report/shopbusiness.html
index 9638612..49a512a 100644 (file)
--- a/payapi/src/main/resources/templates/system/report/shopbusiness.html
+++ b/payapi/src/main/resources/templates/system/report/shopbusiness.html
@@ -8,18 +8,20 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form" lay-filter="shopbusiness-search-form">
-            <input type="hidden" id="shopbusiness-hidden-maxdate" th:value="${maxdate}" />
+            <input type="hidden" id="shopbusiness-hidden-maxdate" th:value="${maxdate}"/>
             <input type="hidden" id="shopbusiness-hidden-parentId" value="0"/>
             <div class="layui-form-item" style="margin-bottom: 0;">
                 <div class="layui-inline">
                     <label class="layui-form-label">记账日期</label>
                     <div class="layui-input-inline">
-                        <input type="text" name="startdate" id="shopbusiness-search-startdate" placeholder="起始日期" th:value="${maxdate}"
+                        <input type="text" name="startdate" id="shopbusiness-search-startdate" placeholder="起始日期"
+                               th:value="${maxdate}"
                                autocomplete="off" class="layui-input"/>
                     </div>
                     <div class="layui-form-mid">-</div>
                     <div class="layui-input-inline">
-                        <input type="text" name="enddate" id="shopbusiness-search-enddate" placeholder="截止日期" th:value="${maxdate}"
+                        <input type="text" name="enddate" id="shopbusiness-search-enddate" placeholder="截止日期"
+                               th:value="${maxdate}"
                                autocomplete="off" class="layui-input"/>
                     </div>
                 </div>
@@ -27,14 +29,16 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">选择商户</label>
                     <div class="layui-input-block">
-                        <input type="text" name="shopid" id="shopbusiness-search-shopid" placeholder="选择商户" lay-filter="shopbusiness-search-shopid-filter"
+                        <input type="text" name="shopid" id="shopbusiness-search-shopid" placeholder="选择商户"
+                               lay-filter="shopbusiness-search-shopid-filter"
                                autocomplete="off" class="layui-input"/>
                     </div>
                 </div>
 
                 <div class="layui-inline">
                     <div class="layui-input-block" style="margin-left: 0;">
-                        <input type="checkbox" name="nodealshow" id="shopbusiness-search-nodealshow" lay-skin="primary" title="显示未交易商户"/>
+                        <input type="checkbox" name="nodealshow" id="shopbusiness-search-nodealshow" lay-skin="primary"
+                               title="显示未交易商户"/>
                     </div>
                 </div>
 
@@ -54,7 +58,8 @@
 <script type="text/html" id="shopbusiness-toolbar">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" id="btn-fold-shopbusiness" lay-event="shopbusinessShowFold">全部折叠</button>
-        <button class="layui-btn layui-btn-sm" id="btn-expand-shopbusiness" lay-event="shopbusinessExpandAll">全部展开</button>
+        <button class="layui-btn layui-btn-sm" id="btn-expand-shopbusiness" lay-event="shopbusinessExpandAll">全部展开
+        </button>
     </div>
 </script>
 
@@ -124,13 +129,17 @@
                 page: false,
                 where: obj,
                 showicon: false,
-                toolbar:'#shopbusiness-toolbar',
+                toolbar: '#shopbusiness-toolbar',
                 cols: [
                     [
                         {field: 'shopname', title: '商户名称', align: 'left'},
                         {field: 'summary', title: '交易摘要', align: 'center'},
                         {field: 'transcnt', title: '交易次数', align: 'center'},
-                        {field: 'transamt', title: '交易金额', align: 'center'}
+                        {
+                            field: 'transamt', title: '交易金额', align: 'center', templet: function (e) {
+                                return parseFloat(e.transamt).toFixed(2);
+                            }
+                        }
                     ]
                 ],
                 done: function (res, curr, count) {
@@ -167,8 +176,8 @@
             });
         });
 
-        table.on('toolbar(shopbusinessTable-filter)', function(obj){
-            switch(obj.event){
+        table.on('toolbar(shopbusinessTable-filter)', function (obj) {
+            switch (obj.event) {
                 case 'shopbusinessShowFold':
                     treetable.foldAll('#shopbusinessTable');
                     break;

diff --git a/payapi/src/main/resources/templates/system/report/subjectdetail.html b/payapi/src/main/resources/templates/system/report/subjectdetail.html
index f1b65e9..ab46d99 100644 (file)
--- a/payapi/src/main/resources/templates/system/report/subjectdetail.html
+++ b/payapi/src/main/resources/templates/system/report/subjectdetail.html
@@ -26,7 +26,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">选择科目</label>
                     <div class="layui-input-block">
-                        <input type="text" name="subjid" id="subjectdetail-search-subjid" placeholder="选择科目" lay-filter="subjectdetail-search-subjid-filter"
+                        <input type="text" name="subjno" id="subjectdetail-search-subjno" placeholder="选择科目" lay-filter="subjectdetail-search-subjno-filter"
                                autocomplete="off" class="layui-input"/>
                     </div>
                 </div>
@@ -72,7 +72,7 @@
         });
 
         treeSelect.render({
-            elem: '#subjectdetail-search-subjid',
+            elem: '#subjectdetail-search-subjno',
             data: '[[@{/report/subjectselecttree}]]',
             type: 'get',
             placeholder: '选择科目',
@@ -92,7 +92,7 @@
                 if(treeNode.accno == '0'){
                     layer.msg("请选择末级科目", {icon: 2, time:1500});
                     $("#subjectdetail-search-subjid").val("");
-                    treeSelect.revokeNode('subjectdetail-search-subjid-filter');
+                    treeSelect.revokeNode('subjectdetail-search-subjno-filter');
                     return false;
                 }
                 return true;
@@ -141,14 +141,14 @@
         renderTable({
             startdate: $('#subjectdetail-search-startdate').val(),
             enddate: $('#subjectdetail-search-enddate').val(),
-            subjid: null
+            subjno: null
         })
 
 
         $('#subjectdetail-search-btn').click(function () {
             var startdate = $("#subjectdetail-search-startdate").val();
             var enddate = $("#subjectdetail-search-enddate").val();
-            var subjid = $("#subjectdetail-search-subjid").val();
+            var subjid = $("#subjectdetail-search-subjno").val();
             if (null == startdate || "" == $.trim(startdate)) {
                 layer.msg('请选择起始日期', {icon: 2, time: 1500});
                 return;
@@ -165,7 +165,7 @@
             renderTable({
                 startdate: startdate,
                 enddate: enddate,
-                subjid: subjid
+                subjno: subjid
             })
         });