From 8b485f1840695b584b8b758187f83ba015f4f05d Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 11 Feb 2025 15:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E8=B4=B9=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/InvoicingMapper.xml              | 1 +
 .../src/main/resources/mapper/LinePayMapper.xml                | 3 ++-
 .../src/main/java/com/cool/store/dto/InvoicingDTO.java         | 3 +++
 .../src/main/java/com/cool/store/entity/InvoicingDO.java       | 2 ++
 .../src/main/java/com/cool/store/entity/LinePayDO.java         | 3 +++
 .../main/java/com/cool/store/request/LinePaySubmitRequest.java | 2 ++
 .../java/com/cool/store/response/FranchiseFeeResponse.java     | 3 +++
 .../java/com/cool/store/service/impl/LinePayServiceImpl.java   | 1 +
 8 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml
index f69d653ae..86125530d 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml
@@ -22,6 +22,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
     <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
+    <result column="annex" jdbcType="VARCHAR" property="annex"/>
   </resultMap>
 
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
index f2bcd9482..252d875c7 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
@@ -24,11 +24,12 @@
         <result column="deleted" jdbcType="BIT" property="deleted"/>
         <result column="pay_business_type" jdbcType="TINYINT" property="payBusinessType"/>
         <result column="amount" jdbcType="DECIMAL" property="amount"/>
+        <result column="combined_field" jdbcType="VARCHAR" property="combinedField"/>
     </resultMap>
     <sql id="Base_Column_List">
         id,shop_id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code,
     bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, 
-    update_time, create_user_id, update_user_id, deleted,pay_business_type,amount
+    update_time, create_user_id, update_user_id, deleted,pay_business_type,amount,combined_field
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java
index 740269692..0b4a01ddb 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java
@@ -111,6 +111,9 @@ public class InvoicingDTO {
     private BigDecimal actualPaymentAmount;
 
     private String financialRemarks;
+    @Column(name = "annex")
+    @ApiModelProperty("附件")
+    private String annex;
 
 
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java
index fadb88f5e..60c82eef4 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java
@@ -112,6 +112,8 @@ public class InvoicingDO {
     private BigDecimal actualPaymentAmount;
 
     private String financialRemarks;
+    @Column(name = "annex")
+    private String annex;
 
     /**
      * @return id
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java
index 7c308bf7c..62e476932 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java
@@ -84,4 +84,7 @@ public class LinePayDO implements Serializable {
     private Integer payBusinessType;
     @ApiModelProperty("缴费金额")
     private BigDecimal amount;
+
+    @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
+    private String combinedField;
 }
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java
index 63c6e7e30..4f2348add 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java
@@ -57,4 +57,6 @@ public class LinePaySubmitRequest {
     private Long shopId;
     @ApiModelProperty("缴费金额")
     private BigDecimal amount;
+    @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
+    private String combinedField;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
index 616d4039c..ecb4175b2 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
@@ -117,6 +117,8 @@ public class FranchiseFeeResponse {
 
         @ApiModelProperty("审核状态 0通过,1拒绝")
         private Integer status;
+        @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
+        private String combinedField;
 
         public static LinePay from(LinePayDO linePayDO) {
             if (linePayDO == null) {
@@ -143,6 +145,7 @@ public class FranchiseFeeResponse {
             linePayDO1.setUpdateUserId(linePayDO.getUpdateUserId());
             linePayDO1.setDeleted(linePayDO.getDeleted());
             linePayDO1.setPayBusinessType(linePayDO.getPayBusinessType());
+            linePayDO1.setCombinedField(linePayDO.getCombinedField());
             return linePayDO1;
         }
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
index 5f904d702..65d0a9739 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
@@ -185,6 +185,7 @@ public class LinePayServiceImpl implements LinePayService {
     }
 
     private void fillLinePay(Boolean isAdd, LinePayDO linePayDO, LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) {
+        linePayDO.setCombinedField(request.getCombinedField());
         linePayDO.setPayType(request.getPayType());
         linePayDO.setPayUserName(request.getPayUserName());
         linePayDO.setPayAccount(request.getPayAccount());