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-web/src/main/java/com/cool/store/controller/webc/TestController.java

@@ -116,6 +116,7 @@ public class TestController {
         ReceiptCallBackRequest receiptRequest = new ReceiptCallBackRequest();
         receiptRequest.setReceiptId(payInfoDO.getPayNo());
         receiptRequest.setClaimStatus(1);
+        receiptRequest.setPayWay(2);
         openApiService.changeReceiptStatus(receiptRequest);
         List<WalletPayInfoDO> list = walletPayInfoDAO.getByShopId(payInfoDO.getShopId(), WalletTradeModuleEnum.FRANCHISE_PAY.getModule(), null);
         List<ShopAllocationInfoDO> allocationList = shopAllocationInfoDAO.getByShopId(payInfoDO.getShopId());

coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

@@ -5,17 +5,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.*;
 import com.cool.store.dao.tp.TpApplyFormDAO;
+import com.cool.store.dao.wallet.WalletTradeDAO;
 import com.cool.store.dto.*;
 import com.cool.store.dto.store.StoreOrderTimeDTO;
-import com.cool.store.dto.xgj.XgjPayResultDTO;
 import com.cool.store.entity.*;
 import com.cool.store.entity.tp.TpApplyFormDO;
 import com.cool.store.enums.*;
 import com.cool.store.enums.tp.TpFormStatusEnum;
 import com.cool.store.enums.close.CloseTypeEnum;
-import com.cool.store.enums.close.RefundPayStatusEnum;
-import com.cool.store.enums.close.XgjRefundPayStatusEnum;
 import com.cool.store.enums.master.StoreCloseReasonEnum;
+import com.cool.store.enums.wallet.WalletTradeModuleEnum;
 import com.cool.store.mapper.ApplyLicenseMapper;
 import com.cool.store.mapper.LineInfoMapper;
 import com.cool.store.mapper.TrainingExperienceMapper;
@@ -25,14 +24,13 @@ import com.cool.store.request.ZxjpApiRequest;
 import com.cool.store.request.bigdata.LatestOrderDateRequest;
 import com.cool.store.request.tp.TpApplyQueryRequest;
 import com.cool.store.request.close.store.CloseStoreApplyRequest;
-import com.cool.store.request.xgj.XgjPaymentRequest;
 import com.cool.store.response.bigdata.LatestOrderDateResponse;
 import com.cool.store.service.*;
 import com.cool.store.service.close.CloseStoreRefundService;
 import com.cool.store.service.close.CloseStoreService;
+import com.cool.store.service.fees.WalletPayInfoService;
 import com.cool.store.service.impl.CommonService;
 import com.cool.store.service.tp.TpApplyService;
-import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.MDCUtils;
 import com.cool.store.utils.poi.DateUtils;
 import com.cool.store.utils.poi.StringUtils;
@@ -129,6 +127,10 @@ public class XxlJobHandler {
     ThirdXgjService thirdXgjService;
     @Resource
     CloseStoreRefundService closeStoreRefundService;
+    @Resource
+    WalletPayInfoService walletPayInfoService;
+    @Resource
+    WalletTradeDAO walletTradeDAO;
 
 
     /**
@@ -612,4 +614,33 @@ public class XxlJobHandler {
         }
         log.info("------end refundOrderStatus------");
     }
+
+    /**
+     * 钱包批量转账分账支付状态查询
+     */
+    @XxlJob("batchTransferQuery")
+    public void batchTransferQuery() {
+        MDCUtils.put(CommonConstants.REQUEST_ID, UUID.randomUUID().toString());
+        log.info("------start batchTransferQuery------");
+        boolean hasNext = true;
+        int pageNum = 1;
+        int pageSize = CommonConstants.BATCH_SIZE;
+        while (hasNext) {
+            PageHelper.startPage(pageNum, pageSize);
+            List<String> batchCodes = walletTradeDAO.getPayingOrderBatchCode(WalletTradeModuleEnum.FRANCHISE_PAY.getModule(), 1);
+            hasNext = batchCodes.size() >= pageSize;
+            if (CollectionUtils.isEmpty(batchCodes)) {
+                break;
+            }
+            for (String batchCode : batchCodes) {
+                try {
+                    walletPayInfoService.queryAndUpdateBatchTransferStatus(batchCode);
+                } catch (Exception e) {
+                    log.error("钱包批量转账分账支付状态查询失败, batchCode:{}", batchCode, e);
+                }
+            }
+            pageNum++;
+        }
+        log.info("------end batchTransferQuery------");
+    }
 }