From 8d20290bb5daca87892b1e2cbdf75b1f179d013d Mon Sep 17 00:00:00 2001 From: Xia Kaixiang Date: Thu, 24 Oct 2019 15:54:51 +0800 Subject: [PATCH] =?utf8?q?=E7=8E=B0=E5=9C=BA=E8=A6=81=E6=B1=82=E4=BF=AE?= =?utf8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../dlpay/framework/dao/SubjectdayDao.java | 2 +- .../dlpay/framework/util/StringUtil.java | 39 +++++++++++++++++++ .../dlpay/system/bean/SubjectDayInfo.java | 2 + .../dlpay/system/bean/SubjectDayShowBean.java | 9 +++++ .../system/controller/ShopController.java | 5 +++ .../service/impl/SettleReportServiceImpl.java | 1 + .../api/service/impl/account_service_impl.kt | 4 +- .../service/impl/transaction_service_impl.kt | 7 ---- .../dlpay/api/service/transaction_service.kt | 7 ++++ .../templates/system/dtl/shopdtl.html | 38 +++++++++--------- .../templates/system/dtl/userdtl.html | 38 +++++++++--------- .../templates/system/param/sourcetype.html | 4 +- .../system/param/sourcetypeconfig.html | 4 +- .../system/param/sourcetypeform.html | 4 +- .../templates/system/report/subjectday.html | 31 +++++++++------ .../templates/system/shop/addshop.html | 21 +++++++--- .../templates/system/shop/config.html | 6 +-- .../templates/system/shop/configform.html | 6 +-- .../templates/system/shop/configpara.html | 4 +- .../templates/system/shop/index.html | 6 +-- .../templates/system/shop/opercheck.html | 8 ++-- .../templates/system/shop/shopdetail.html | 8 ++-- .../templates/system/shop/updateshop.html | 23 ++++++++--- 23 files changed, 182 insertions(+), 95 deletions(-) diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java index fb65662f..34deede8 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java @@ -36,7 +36,7 @@ public interface SubjectdayDao extends JpaRepository "from tb_subjectday where accdate=:accdate and tenantid=:tenantid and subjno in (select subjno from tb_subject where subjlevel=1 and tenantid=:tenantid) ", nativeQuery = true) FSubjectInfoBean getAllParentSubjectSumInfo(@Param("accdate") String accdate, @Param("tenantid") String tenantid); - @Query(value = "SELECT t.subjno AS subjno, t.subjname AS subjname,t.fsubjno AS fsubjno,t.subjlevel AS subjlevel,t.displayflag, " + + @Query(value = "SELECT t.subjno AS subjno, t.subjname AS subjname,t.fsubjno AS fsubjno,t.subjlevel AS subjlevel,t.balflag,t.displayflag, " + "a.begindrbal AS lastdaydrbal,a.begincrbal AS lastdaycrbal, " + "b.dramt AS dramt,b.cramt AS cramt,c.drbal AS drbal,c.crbal AS crbal " + "FROM tb_subject t " + diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java index ec68890d..628137b6 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java @@ -182,4 +182,43 @@ public class StringUtil { } org.apache.commons.beanutils.BeanUtils.populate(bean, data); } + + /** + * 企业营业执照编号有15位和18位，自2016年7月1日后，“三证合一、一照一码”后统一为18位社会信用代码 + * */ + public static boolean checkBusinessLicenseNo(String blno) { + if (isEmpty(blno)) return false; + String businessLicenseNo = blno.trim(); + if (businessLicenseNo.length() != 15 && businessLicenseNo.length() != 18) return false; //历史企业注册码15位，社会信用代码长度为18位 + + if (businessLicenseNo.length() == 15) { + java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("^[0-9A-Za-z]\\w{14}$"); + java.util.regex.Matcher match = pattern.matcher(businessLicenseNo); + return match.matches(); //15位注册码为历史问题，只校验格式 + } + + //18位社会信用代码判断 + java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("^([0-9ABCDEFGHJKLMNPQRTUWXY]{2})([0-9]{6})([0-9ABCDEFGHJKLMNPQRTUWXY]{9})([0-9Y])$"); + java.util.regex.Matcher match = pattern.matcher(businessLicenseNo); + if (!match.matches()) return false; //社会信用代码校验错误！ + + //验证最后一位 + String codeStr = "0123456789ABCDEFGHJKLMNPQRTUWXY"; //字符字典（字符下标为代码字符数值） + int[] ws = {1, 3, 9, 27, 19, 26, 16, 17, 20, 29, 25, 13, 8, 24, 10, 30, 28}; //权值 + String lastChar = businessLicenseNo.substring(businessLicenseNo.length() - 1); +// String prefixStr = businessLicenseNo.substring(0, businessLicenseNo.length() - 1); + int sum = 0; + for (int i = 0; i < 17; i++) { + sum += (codeStr.indexOf(businessLicenseNo.charAt(i)) * ws[i]); + } + int c18 = 31 - (sum % 31); + if (c18 == 31) { + if ("0".equals(lastChar)) return true; //第18位为0 + } else { + //0~30 查字典 + String cs18=String.valueOf(codeStr.charAt(c18)); //c18代表的字符 + if(cs18.equals(lastChar)) return true; + } + return false; + } } diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java index f31d5b51..34aa0af8 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java @@ -9,6 +9,8 @@ public interface SubjectDayInfo { Integer getSubjlevel(); + Integer getBalflag(); + String getDisplayflag(); Double getLastdaydrbal(); diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java index c36c2122..94ec1f18 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java @@ -5,6 +5,7 @@ public class SubjectDayShowBean { private String subjname; private String fsubjno; private Integer subjlevel; + private Integer balflag; private String displayflag; private Double lastdaydrbal; private Double lastdaycrbal; @@ -45,6 +46,14 @@ public class SubjectDayShowBean { this.subjlevel = subjlevel; } + public Integer getBalflag() { + return balflag; + } + + public void setBalflag(Integer balflag) { + this.balflag = balflag; + } + public String getDisplayflag() { return displayflag; } diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java index 3d1a9639..399d7281 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java @@ -146,7 +146,10 @@ public class ShopController { } else if (ShopTypes.NORMAL.toString().equals(shoptype) && (StringUtil.isEmpty(businessLicenseNo) || StringUtil.isEmpty(taxRegistrationNo) || StringUtil.isEmpty(addr) || StringUtil.isEmpty(legalPersonName) || StringUtil.isEmpty(legalPersonIdtype) || StringUtil.isEmpty(legalPersonIdno))) { return JsonResult.error("参数传递错误，结算商户必须填写商户营业信息！"); + }else if(!StringUtil.isEmpty(businessLicenseNo) && !StringUtil.checkBusinessLicenseNo(businessLicenseNo.trim())){ + return JsonResult.error("参数错误，请正确填写营业执照编号！"); } + TShop shop = new TShop(); shop.setFshopid(fshopid); shop.setShopname(shopname); @@ -227,6 +230,8 @@ public class ShopController { if (ShopTypes.NORMAL.toString().equals(oldShop.getShoptype()) && (StringUtil.isEmpty(businessLicenseNo) || StringUtil.isEmpty(taxRegistrationNo) || StringUtil.isEmpty(addr) || StringUtil.isEmpty(legalPersonName) || StringUtil.isEmpty(legalPersonIdtype) || StringUtil.isEmpty(legalPersonIdno))) { return JsonResult.error("参数传递错误，结算商户必须填写商户营业信息！"); + }else if(!StringUtil.isEmpty(businessLicenseNo) && !StringUtil.checkBusinessLicenseNo(businessLicenseNo.trim())){ + return JsonResult.error("参数错误，请正确填写营业执照编号！"); } TShop shop=new TShop(); diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java index e85609c6..7aaac690 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java @@ -59,6 +59,7 @@ public class SettleReportServiceImpl implements SettleReportService { bean.setSubjname(info.getSubjname()); bean.setFsubjno(info.getFsubjno() == null ? "-1" : info.getFsubjno()); bean.setSubjlevel(info.getSubjlevel()); + bean.setBalflag(info.getBalflag()); bean.setDisplayflag(info.getDisplayflag()); bean.setLastdaydrbal(info.getLastdaydrbal() == null ? 0.00 : info.getLastdaydrbal()); bean.setLastdaycrbal(info.getLastdaycrbal() == null ? 0.00 : info.getLastdaycrbal()); diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt index af771320..5bc63a9d 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt @@ -65,8 +65,8 @@ class AccountServiceImpl : AccountService { } dtl.befbal = account.availbal doRecalcAccountBalance(dtl, amount, account) - account.availbal += dtl.amount - account.balance += dtl.amount + account.availbal += amount + account.balance += amount val sameDay = DateUtil.sameDay(account.lasttranstime, systemUtilServcie.sysdatetime.sysdate) ?: false diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt index 2b43122b..5e431b77 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt @@ -5,7 +5,6 @@ import com.supwisdom.dlpay.api.dao.TransactionMainDao import com.supwisdom.dlpay.api.domain.* import com.supwisdom.dlpay.api.repositories.AccountService import com.supwisdom.dlpay.api.service.AccountUtilServcie -import com.supwisdom.dlpay.api.service.KafkaSendMsgService import com.supwisdom.dlpay.api.service.SourceTypeService import com.supwisdom.dlpay.api.service.TransactionService import com.supwisdom.dlpay.exception.TransactionCheckException @@ -36,9 +35,6 @@ class TransactionServiceImpl : TransactionService { @Autowired private lateinit var sourceTypeService: SourceTypeService - @Autowired - private lateinit var kafkaSendMsgService: KafkaSendMsgService - /// 公共函数部分 private fun preCheck(builder: TransactionBuilder) { @@ -388,9 +384,6 @@ class TransactionServiceImpl : TransactionService { transaction.endTime = systemUtilService.sysdatetime.sysdate transactionMainDao.save(transaction) - if (transaction.person && !transaction.personDtl.userid.isNullOrEmpty()) { - kafkaSendMsgService.sendJpushMessage(transaction.personDtl.userid, "交易提醒", "你有一笔${transaction.personDtl.amount}元的支出，点击查看详情", transaction.refno, mutableMapOf(), transaction.tenantid) - } return transaction } diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt index 4ab8b655..861212a2 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt @@ -63,6 +63,9 @@ class TransactionServiceProxy { @Autowired private lateinit var shopAccBalanceAsyncTask: ShopAccBalanceAsyncTask + @Autowired + private lateinit var kafkaSendMsgService: KafkaSendMsgService + fun init(builder: TransactionBuilder): TTransactionMain { try { @@ -95,6 +98,10 @@ class TransactionServiceProxy { if (it.shop) { shopAccBalanceAsyncTask.updateShopBalance(it.shopDtl) } + + if (it.person && !it.personDtl.userid.isNullOrEmpty()) { + kafkaSendMsgService.sendJpushMessage(it.personDtl.userid, "交易提醒", "你有一笔${it.personDtl.amount}元的支出，点击查看详情", it.refno, mutableMapOf(), it.tenantid) + } } } diff --git a/payapi/src/main/resources/templates/system/dtl/shopdtl.html b/payapi/src/main/resources/templates/system/dtl/shopdtl.html index 553409a3..e606eae5 100644 --- a/payapi/src/main/resources/templates/system/dtl/shopdtl.html +++ b/payapi/src/main/resources/templates/system/dtl/shopdtl.html @@ -217,7 +217,7 @@ cols: [ [ {field: 'refno', title: '参考号', align: 'center', width: 200, sort: true}, - {field: 'accdate', title: '记账日期', align: 'center', width: 100, sort: true}, + {field: 'accdate', title: '记账日期', align: 'center', width: 110, sort: true}, {field: 'transdesc', title: '交易描述', align: 'center', width: 175}, {field: 'shopname', title: '商户名称', align: 'center', width: 250}, { @@ -244,23 +244,23 @@ } } }, - { - field: 'tradeflag', - title: '类型', - align: 'center', - width: 60, - templet: function (item) { - if (item.tradeflag === 'in') { - return '收入'; - } else if (item.tradeflag === 'out') { - return '支出'; - } else { - return item.tradeflag; - } - } - }, - {field: 'transdate', title: '交易日期', align: 'center', width: 100, sort: true}, - {field: 'transtime', title: '交易时间', align: 'center', width: 100, sort: true}, + // { + // field: 'tradeflag', + // title: '类型', + // align: 'center', + // width: 60, + // templet: function (item) { + // if (item.tradeflag === 'in') { + // return '收入'; + // } else if (item.tradeflag === 'out') { + // return '支出'; + // } else { + // return item.tradeflag; + // } + // } + // }, + {field: 'transdate', title: '交易日期', align: 'center', width: 110, sort: true}, + {field: 'transtime', title: '交易时间', align: 'center', width: 110, sort: true}, { field: 'sourceType', title: '支付方式', @@ -283,7 +283,7 @@ {field: 'oppositeAccName', title: '交易对象', align: 'center', width: 150}, // {field: 'outtradeno', title: '子系统订单号', align: 'center', width: 200}, {field: 'transcode', title: '交易码', align: 'center', width: 100}, - {field: 'remark', title: '备注信息', align: 'center', width: 200} + {field: 'remark', title: '备注信息', align: 'center', width: 250} ] ] }); diff --git a/payapi/src/main/resources/templates/system/dtl/userdtl.html b/payapi/src/main/resources/templates/system/dtl/userdtl.html index 6d2ea96e..dfd35260 100644 --- a/payapi/src/main/resources/templates/system/dtl/userdtl.html +++ b/payapi/src/main/resources/templates/system/dtl/userdtl.html @@ -180,7 +180,7 @@ cols: [ [ {field: 'refno', title: '参考号', align: 'center', width: 200, sort: true}, - {field: 'accdate', title: '记账日期', align: 'center', width: 100, sort: true}, + {field: 'accdate', title: '记账日期', align: 'center', width: 110, sort: true}, {field: 'transdesc', title: '交易描述', align: 'center', width: 175}, {field: 'userName', title: '姓名', align: 'center', width: 150}, { @@ -207,23 +207,23 @@ } } }, - { - field: 'tradeflag', - title: '类型', - align: 'center', - width: 60, - templet: function (item) { - if (item.tradeflag === 'in') { - return '收入'; - } else if (item.tradeflag === 'out') { - return '支出'; - } else { - return item.tradeflag; - } - } - }, - {field: 'transdate', title: '交易日期', align: 'center', width: 100, sort: true}, - {field: 'transtime', title: '交易时间', align: 'center', width: 100, sort: true}, + // { + // field: 'tradeflag', + // title: '类型', + // align: 'center', + // width: 60, + // templet: function (item) { + // if (item.tradeflag === 'in') { + // return '收入'; + // } else if (item.tradeflag === 'out') { + // return '支出'; + // } else { + // return item.tradeflag; + // } + // } + // }, + {field: 'transdate', title: '交易日期', align: 'center', width: 110, sort: true}, + {field: 'transtime', title: '交易时间', align: 'center', width: 110, sort: true}, { field: 'sourceType', title: '支付方式', @@ -246,7 +246,7 @@ {field: 'oppositeAccName', title: '交易对象', align: 'center', width: 250}, {field: 'outtradeno', title: '子系统订单号', align: 'center', width: 200}, {field: 'transcode', title: '交易码', align: 'center', width: 100}, - {field: 'remark', title: '备注信息', align: 'center', width: 200} + {field: 'remark', title: '备注信息', align: 'center', width: 250} ] ] }); diff --git a/payapi/src/main/resources/templates/system/param/sourcetype.html b/payapi/src/main/resources/templates/system/param/sourcetype.html index 74087c21..ec041bef 100644 --- a/payapi/src/main/resources/templates/system/param/sourcetype.html +++ b/payapi/src/main/resources/templates/system/param/sourcetype.html @@ -128,7 +128,7 @@ }, { field: 'consumeEnable', - title: '能否消费', + title: '允许消费', align: 'center', templet: '#consumeenable-tpl-state', sort: true @@ -142,7 +142,7 @@ }, { field: 'reversable', - title: '能否冲正', + title: '允许撤销', align: 'center', templet: '#reversable-tpl-state', sort: true diff --git a/payapi/src/main/resources/templates/system/param/sourcetypeconfig.html b/payapi/src/main/resources/templates/system/param/sourcetypeconfig.html index 2924cdbe..4cc1461d 100644 --- a/payapi/src/main/resources/templates/system/param/sourcetypeconfig.html +++ b/payapi/src/main/resources/templates/system/param/sourcetypeconfig.html @@ -9,10 +9,10 @@
- +
- +
diff --git a/payapi/src/main/resources/templates/system/param/sourcetypeform.html b/payapi/src/main/resources/templates/system/param/sourcetypeform.html index ca3f5df7..60fd97db 100644 --- a/payapi/src/main/resources/templates/system/param/sourcetypeform.html +++ b/payapi/src/main/resources/templates/system/param/sourcetypeform.html @@ -52,7 +52,7 @@
- +
@@ -68,7 +68,7 @@
- +
diff --git a/payapi/src/main/resources/templates/system/report/subjectday.html b/payapi/src/main/resources/templates/system/report/subjectday.html index 8767b737..9ff137cb 100644 --- a/payapi/src/main/resources/templates/system/report/subjectday.html +++ b/payapi/src/main/resources/templates/system/report/subjectday.html @@ -105,7 +105,16 @@ }, // {align: 'center', title: '期初余额', colspan: 2}, {align: 'center', title: '本期发生额', colspan: 2}, - {align: 'center', title: '期末扎差', colspan: 2} + { + align: 'center', title: '期末扎差', rowspan: 2, templet: function (e) { + if(e.balflag == 1){ + return parseFloat(e.drbal).toFixed(2); + }else{ + return parseFloat(e.crbal).toFixed(2); + } + + } + } ], [ // {field: 'lastdaydrbal', title: '借方', align: 'center'}, // {field: 'lastdaycrbal', title: '贷方', align: 'center'}, @@ -118,17 +127,17 @@ field: 'cramt', title: '贷方', align: 'center', templet: function (e) { return parseFloat(e.cramt).toFixed(2); } - }, - { - field: 'drbal', title: '借方', align: 'center', templet: function (e) { - return parseFloat(e.drbal).toFixed(2); - } - }, - { - field: 'crbal', title: '贷方', align: 'center', templet: function (e) { - return parseFloat(e.crbal).toFixed(2); - } } + // ,{ + // field: 'drbal', title: '借方', align: 'center', templet: function (e) { + // return parseFloat(e.drbal).toFixed(2); + // } + // }, + // { + // field: 'crbal', title: '贷方', align: 'center', templet: function (e) { + // return parseFloat(e.crbal).toFixed(2); + // } + // } ] ], // cols: [ diff --git a/payapi/src/main/resources/templates/system/shop/addshop.html b/payapi/src/main/resources/templates/system/shop/addshop.html index 1a1bd629..9a2a8cca 100644 --- a/payapi/src/main/resources/templates/system/shop/addshop.html +++ b/payapi/src/main/resources/templates/system/shop/addshop.html @@ -20,13 +20,13 @@
- 注意：商户组无商户账号，且能创建下级商户。结算商户是叶子商户，会创建商户账号。保存后无法修改！！！ + 注意：商户组无商户编码，且能创建下级商户。结算商户是叶子商户，会创建商户编码。保存后无法修改！！！
- +
- +
@@ -44,7 +44,7 @@
+ style="color: red;">*上级商户序号
*营业执照编号
-
@@ -259,7 +259,12 @@ layer.msg("请填写商户营业执照编号", {icon: 2, time: 1000}); $("#shop-add-businessLicenseNo").focus(); return; + }else if($.trim(businessLicenseNo).length != 18 && $.trim(businessLicenseNo).length != 15){ + layer.msg("请正确填写商户营业执照编号", {icon: 2, time: 1000}); + $("#shop-add-businessLicenseNo").focus(); + return; } + if (isempty(taxRegistrationNo)) { layer.msg("请填写商户税务登记证号", {icon: 2, time: 1000}); $("#shop-add-taxRegistrationNo").focus(); @@ -287,6 +292,12 @@ } } + if (!isempty(businessLicenseNo) && $.trim(businessLicenseNo).length != 18 && $.trim(businessLicenseNo).length != 15) { + layer.msg("请正确填写商户营业执照编号", {icon: 2, time: 1000}); + $("#shop-add-businessLicenseNo").focus(); + return; + } + var str = $("#shop-add-shoptype").find("option:selected").text(); layer.confirm("确定要新增【" + str + " - " + shopname + " 】吗？", function () { admin.go('[[@{/shop/addshop}]]', { diff --git a/payapi/src/main/resources/templates/system/shop/config.html b/payapi/src/main/resources/templates/system/shop/config.html index f0a23548..ea8218e4 100644 --- a/payapi/src/main/resources/templates/system/shop/config.html +++ b/payapi/src/main/resources/templates/system/shop/config.html @@ -143,7 +143,7 @@ [ { field: 'shopaccno', - title: '商户账号', + title: '商户编码', width: 150, align: 'center', fixed: 'left', @@ -153,7 +153,7 @@ {field: 'paydesc', title: '支付方式', align: 'center', sort: true}, { field: 'consumeEnable', - title: '能否消费', + title: '允许消费', align: 'center', width: 110, templet: '#shop-consumeenable-tpl-state', @@ -169,7 +169,7 @@ }, { field: 'reverseEnable', - title: '能否冲正', + title: '允许撤销', align: 'center', width: 110, templet: '#shop-reverseenable-tpl-state', diff --git a/payapi/src/main/resources/templates/system/shop/configform.html b/payapi/src/main/resources/templates/system/shop/configform.html index 79cf14e1..f3a5a074 100644 --- a/payapi/src/main/resources/templates/system/shop/configform.html +++ b/payapi/src/main/resources/templates/system/shop/configform.html @@ -1,6 +1,6 @@
- +
@@ -22,7 +22,7 @@
- +
@@ -36,7 +36,7 @@
- +
diff --git a/payapi/src/main/resources/templates/system/shop/configpara.html b/payapi/src/main/resources/templates/system/shop/configpara.html index 70dc1b57..8fb337b9 100644 --- a/payapi/src/main/resources/templates/system/shop/configpara.html +++ b/payapi/src/main/resources/templates/system/shop/configpara.html @@ -11,10 +11,10 @@
- +
- +
diff --git a/payapi/src/main/resources/templates/system/shop/index.html b/payapi/src/main/resources/templates/system/shop/index.html index 61e7cc7b..f0d145d3 100644 --- a/payapi/src/main/resources/templates/system/shop/index.html +++ b/payapi/src/main/resources/templates/system/shop/index.html @@ -140,8 +140,8 @@ [ {align: 'center', title: '操作', align: 'center', width: 260, fixed: 'left', toolbar: '#shop-manager-table-bar'}, { field: 'shopid', - title: '商户号', - width: 100, + title: '商户序号', + width: 120, align: 'center', sort: true }, @@ -181,7 +181,7 @@ }, { field: 'shopaccno', - title: '商户账号', + title: '商户编码', align: 'center', width: 120, sort: true, diff --git a/payapi/src/main/resources/templates/system/shop/opercheck.html b/payapi/src/main/resources/templates/system/shop/opercheck.html index c9450e75..972939c0 100644 --- a/payapi/src/main/resources/templates/system/shop/opercheck.html +++ b/payapi/src/main/resources/templates/system/shop/opercheck.html @@ -18,19 +18,19 @@
结算商户
- 注意：商户组无商户账号，且能创建下级商户。结算商户是叶子商户，会创建商户账号。保存后无法修改！！！ + 注意：商户组无商户编码，且能创建下级商户。结算商户是叶子商户，会创建商户编码。保存后无法修改！！！
- +
[[${shop.shopid}]]
- +
[[${shop.shopaccno}]]
@@ -39,7 +39,7 @@
+ style="color: red;">*上级商户序号
[[${shop.fshopname}]]
diff --git a/payapi/src/main/resources/templates/system/shop/shopdetail.html b/payapi/src/main/resources/templates/system/shop/shopdetail.html index 148225a7..6ccb40e2 100644 --- a/payapi/src/main/resources/templates/system/shop/shopdetail.html +++ b/payapi/src/main/resources/templates/system/shop/shopdetail.html @@ -21,20 +21,20 @@
- 注意：商户组无商户账号，且能创建下级商户。结算商户是叶子商户，会创建商户账号。保存后无法修改！！！ + 注意：商户组无商户编码，且能创建下级商户。结算商户是叶子商户，会创建商户编码。保存后无法修改！！！
- +
[[${shop.shopid}]]
- +
[[${shop.shopaccno}]]
@@ -43,7 +43,7 @@
+ style="color: red;">*上级商户序号
- 注意：商户组无商户账号，且能创建下级商户。结算商户是叶子商户，会创建商户账号。保存后无法修改！！！ + 注意：商户组无商户编码，且能创建下级商户。结算商户是叶子商户，会创建商户编码。保存后无法修改！！！
- +
- +
@@ -46,7 +46,7 @@
+ style="color: red;">*上级商户序号
*营业执照编号
-
@@ -243,7 +243,7 @@ var tel = $("#shop-update-tel").val(); var token = $("meta[name='_csrf_token']").attr("value"); if (isempty(shopid)) { - layer.msg("商户ID为空，请返回重新操作", {icon: 2, time: 1000}); + layer.msg("商户序号为空，请返回重新操作", {icon: 2, time: 1000}); $("#shop-update-shoptype").focus(); return; } @@ -266,7 +266,12 @@ layer.msg("请填写商户营业执照编号", {icon: 2, time: 1000}); $("#shop-update-businessLicenseNo").focus(); return; + }else if($.trim(businessLicenseNo).length != 18 && $.trim(businessLicenseNo).length != 15){ + layer.msg("请正确填写商户营业执照编号", {icon: 2, time: 1000}); + $("#shop-update-businessLicenseNo").focus(); + return; } + if (isempty(taxRegistrationNo)) { layer.msg("请填写商户税务登记证号", {icon: 2, time: 1000}); $("#shop-update-taxRegistrationNo").focus(); @@ -294,6 +299,12 @@ } } + if (!isempty(businessLicenseNo) && $.trim(businessLicenseNo).length != 18 && $.trim(businessLicenseNo).length != 15) { + layer.msg("请正确填写商户营业执照编号", {icon: 2, time: 1000}); + $("#shop-update-businessLicenseNo").focus(); + return; + } + layer.confirm("确定要保存吗？", function () { admin.go('[[@{/shop/updateshop}]]', { shopid: shopid, -- 2.17.1