From 1e323efe7cf8991acb8828a8a1c7f2da726660a0 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Thu, 29 May 2025 13:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E8=B4=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cool/store/enums/point/PayTypeEnum.java   |  4 ++-
 .../enums/point/ShopSubStageStatusEnum.java   |  2 +-
 .../main/resources/mapper/LinePayMapper.xml   |  5 ++-
 .../com/cool/store/entity/FranchiseFeeDO.java | 13 ++++++++
 .../java/com/cool/store/entity/LinePayDO.java | 15 +++++++++
 .../store/request/LinePaySubmitRequest.java   |  5 ++-
 .../service/impl/LinePayServiceImpl.java      | 32 ++-----------------
 7 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java
index 36b5967a2..ee61a5a26 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java
@@ -8,7 +8,9 @@ package com.cool.store.enums.point;
  */
 public enum PayTypeEnum {
     WX_PAY(1,"微信支付"),
-    BANK_PAY(2,"银行转账");
+    BANK_PAY(2,"银行转账"),
+    ONLINE_PAY(3,"线上支付"),
+    OFFLINE_PAY(4,"线下支付");
     private Integer code;
 
     private String desc;
diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
index 70fc96b96..2d4393148 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
@@ -39,7 +39,7 @@ public enum ShopSubStageStatusEnum {
     //缴纳加盟费/保证金
     SHOP_SUB_STAGE_STATUS_70(ShopSubStageEnum.SHOP_STAGE_7, 700, "待内勤发布账单", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_71(ShopSubStageEnum.SHOP_STAGE_7, 710, "待加盟商缴费", Boolean.FALSE),
-    SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "待内勤审核", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_72(ShopSubStageEnum.SHOP_STAGE_7, 720, "对账确认中", Boolean.FALSE),
     SHOP_SUB_STAGE_STATUS_73(ShopSubStageEnum.SHOP_STAGE_7, 730, "已缴费", Boolean.TRUE),
     SHOP_SUB_STAGE_STATUS_74(ShopSubStageEnum.SHOP_STAGE_7, 740, "审核不通过", Boolean.FALSE),
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
index 43bee5bf8..dc6f5fb79 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
@@ -25,11 +25,14 @@
         <result column="pay_business_type" jdbcType="TINYINT" property="payBusinessType"/>
         <result column="amount" jdbcType="DECIMAL" property="amount"/>
         <result column="combined_field" jdbcType="VARCHAR" property="combinedField"/>
+        <result column="xgj_claim_status" jdbcType="TINYINT" property="xgjClaimStatus"/>
+        <result column="payment_receipt_code" jdbcType="VARCHAR" property="paymentReceiptCode"/>
+        <result column="pay_serial_number" jdbcType="VARCHAR" property="paySerialNumber"/>
     </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,combined_field
+    update_time, create_user_id, update_user_id, deleted,pay_business_type,amount,combined_field,xgj_claim_status,payment_receipt_code,pay_serial_number
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
index af392450d..b0544c236 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -59,4 +60,16 @@ public class FranchiseFeeDO {
     @Column(name = "discount_reason")
     private String discountReason;
 
+    @Column(name = "xgj_collection_status")
+    @ApiModelProperty("新管家收款状态 1-部分缴款 2-已完成")
+    private Integer xgjCollectionStatus;
+
+    @Column(name = "xgj_remainder_payable_amount")
+    @ApiModelProperty("新管家剩余应缴金额")
+    private BigDecimal xgjRemainderPayableAmount;
+
+    @Column(name = "xgj_fees_paid")
+    @ApiModelProperty("新管家已缴金额")
+    private BigDecimal xgjFeesPaid;
+
 }
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 62e476932..97ba895a9 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
@@ -11,6 +11,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+
 /**
  * @author wxp
  * @date 2024-03-27 09:25
@@ -87,4 +89,17 @@ public class LinePayDO implements Serializable {
 
     @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
     private String combinedField;
+
+    @Column(name = "xgj_claim_status")
+    @ApiModelProperty("新管家收款单状态0-待认领，1-已认领")
+    private Integer xgjClaimStatus;
+
+    @Column(name = "payment_receipt_code")
+    @ApiModelProperty("付款单编码(系统生成)")
+    private String paymentReceiptCode;
+
+    @Column(name = "pay_serial_number")
+    @ApiModelProperty("交易流水号")
+    private String paySerialNumber;
+
 }
\ 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 52c596b2c..3195c8269 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
@@ -21,7 +21,7 @@ public class LinePaySubmitRequest {
     @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
     private Integer payStatus;
 
-    @ApiModelProperty("支付方式 1微信 2银行转账")
+    @ApiModelProperty("支付方式 1微信 2银行转账,3-线上支付,4-线下支持")
     private Integer payType;
 
     @ApiModelProperty("付款人姓名/加盟商姓名")
@@ -60,4 +60,7 @@ public class LinePaySubmitRequest {
     private BigDecimal amount;
     @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
     private String combinedField;
+
+    @ApiModelProperty("交易流水号")
+    private String paySerialNumber;
 }
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 bd29dfcc7..609cbcaba 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
@@ -158,36 +158,7 @@ public class LinePayServiceImpl implements LinePayService {
             franchiseFeeDO.setPayId(payId);
             franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO);
             shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72);
-            ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(franchiseFeeDO.getShopId());
-            Set<String> auditFranchiseFeeUsers = new HashSet<>();
-            List<EnterpriseUserDO> branchUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.BRANCH_OFFICE, shopInfoDO.getRegionId());
-            if (Objects.nonNull(branchUser)) {
-                Set<String> branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet());
-                auditFranchiseFeeUsers.addAll(branchUserIds);
-            }
-            List<EnterpriseUserDO> regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId());
-            if (Objects.nonNull(regionUser)) {
-                Set<String> regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet());
-                auditFranchiseFeeUsers.addAll(regionUserIds);
-            }
-            HashMap<String, String> map = new HashMap<>();
-            map.put("partnerUsername", lineInfo.getUsername());
-            map.put("partnerMobile", lineInfo.getMobile());
-            map.put("storeName", shopInfoDO.getShopName());
-            commonService.sendQWMessage(new ArrayList<>(auditFranchiseFeeUsers),
-                    MessageEnum.MESSAGE_18,
-                    map);
-        }
-        if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) {
-            lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.PAY_DEPOSIT.getCode());
-            lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode());
-            lineInfoDAO.insertOrUpdate(lineInfo);
-            HashMap<String, String> map = new HashMap<>();
-            map.put("partnerUsername", lineInfo.getUsername());
-            map.put("partnerMobile", lineInfo.getMobile());
-            commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()),
-                    MessageEnum.MESSAGE_5,
-                    map);
+            //todo 苏竹红推送数据
         }
         return payId == null ? null : payId;
     }
@@ -208,6 +179,7 @@ public class LinePayServiceImpl implements LinePayService {
     }
 
     private void fillLinePay(Boolean isAdd, LinePayDO linePayDO, LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) {
+        linePayDO.setPaySerialNumber(request.getPaySerialNumber());
         linePayDO.setCombinedField(request.getCombinedField());
         linePayDO.setPayType(request.getPayType());
         linePayDO.setPayUserName(request.getPayUserName());