为 sourcetype 增加了 paysubjno, depositesubjno
diff --git a/payapi/src/main/resources/data.sql b/payapi/src/main/resources/data.sql
index f1d7f88..ac1da71 100644
--- a/payapi/src/main/resources/data.sql
+++ b/payapi/src/main/resources/data.sql
@@ -439,23 +439,23 @@
INSERT INTO "tb_sourcetype" ("sourcetype_id", "sourcetype", "checkable", "paydesc", "enable", "charge_enable",
-"consume_enable", "anonymous_enable", "reversable", "asset_subjno", "tenantid")
-VALUES ('D3820D49DACA49199E36537F6719665F', 'citizenCard', 't', '大理市民卡', 't', 'f', 't', 'f', 't', '112234', '{tenantid}');
+"consume_enable", "anonymous_enable", "reversable", "pay_subjno", "deposite_subjno", "tenantid")
+VALUES ('D3820D49DACA49199E36537F6719665F', 'citizenCard', 't', '大理市民卡', 't', 'f', 't', 'f', 't', '112234', '-', '{tenantid}');
INSERT INTO "tb_sourcetype" ("sourcetype_id", "sourcetype", "checkable", "paydesc", "enable", "charge_enable",
-"consume_enable", "anonymous_enable", "reversable", "asset_subjno","tenantid")
-VALUES ('0997477F40904AD1A2E37FD15345CE00', 'balance', 'f', '账户余额', 't', 'f', 't', 'f', 't', '-', '{tenantid}');
+"consume_enable", "anonymous_enable", "reversable", "pay_subjno","deposite_subjno","tenantid")
+VALUES ('0997477F40904AD1A2E37FD15345CE00', 'balance', 'f', '账户余额', 't', 'f', 't', 'f', 't', '-', '-', '{tenantid}');
INSERT INTO "tb_sourcetype" ("sourcetype_id", "sourcetype", "checkable", "paydesc", "enable", "charge_enable",
-"consume_enable", "anonymous_enable", "reversable", ""asset_subjno",tenantid")
-VALUES ('F0CA47ADC0F24DFCA0D95DF4136CC2D0', 'thirdpart', 'f', '其他第三方支付', 't', 't', 'f', 'f', 'f','-', '{tenantid}');
+"consume_enable", "anonymous_enable", "reversable", "pay_subjno","deposite_subjno", "tenantid")
+VALUES ('F0CA47ADC0F24DFCA0D95DF4136CC2D0', 'thirdpart', 'f', '其他第三方支付', 't', 't', 'f', 'f', 'f','-','-', '{tenantid}');
INSERT INTO "tb_sourcetype" ("sourcetype_id", "sourcetype", "checkable", "paydesc", "enable", "charge_enable",
-"consume_enable", "anonymous_enable", "reversable", "asset_subjno","tenantid")
-VALUES ('F5B344726FA24BD896E70DEE3D3F46CA', 'swyktv5', 't', '一卡通支付', 't', 't', 't', 't', 't','-', '{tenantid}');
+"consume_enable", "anonymous_enable", "reversable", "pay_subjno","deposite_subjno","tenantid")
+VALUES ('F5B344726FA24BD896E70DEE3D3F46CA', 'swyktv5', 't', '一卡通支付', 't', 't', 't', 't', 't','-','-', '{tenantid}');
INSERT INTO "tb_sourcetype" ("sourcetype_id", "sourcetype", "checkable", "paydesc", "enable", "charge_enable",
-"consume_enable", "anonymous_enable", "reversable", "asset_subjno","tenantid")
-VALUES ('28EE54CD3B044CC197D6C5B0E309F8B8', 'alipay', 't', '支付宝', 't', 't', 't', 't', 'f', '112230', '{tenantid}');
+"consume_enable", "anonymous_enable", "reversable", "pay_subjno","deposite_subjno","tenantid")
+VALUES ('28EE54CD3B044CC197D6C5B0E309F8B8', 'alipay', 't', '支付宝', 't', 't', 't', 't', 'f', '112230','112210', '{tenantid}');
INSERT INTO "tb_sourcetype" ("sourcetype_id", "sourcetype", "checkable", "paydesc", "enable", "charge_enable",
-"consume_enable", "anonymous_enable", "reversable", "asset_subjno","tenantid")
-VALUES ('DAEF88B54B684347B2B83940C38C7671', 'wechat', 't', '微信支付', 't', 't', 't', 't', 'f', '112231', '{tenantid}');
+"consume_enable", "anonymous_enable", "reversable", "pay_subjno","deposite_subjno","tenantid")
+VALUES ('DAEF88B54B684347B2B83940C38C7671', 'wechat', 't', '微信支付', 't', 't', 't', 't', 'f', '112231','112211', '{tenantid}');
-- 支付方式
INSERT INTO TB_SOURCETYPE_CONFIG (ID, SOURCETYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE,GLOBALFLAG, "tenantid")
diff --git a/payapi/src/main/resources/static/libs/custom.js b/payapi/src/main/resources/static/libs/custom.js
index 21e9601..12564c2 100644
--- a/payapi/src/main/resources/static/libs/custom.js
+++ b/payapi/src/main/resources/static/libs/custom.js
@@ -65,6 +65,7 @@
.addNewDict("idtypeList")
.addNewDict("sexList")
.addNewDict("accountStatusList")
+ .addNewDict("allSubjectList")
},
getDict: function (dictType) {
var dict, that = this;
diff --git a/payapi/src/main/resources/templates/system/param/sourcetype.html b/payapi/src/main/resources/templates/system/param/sourcetype.html
index 32ed15d..74087c2 100644
--- a/payapi/src/main/resources/templates/system/param/sourcetype.html
+++ b/payapi/src/main/resources/templates/system/param/sourcetype.html
@@ -9,13 +9,16 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
搜索：
- <input id="search-global-sourceType" class="layui-input search-input" type="text" maxlength="40" style="width: 300px;"
+ <input id="search-global-sourceType" class="layui-input search-input" type="text" maxlength="40"
+ style="width: 300px;"
placeholder="输入支付方式查询"/>
<button id="btn-search-param" class="layui-btn icon-btn" data-type="search"><i class="layui-icon"></i>搜索
</button>
- <button id="btn-add-param" class="layui-btn icon-btn" data-type="add"><i class="layui-icon"></i>新 增
+ <button id="btn-add-param" class="layui-btn icon-btn" data-type="add"><i class="layui-icon"></i>新
+ 增
</button>
- <button id="btn-reset-param" class="layui-btn layui-btn-primary" data-type="reset"><i class="layui-icon"></i>清 空
+ <button id="btn-reset-param" class="layui-btn layui-btn-primary" data-type="reset"><i
+ class="layui-icon"></i>清 空
</button>
</div>
<table class="layui-table" id="sourcetypeTable" lay-filter="sourcetypeTable-filter"></table>
@@ -24,24 +27,29 @@
<!-- 表格状态列 -->
<script type="text/html" id="enable-tpl-state">
- <input type="checkbox" lay-filter="enable-tpl-state" value="{{d.sourceType}}" lay-skin="switch" lay-text="启用|关闭"
+ <input type="checkbox" lay-filter="enable-tpl-state" value="{{d.sourceType}}" lay-skin="switch"
+ lay-text="启用|关闭"
{{d.enable== true?'checked':''}}/>
</script>
<script type="text/html" id="chargeenable-tpl-state">
{{# if(d.enable == true){ }}
- <input type="checkbox" lay-filter="chargeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch" lay-text="启用|关闭"
+ <input type="checkbox" lay-filter="chargeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch"
+ lay-text="启用|关闭"
{{(d.enable== true && d.chargeEnable== true)?'checked':''}}/>
{{# }else{ }}
- <input type="checkbox" lay-filter="chargeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch" lay-text="启用|关闭"
+ <input type="checkbox" lay-filter="chargeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch"
+ lay-text="启用|关闭"
{{(d.enable== true && d.chargeEnable== true)?'checked':''}} disabled/>
{{# } }}
</script>
<script type="text/html" id="consumeenable-tpl-state">
{{# if(d.enable == true){ }}
- <input type="checkbox" lay-filter="consumeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch" lay-text="启用|关闭"
+ <input type="checkbox" lay-filter="consumeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch"
+ lay-text="启用|关闭"
{{(d.enable== true && d.consumeEnable== true)?'checked':''}}/>
{{# }else{ }}
- <input type="checkbox" lay-filter="consumeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch" lay-text="启用|关闭"
+ <input type="checkbox" lay-filter="consumeenable-tpl-state" value="{{d.sourceType}}" lay-skin="switch"
+ lay-text="启用|关闭"
{{(d.enable== true && d.consumeEnable== true)?'checked':''}} disabled/>
{{# } }}
</script>
@@ -91,8 +99,25 @@
page: true,
cols: [
[
- {field: 'sourceType', title: '支付方式', width: 200, align: 'center', fixed: 'left', sort: true},
- {field: 'paydesc', title: '名称', align: 'center', sort: true, edit:'text'},
+ {
+ field: 'sourceType',
+ title: '支付方式',
+ width: 130,
+ align: 'center',
+ fixed: 'left',
+ sort: true
+ },
+ {field: 'paydesc', title: '名称', align: 'center', sort: true, edit: 'text'},
+ {
+ field: 'paySubjno', title: '支付科目号', templet: function (item) {
+ return getTempDictValue('allSubjectList', item.paySubjno);
+ }
+ },
+ {
+ field: 'depositeSubjno', title: '充值科目号', templet: function (item) {
+ return getTempDictValue('allSubjectList', item.depositeSubjno);
+ }
+ },
{field: 'enable', title: '状态', align: 'center', templet: '#enable-tpl-state', sort: true},
{
field: 'chargeEnable',
@@ -169,7 +194,7 @@
_csrf: token
}, function (data) {
if (data.code === 200) {
- layer.msg(data.msg, {icon: 1, time:1000});
+ layer.msg(data.msg, {icon: 1, time: 1000});
table.reload('sourcetypeTable');
} else if (data.code === 401) {
layer.msg(data.msg, {icon: 2, time: 1500}, function () {
@@ -180,7 +205,7 @@
$(obj.elem).prop('checked', !obj.elem.checked);
form.render('checkbox');
}
- },function () {
+ }, function () {
layer.msg('请求失败了，请稍后再试', {icon: 2});
$(obj.elem).prop('checked', !obj.elem.checked);
form.render('checkbox');
@@ -242,7 +267,7 @@
var row = obj.data; //得到所在行所有键值
var newval = obj.value; //得到修改后的值
admin.go('[[@{/param/updatesourcetypename}]]', {
- sourcetype: row.sourceType,
+ sourcetype: row.sourceType,
paydesc: newval,
_csrf: $("meta[name='_csrf_token']").attr("value")
}, function (data) {
@@ -256,7 +281,7 @@
layer.msg(data.msg, {icon: 2});
table.reload('sourcetypeTable');
}
- },function () {
+ }, function () {
layer.msg('修改失败了，请稍后再试', {icon: 2});
table.reload('sourcetypeTable');
});
@@ -265,11 +290,11 @@
//监听单元格
table.on('tool(sourcetypeTable-filter)', function (obj) {
var data = obj.data;
- if('del' === obj.event){
+ if ('del' === obj.event) {
if (confirm("确定要删除支付方式[" + data.sourceType + "_" + data.paydesc + "]吗？")) {
layer.load(2);
admin.go('[[@{/param/deletesourcetype}]]', {
- sourcetype: data.sourceType,
+ sourcetype: data.sourceType,
_csrf: $("meta[name='_csrf_token']").attr("value")
}, function (data) {
console.log(data.code);
@@ -291,10 +316,10 @@
layer.msg('请求失败了，请稍后再试', {icon: 2});
});
}
- }else if('config' ===obj.event){
+ } else if ('config' === obj.event) {
admin.popupCenter({
title: "配置参数【" + data.sourceType + "_" + data.paydesc + "】",
- path: '[[@{/param/load4sourcetypeconfig}]]?sourcetype='+data.sourceType,
+ path: '[[@{/param/load4sourcetypeconfig}]]?sourcetype=' + data.sourceType,
area: '800px',
finish: function () {
table.reload('sourcetypeTable');
diff --git a/payapi/src/main/resources/templates/system/param/sourcetypeform.html b/payapi/src/main/resources/templates/system/param/sourcetypeform.html
index f99ad4c..2b9304d 100644
--- a/payapi/src/main/resources/templates/system/param/sourcetypeform.html
+++ b/payapi/src/main/resources/templates/system/param/sourcetypeform.html
@@ -14,6 +14,28 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label">支付科目号</label>
+ <div class="layui-input-block">
+ <select name="paySubjno">
+ <option value="-">不支持</option>
+ <option th:each="bean : ${subjectList}" th:value="${bean.subjno}"
+ th:text="${bean.subjname} + '(' + ${bean.subjno} + ')'">
+ </option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">充值科目号</label>
+ <div class="layui-input-block">
+ <select name="depositeSubjno">
+ <option value="-">不支持</option>
+ <option th:each="bean : ${subjectList}" th:value="${bean.subjno}"
+ th:text="${bean.subjname} + '(' + ${bean.subjno} + ')'">
+ </option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">状态</label>
<div class="layui-input-block">
<input name="enable" type="checkbox" lay-skin="switch" lay-text="启用|关闭" value="yes"
@@ -74,6 +96,7 @@
var admin = layui.admin;
var form = layui.form;
form.render('checkbox');
+ form.render('select');
form.verify({
"sourceType": function (e) {
var msg = "";