修改了开发票

pom.xml

@@ -98,24 +98,11 @@
       <version>${druid.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>ink.wgink</groupId>
-      <artifactId>module-file</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.poi</groupId>
-          <artifactId>poi-ooxml-schemas</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>ink.wgink</groupId>
       <artifactId>module-dictionary</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
-
     <!-- OAuth2客户端 -->
     <dependency>
       <groupId>ink.wgink</groupId>

src/main/java/cn/com/tenlion/operator/pojo/UserEvent.java

@@ -0,0 +1,4 @@
+package cn.com.tenlion.operator.pojo;
+
+public interface UserEvent {
+}

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{
+}

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;

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<String, Object> params = getHashMap(2);
         params.put("userId", userDTO.getUserId());

src/main/resources/mybatis/mapper-operator/accountrecharge/account-recharge-mapper.xml

@@ -18,6 +18,10 @@
         <result column="account_item_id" property="accountItemId"/>
         <result column="package_info_id" property="packageInfoId"/>
         <result column="recharge_remark" property="rechargeRemark"/>
+        <result column="org_name" property="orgName"/>
+        <result column="org_bank" property="orgBank"/>
+        <result column="org_number" property="orgNumber"/>
+        <result column="self_data" property="selfData"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
     </resultMap>

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("</span></span>"));
+                                    console.log(rowData.split("</span></span>")[0] + "</span></span>");
+                                    return (rowData.split("</span></span>")[0] + "</span></span>").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
                             })
                         }
                     }

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("</span></span>"));
+                                    console.log(rowData.split("</span></span>")[0] + "</span></span>");
+                                    return (rowData.split("</span></span>")[0] + "</span></span>").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') {

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("</span></span>")[0]).replace("公司名称 : ", "").replace("<p style=\"text-align: center;\"><span style=\"color: rgb(194, 79, 74);\"><span style=\"text-decoration: underline;\" id=\"bankAccountName\">", "");
+                            }
+                            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)

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("</span></span>")[0]).replace("公司名称 : ", "").replace("<p style=\"text-align: center;\"><span style=\"color: rgb(194, 79, 74);\"><span style=\"text-decoration: underline;\" id=\"bankAccountName\">", "");
+                    }
+                    recharges = recharges + selectedRecharges[i].rechargeMoney + "元【" + selectedRecharges[i].thirdParty + gongSi + "】" + ",";
                     selectedRechargeIds = selectedRechargeIds + selectedRecharges[i].accountRechargeId + ",";
                     totalMoney = parseFloat((totalMoney + selectedRecharges[i].rechargeMoney).toFixed(2));
                 }