Merge #68 into master from cc_20260313_ws_wallet

网商钱包分账对接

* cc_20260313_ws_wallet: (9 commits squashed)

  - fix:新店开通网商钱包

  - fix:网商钱包开通回调修改

  - fix

  - fix

  - fix:关闭网商开通回调接口验签

  - Merge branch 'master' into cc_20260313_ws_wallet
    
    # Conflicts:
    #	coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java

  - fix:钱包批量转账新增钱包类型字段

  - fix:网商钱包分账对接

  - fix

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/68

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BatchTransferDTO.java

@@ -19,6 +19,9 @@ public class BatchTransferDTO {
     @ApiModelProperty("批量转账数据")
     private List<TransDataRequest> transArray;
 
+    @ApiModelProperty("批次号")
+    private String batchCode;
+
     @Data
     public static class TransDataRequest {
 

coolstore-partner-model/src/main/java/com/cool/store/entity/fees/WalletPayInfoDO.java

@@ -102,6 +102,12 @@ public class WalletPayInfoDO {
     @Column(name = "create_time")
     private Date createTime;
 
+    /**
+     * 批量分账批次号
+     */
+    @Column(name = "batch_code")
+    private String batchCode;
+
     public WalletPayInfoDO(String module, Long shopId, String payNo, String payUserName, BigDecimal payAmount, String expenseType, String createUserId, String tradeId) {
         this.shopId = shopId;
         this.payNo = payNo;
@@ -127,6 +133,7 @@ public class WalletPayInfoDO {
         walletTradeDO.setPayTime(this.payTime);
         walletTradeDO.setRemark(this.remark);
         walletTradeDO.setCreateUserId(this.createUserId);
+        walletTradeDO.setBatchCode(this.batchCode);
         return walletTradeDO;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/WalletTradeDO.java

@@ -85,4 +85,10 @@ public class WalletTradeDO {
      */
     @Column(name = "create_time")
     private Date createTime;
+
+    /**
+     * 批量分账批次号
+     */
+    @Column(name = "batch_code")
+    private String batchCode;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/FranchisePayTypeUpdateRequest.java

@@ -19,7 +19,7 @@ public class FranchisePayTypeUpdateRequest {
     @NotNull(message = "门店id不能为空")
     private Long shopId;
     
-    @ApiModelProperty("支付方式，1线下支付 2平安钱包支付")
+    @ApiModelProperty("支付方式，1线下支付 2网商钱包支付")
     @NotNull(message = "支付方式不能为空")
     private Integer payType;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferQueryRequest.java

@@ -0,0 +1,22 @@
+package com.cool.store.request.wallet;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 批量转账分账查询
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/3/18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BatchTransferQueryRequest {
+    @ApiModelProperty("批次号")
+    private String batchCode;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BatchTransferRequest.java

@@ -17,6 +17,10 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class BatchTransferRequest {
+    /**
+     * 钱包类型，1平安，2网商
+     */
+    private Integer walletType = 2;
 
     private String outStoreId;
 

coolstore-partner-model/src/main/java/com/cool/store/request/xgj/ReceiptCallBackRequest.java

@@ -22,7 +22,7 @@ public class ReceiptCallBackRequest {
     private Integer claimStatus;
 
     /**
-     * 支付方式，线下支付-0，平安钱包支付-2
+     * 支付方式，线下支付-0，网商钱包支付-2
      */
     private Integer payWay;