引入open-sdk

performance-web/src/main/java/com/clx/performance/controller/sdk/ThirdPartyController.java

-package com.clx.performance.controller.sdk;
-
-import com.alibaba.fastjson.JSON;
-import com.clx.performance.sdk.constant.ActionConstants;
-import com.clx.performance.sdk.request.action.PaymentSettlementAction;
-import com.clx.performance.service.settle.third.ThirdSettlementOwnerService;
-import com.msl.common.dto.HttpDTO;
-import com.msl.common.result.Result;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Objects;
-
-import static org.bouncycastle.cms.CMSSignedGenerator.DATA;
-
-@Api(tags = "第三方")
-@RestController
-@RequestMapping("/encrypt/third")
-@Slf4j
-@AllArgsConstructor
-public class ThirdPartyController {
-
-    private final ThirdSettlementOwnerService thirdSettlementOwnerService;
-
-
-    @PostMapping("/doAction")
-    public Object doAction(HttpServletRequest request) {
-        HttpDTO httpDTO = (HttpDTO) request.getAttribute(DATA);
-        String action = httpDTO.getAction();
-        if (Objects.equals(action, ActionConstants.PAYMENT_SETTLEMENT)) {
-            thirdSettlementOwnerService.updateThirdPaymentSettlement(JSON.parseObject(httpDTO.getData(), PaymentSettlementAction.class));
-        }
-        return Result.ok();
-    }
-}
+//package com.clx.performance.controller.sdk;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.clx.performance.sdk.constant.ActionConstants;
+//import com.clx.performance.sdk.request.action.PaymentSettlementAction;
+//import com.clx.performance.service.settle.third.ThirdSettlementOwnerService;
+//import com.msl.common.dto.HttpDTO;
+//import com.msl.common.result.Result;
+//import io.swagger.annotations.Api;
+//import lombok.AllArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import java.util.Objects;
+//
+//import static org.bouncycastle.cms.CMSSignedGenerator.DATA;
+//
+//@Api(tags = "第三方")
+//@RestController
+//@RequestMapping("/encrypt/third")
+//@Slf4j
+//@AllArgsConstructor
+//public class ThirdPartyController {
+//
+//    private final ThirdSettlementOwnerService thirdSettlementOwnerService;
+//
+//
+//    @PostMapping("/doAction")
+//    public Object doAction(HttpServletRequest request) {
+//        HttpDTO httpDTO = (HttpDTO) request.getAttribute(DATA);
+//        String action = httpDTO.getAction();
+//        if (Objects.equals(action, ActionConstants.PAYMENT_SETTLEMENT)) {
+//            thirdSettlementOwnerService.updateThirdPaymentSettlement(JSON.parseObject(httpDTO.getData(), PaymentSettlementAction.class));
+//        }
+//        return Result.ok();
+//    }
+//}

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

 package com.clx.performance.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.clx.open.sdk.callback.message.OrderChildMessage;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dto.dts.DataTransportDTO;
 import com.clx.performance.enums.DtsOperationTypeEnum;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.extranal.encrypt.EncryptService;
-import com.clx.performance.sdk.callback.message.OrderChildMessage;
 import com.msl.common.utils.DtsMapConvertUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -16,7 +16,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.Objects;
 
-import static com.clx.performance.sdk.constant.MessageConstants.*;
 
 @Slf4j
 @Component
@@ -40,17 +39,17 @@ public class OrderChildDtsListener  {
             if(Objects.equals(DtsOperationTypeEnum.INSERT.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //同步after数据
                 log.info("新增:{}"+after);
-                encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(after),after.topic());
+                //encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(after),after.topic());
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && !Objects.equals(before.getStatus(),after.getStatus())){
                     //同步after数据
                     log.info("修改:{}"+after);
-                    encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(after),after.topic());
+                    //encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(after),after.topic());
                 }
             }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //数据删除
                 log.info("删除:{}"+before);
-                encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(before),before.topic());
+                //encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(before),before.topic());
             }
 
 

performance-web/src/main/java/com/clx/performance/service/impl/settle/third/ThirdSettlementOwnerServiceImpl.java

-package com.clx.performance.service.impl.settle.third;
-
-import com.clx.performance.dao.settle.SettlementLogDao;
-import com.clx.performance.dao.settle.SettlementOwnerDao;
-import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
-import com.clx.performance.enums.OrderChildLogEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.settle.SettlementLogEnum;
-import com.clx.performance.enums.settle.SettlementOwnerEnum;
-import com.clx.performance.model.settle.SettlementOwner;
-import com.clx.performance.sdk.request.action.PaymentSettlementAction;
-import com.clx.performance.service.OwnerAccountService;
-import com.clx.performance.service.settle.SettlementLogService;
-import com.clx.performance.service.settle.third.ThirdSettlementOwnerService;
-import com.clx.performance.struct.settle.SettlementLogStruct;
-import com.clx.performance.struct.settle.SettlementOwnerStruct;
-import com.msl.common.exception.ServiceSystemException;
-import com.msl.user.data.UserSessionData;
-import com.msl.user.utils.TokenUtil;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-/**
- * @author liruixin
- * Date 2023-10-12
- * Time 09:43
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-public class ThirdSettlementOwnerServiceImpl implements ThirdSettlementOwnerService {
-
-    private final SettlementOwnerDao settlementOwnerDao;
-
-    private final SettlementOwnerStruct settlementOwnerStruct;
-
-    private final SettlementLogDao settlementLogDao;
-
-    private final SettlementLogStruct settlementLogStruct;
-
-    private final SettlementPlatformAccountDao settlementPlatformAccountDao;
-
-    private final SettlementLogService settlementLogService;
-
-    private final OwnerAccountService ownerAccountService;
-
-    @Override
-    public void updateThirdPaymentSettlement(PaymentSettlementAction param) {
-        //结算单详情
-        SettlementOwner settlementOwner =settlementOwnerDao.selectBySettlementNo(param.getSettlementNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
-        //状态判断
-        if(!Objects.equals(settlementOwner.getStatus(), SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode())){
-            throw new ServiceSystemException(PerformanceResultEnum.SETTLEMENT_ORDER_STATUS_CHANGED);
-        }
-
-        String settlementNo = settlementOwner.getSettlementNo();
-        //更新状态为平台确认货主付款
-        SettlementOwner settlement = SettlementOwner.builder().payee(param.getPayee()).payeeBankCardNo(param.getPayeeBankCardNo())
-                .payeeBankName(param.getPayeeBankName()).paymentBankCardNo(param.getPaymentBankCardNo())
-                .paymentBankName(param.getPaymentBankName()).paymentImg(param.getPaymentImg())
-                .settlementNo(settlementOwner.getSettlementNo())
-                .status(SettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode()).build();
-        settlementOwnerDao.updatePayment(settlement);
-
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        //保存结算单日志
-        settlementLogService.saveSettlementLog(settlementNo,
-                SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getCode(),SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getMsg(),
-                OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
-    }
-
-
-}
+//package com.clx.performance.service.impl.settle.third;
+//
+//import com.clx.performance.dao.settle.SettlementLogDao;
+//import com.clx.performance.dao.settle.SettlementOwnerDao;
+//import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
+//import com.clx.performance.enums.OrderChildLogEnum;
+//import com.clx.performance.enums.PerformanceResultEnum;
+//import com.clx.performance.enums.settle.SettlementLogEnum;
+//import com.clx.performance.enums.settle.SettlementOwnerEnum;
+//import com.clx.performance.model.settle.SettlementOwner;
+//import com.clx.performance.sdk.request.action.PaymentSettlementAction;
+//import com.clx.performance.service.OwnerAccountService;
+//import com.clx.performance.service.settle.SettlementLogService;
+//import com.clx.performance.service.settle.third.ThirdSettlementOwnerService;
+//import com.clx.performance.struct.settle.SettlementLogStruct;
+//import com.clx.performance.struct.settle.SettlementOwnerStruct;
+//import com.msl.common.exception.ServiceSystemException;
+//import com.msl.user.data.UserSessionData;
+//import com.msl.user.utils.TokenUtil;
+//import lombok.AllArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.Objects;
+//
+///**
+// * @author liruixin
+// * Date 2023-10-12
+// * Time 09:43
+// */
+//@Slf4j
+//@Service
+//@AllArgsConstructor
+//public class ThirdSettlementOwnerServiceImpl implements ThirdSettlementOwnerService {
+//
+//    private final SettlementOwnerDao settlementOwnerDao;
+//
+//    private final SettlementOwnerStruct settlementOwnerStruct;
+//
+//    private final SettlementLogDao settlementLogDao;
+//
+//    private final SettlementLogStruct settlementLogStruct;
+//
+//    private final SettlementPlatformAccountDao settlementPlatformAccountDao;
+//
+//    private final SettlementLogService settlementLogService;
+//
+//    private final OwnerAccountService ownerAccountService;
+//
+//    @Override
+//    public void updateThirdPaymentSettlement(PaymentSettlementAction param) {
+//        //结算单详情
+//        SettlementOwner settlementOwner =settlementOwnerDao.selectBySettlementNo(param.getSettlementNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+//
+//        //状态判断
+//        if(!Objects.equals(settlementOwner.getStatus(), SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode())){
+//            throw new ServiceSystemException(PerformanceResultEnum.SETTLEMENT_ORDER_STATUS_CHANGED);
+//        }
+//
+//        String settlementNo = settlementOwner.getSettlementNo();
+//        //更新状态为平台确认货主付款
+//        SettlementOwner settlement = SettlementOwner.builder().payee(param.getPayee()).payeeBankCardNo(param.getPayeeBankCardNo())
+//                .payeeBankName(param.getPayeeBankName()).paymentBankCardNo(param.getPaymentBankCardNo())
+//                .paymentBankName(param.getPaymentBankName()).paymentImg(param.getPaymentImg())
+//                .settlementNo(settlementOwner.getSettlementNo())
+//                .status(SettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode()).build();
+//        settlementOwnerDao.updatePayment(settlement);
+//
+//        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+//        //保存结算单日志
+//        settlementLogService.saveSettlementLog(settlementNo,
+//                SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getCode(),SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getMsg(),
+//                OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+//    }
+//
+//
+//}

performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java

@@ -3,7 +3,6 @@ package com.clx.performance.service.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
-import com.clx.performance.sdk.request.action.PaymentSettlementAction;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;

performance-web/src/main/java/com/clx/performance/service/settle/third/ThirdSettlementOwnerService.java

-package com.clx.performance.service.settle.third;
-
-import com.clx.performance.sdk.request.action.PaymentSettlementAction;
-
-/**
- * @author liruixin
- * Date 2023-10-12
- * Time 09:43
- */
-public interface ThirdSettlementOwnerService {
-
-    void updateThirdPaymentSettlement(PaymentSettlementAction action);
-}
+//package com.clx.performance.service.settle.third;
+//
+//import com.clx.performance.sdk.request.action.PaymentSettlementAction;
+//
+///**
+// * @author liruixin
+// * Date 2023-10-12
+// * Time 09:43
+// */
+//public interface ThirdSettlementOwnerService {
+//
+//    void updateThirdPaymentSettlement(PaymentSettlementAction action);
+//}