From 188e0d2bc76b5f15f27ad08c9c7a324cd7c8affa Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Mon, 14 Apr 2025 16:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 13 ------ .../com/tenlion/operator/pojo/UserEvent.java | 4 ++ .../operator/pojo/UserRegisteredEvent.java | 4 ++ .../AccountRechargeInvoiceDTO.java | 40 +++++++++++++++++++ .../user/expand/UserExpandServiceImpl.java | 3 +- .../account-recharge-mapper.xml | 4 ++ .../accountrecharge/user-list-invoice.html | 29 +++++++++++++- .../invoicerecharge/invoice-recharge.html | 30 ++++++++++++++ .../templates/invoicerecharge/save.html | 6 ++- .../templates/invoicerecharge/update.html | 6 ++- 10 files changed, 121 insertions(+), 18 deletions(-) create mode 100644 src/main/java/cn/com/tenlion/operator/pojo/UserEvent.java create mode 100644 src/main/java/cn/com/tenlion/operator/pojo/UserRegisteredEvent.java diff --git a/pom.xml b/pom.xml index 525bca0..d46eaaf 100644 --- a/pom.xml +++ b/pom.xml @@ -98,24 +98,11 @@ ${druid.version} - - ink.wgink - module-file - 1.0-SNAPSHOT - - - org.apache.poi - poi-ooxml-schemas - - - - ink.wgink module-dictionary 1.0-SNAPSHOT - ink.wgink diff --git a/src/main/java/cn/com/tenlion/operator/pojo/UserEvent.java b/src/main/java/cn/com/tenlion/operator/pojo/UserEvent.java new file mode 100644 index 0000000..7a60160 --- /dev/null +++ b/src/main/java/cn/com/tenlion/operator/pojo/UserEvent.java @@ -0,0 +1,4 @@ +package cn.com.tenlion.operator.pojo; + +public interface UserEvent { +} diff --git a/src/main/java/cn/com/tenlion/operator/pojo/UserRegisteredEvent.java b/src/main/java/cn/com/tenlion/operator/pojo/UserRegisteredEvent.java new file mode 100644 index 0000000..646fd24 --- /dev/null +++ b/src/main/java/cn/com/tenlion/operator/pojo/UserRegisteredEvent.java @@ -0,0 +1,4 @@ +package cn.com.tenlion.operator.pojo; + +public class UserRegisteredEvent implements UserEvent{ +} diff --git a/src/main/java/cn/com/tenlion/operator/pojo/dtos/accountrecharge/AccountRechargeInvoiceDTO.java b/src/main/java/cn/com/tenlion/operator/pojo/dtos/accountrecharge/AccountRechargeInvoiceDTO.java index 0834a23..b450933 100644 --- a/src/main/java/cn/com/tenlion/operator/pojo/dtos/accountrecharge/AccountRechargeInvoiceDTO.java +++ b/src/main/java/cn/com/tenlion/operator/pojo/dtos/accountrecharge/AccountRechargeInvoiceDTO.java @@ -54,6 +54,46 @@ public class AccountRechargeInvoiceDTO { private String rechargeRemark; @ApiModelProperty(name = "dataIsChecked", value = "") private Boolean dataIsChecked; + @ApiModelProperty(name = "orgName", value = "") + private String orgName; + @ApiModelProperty(name = "orgNumber", value = "") + private String orgNumber; + @ApiModelProperty(name = "orgBank", value = "") + private String orgBank; + @ApiModelProperty(name = "selfData", value = "") + private String selfData; + + public String getOrgName() { + return orgName == null ? "" : orgName.trim(); + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getOrgNumber() { + return orgNumber == null ? "" : orgNumber.trim(); + } + + public void setOrgNumber(String orgNumber) { + this.orgNumber = orgNumber; + } + + public String getOrgBank() { + return orgBank == null ? "" : orgBank.trim(); + } + + public void setOrgBank(String orgBank) { + this.orgBank = orgBank; + } + + public String getSelfData() { + return selfData == null ? "" : selfData.trim(); + } + + public void setSelfData(String selfData) { + this.selfData = selfData; + } public Boolean getDataIsChecked() { return dataIsChecked; diff --git a/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java index 6b96145..820b009 100644 --- a/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java @@ -70,7 +70,8 @@ public class UserExpandServiceImpl extends DefaultBaseService implements IUserEx private UserExpandDTO get(UserDTO userDTO) { if (userDTO == null) { - throw new SearchException("用户不存在"); + // throw new SearchException("用户不存在"); + return new UserExpandDTO(); } Map params = getHashMap(2); params.put("userId", userDTO.getUserId()); diff --git a/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml b/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml index cea08b0..e5c3699 100644 --- a/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml +++ b/src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml @@ -18,6 +18,10 @@ + + + + diff --git a/src/main/resources/templates/accountrecharge/user-list-invoice.html b/src/main/resources/templates/accountrecharge/user-list-invoice.html index edc6421..56a48fc 100644 --- a/src/main/resources/templates/accountrecharge/user-list-invoice.html +++ b/src/main/resources/templates/accountrecharge/user-list-invoice.html @@ -128,6 +128,27 @@ return rowData; } }, + {field: 'orgName', width: 250, title: '打款公司', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, + {field: 'selfData1', width: 250, title: '收款公司', align:'center', + templet: function(row) { + var rowData = row["selfData"]; + if(rowData.indexOf("公司名称") != -1){ + console.log(rowData); + console.log(rowData.split("")); + console.log(rowData.split("")[0] + ""); + return (rowData.split("")[0] + "").replace("公司名称 : ", ""); + } + return "-"; + } + }, {field: 'rechargeMoney', width: 120, title: '金额', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -236,7 +257,9 @@ selectedRechargeArray.push({ accountRechargeId: obj.data.accountRechargeId, rechargeMoney: obj.data.rechargeMoney, - thirdParty: obj.data.thirdParty + thirdParty: obj.data.thirdParty, + selfData: obj.data.selfData, + orgName: obj.data.orgName }) } else { for(var i = 0; i < selectedRechargeArray.length; i++) { @@ -264,7 +287,9 @@ selectedRechargeArray.push({ accountRechargeId: item.accountRechargeId, rechargeMoney: item.rechargeMoney, - thirdParty: item.thirdParty + thirdParty: item.thirdParty, + selfData: obj.data.selfData, + orgName: obj.data.orgName }) } } diff --git a/src/main/resources/templates/invoicerecharge/invoice-recharge.html b/src/main/resources/templates/invoicerecharge/invoice-recharge.html index df90dd5..e9c70c4 100644 --- a/src/main/resources/templates/invoicerecharge/invoice-recharge.html +++ b/src/main/resources/templates/invoicerecharge/invoice-recharge.html @@ -112,6 +112,27 @@ return rowData; } }, + {field: 'orgName', width: 250, title: '打款公司', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, + {field: 'selfData1', width: 250, title: '收款公司', align:'center', + templet: function(row) { + var rowData = row["selfData"]; + if(rowData.indexOf("公司名称") != -1){ + console.log(rowData); + console.log(rowData.split("")); + console.log(rowData.split("")[0] + ""); + return (rowData.split("")[0] + "").replace("公司名称 : ", ""); + } + return "-"; + } + }, {field: 'rechargeMoney', width: 120, title: '金额', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -160,6 +181,15 @@ return rowData; } }, + {field: 'rechargeRmark', width: 250, title: '备注信息', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, /*{field: 'operate', width: 80, title: '操作', align:'center', fixed: 'right', templet: function(row) { if(row.rechargeCheck === '1') { diff --git a/src/main/resources/templates/invoicerecharge/save.html b/src/main/resources/templates/invoicerecharge/save.html index 1f19c89..10f1267 100644 --- a/src/main/resources/templates/invoicerecharge/save.html +++ b/src/main/resources/templates/invoicerecharge/save.html @@ -467,7 +467,11 @@ var totalMoney = 0.0; if(selectedRecharges && selectedRecharges.length > 0) { for(var i = 0 ; i < selectedRecharges.length ; i++) { - recharges = recharges + selectedRecharges[i].rechargeMoney + "元【" + selectedRecharges[i].thirdParty + "】" + ","; + var gongSi = ""; + if(selectedRecharges[i].selfData && selectedRecharges[i].selfData.indexOf("公司名称") != -1){ + gongSi = " 至 " + (selectedRecharges[i].selfData.split("")[0]).replace("公司名称 : ", "").replace("

", ""); + } + recharges = recharges + selectedRecharges[i].rechargeMoney + "元【" + selectedRecharges[i].thirdParty + gongSi + "】" + ","; selectedRechargeIds = selectedRechargeIds + selectedRecharges[i].accountRechargeId + ","; totalMoney = parseFloat((totalMoney + selectedRecharges[i].rechargeMoney).toFixed(2)); console.log(totalMoney) diff --git a/src/main/resources/templates/invoicerecharge/update.html b/src/main/resources/templates/invoicerecharge/update.html index 69ca25c..177b629 100644 --- a/src/main/resources/templates/invoicerecharge/update.html +++ b/src/main/resources/templates/invoicerecharge/update.html @@ -468,7 +468,11 @@ var totalMoney = 0.0; if(selectedRecharges && selectedRecharges.length > 0) { for(var i = 0 ; i < selectedRecharges.length ; i++) { - recharges = recharges + selectedRecharges[i].rechargeMoney + "元【" + selectedRecharges[i].thirdParty + "】" + ","; + var gongSi = ""; + if(selectedRecharges[i].selfData.indexOf("公司名称") != -1){ + gongSi = " 至 " + (selectedRecharges[i].selfData.split("")[0]).replace("公司名称 : ", "").replace("

", ""); + } + recharges = recharges + selectedRecharges[i].rechargeMoney + "元【" + selectedRecharges[i].thirdParty + gongSi + "】" + ","; selectedRechargeIds = selectedRechargeIds + selectedRecharges[i].accountRechargeId + ","; totalMoney = parseFloat((totalMoney + selectedRecharges[i].rechargeMoney).toFixed(2)); }