对公转账流程,已完成测试账号，生产账号需要配置授权

ship-module-ota/ship-module-ota-api/src/main/java/com/yc/ship/module/ota/api/dto/DistributorSelfRechargeReqDTO.java

@@ -17,6 +17,9 @@ public class DistributorSelfRechargeReqDTO {
     @NotNull
     private Long orderId;
 
+    @Schema(description = "分销商ID", example = "27454")
+    private Long distributorId;
+
     @Schema(description = "支付单ID", example = "27454")
     @NotNull
     private String payOrderId;
@@ -24,4 +27,5 @@ public class DistributorSelfRechargeReqDTO {
     @Schema(description = "支付状态0失败 1成功", example = "1")
     @NotNull
     private Integer payStatus;
+
 }

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/api/OtaDistributorApiImpl.java

@@ -54,7 +54,7 @@ public class OtaDistributorApiImpl implements OtaDistributorApi{
 
     @Override
     public CommonResult<?> distributorCMBRecharge(DistributorSelfRechargeReqDTO payNotifyReqDTO) {
-        Long id = distributorSelfRechargeService.distributorCMBRecharge(payNotifyReqDTO.getOrderId(), payNotifyReqDTO.getPayOrderId(), payNotifyReqDTO.getPayStatus());
+        Long id = distributorSelfRechargeService.distributorCMBRecharge(payNotifyReqDTO.getDistributorId(),payNotifyReqDTO.getOrderId(), payNotifyReqDTO.getPayOrderId(), payNotifyReqDTO.getPayStatus());
         return CommonResult.success(id);
     }
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/job/ABCQueryJob.java

@@ -2,6 +2,8 @@ package com.yc.ship.module.ota.job;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
+import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
 import com.yc.ship.framework.tenant.core.job.TenantJob;
 import com.yc.ship.module.infra.api.config.ConfigApi;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
@@ -15,7 +17,7 @@ import java.util.List;
 
 @Slf4j
 @Component
-public class ABCQueryJob implements JobHandler {
+public class AbcQueryJob implements JobHandler {
 
     @Resource
     private DistributorSelfRechargeService distributorSelfRechargeService;
@@ -27,8 +29,9 @@ public class ABCQueryJob implements JobHandler {
     private ConfigApi configApi;
 
     @Override
-    @TenantJob
+    @TenantIgnore
     public String execute(String param) {
+        log.error(">>>>>>>>>>>>>>>>>>>>>> AbcQueryJob <<<<<<<<<<<<<<<<<<<<<<");
         List<DistributorDO> list = distributorService.selectChildNo();
 
         String host = configApi.getPlatformConfigValueByKey("dgConfig_ip");

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorselfrecharge/DistributorSelfRechargeService.java

@@ -55,6 +55,6 @@ public interface DistributorSelfRechargeService {
     PageResult<DistributorSelfRechargeDO> getDistributorSelfRechargePage(DistributorSelfRechargePageReqVO pageReqVO);
 
     Long distributorSelfRecharge(Long id, String payOrderId, Integer payStatus);
-    Long distributorCMBRecharge(Long id, String payOrderId, Integer payStatus);
+    Long distributorCMBRecharge(Long distributorId, Long id, String payOrderId, Integer payStatus);
     void abcRemittance(DistributorDO distributorDO, String host, Integer posrt, String yqtCard, int ofday, String url);
 }

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorselfrecharge/DistributorSelfRechargeServiceImpl.java

@@ -230,10 +230,11 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long distributorCMBRecharge(Long id, String payOrderId, Integer payStatus) {
+    public Long distributorCMBRecharge(Long distributorId,Long id, String payOrderId, Integer payStatus) {
         log.info("对公转账充值支付完成：{}，{},{}", id, payOrderId, payStatus);
         AtomicReference<Long> tradeLogId = new AtomicReference<>();
-        DistributorSelfRechargeDO distributorSelfRecharge = getDistributorSelfRecharge(id);
+        DistributorSelfRechargeDO distributorSelfRecharge = distributorSelfRechargeMapper.selectById(id);
+//        DistributorSelfRechargeDO distributorSelfRecharge = getDistributorSelfRecharge(id);
         if (distributorSelfRecharge.getRechargeState() == 1) {
             throw exception0(11_029, "当前自助充值已处理");
         }
@@ -416,8 +417,8 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
                                 DistributorSelfRechargeReqDTO reqDTO = new DistributorSelfRechargeReqDTO();
                                 reqDTO.setOrderId(newRecharge.getId());
                                 reqDTO.setPayOrderId(refNbr);
+                                reqDTO.setDistributorId(distributor.getId());
                                 reqDTO.setPayStatus(1);
-
                                 try {
                                     otaDistributorApi.distributorCMBRecharge(reqDTO).getCheckedData();
                                     log.error("充值通知成功 | orderId:{}", newRecharge.getId());