Merge branch 'v6.5_transport_open_20231115' into test

performance-web/src/main/java/com/clx/performance/controller/pc/transport/TransportSyncController.java

@@ -20,6 +20,7 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
+import com.clx.performance.service.settle.SettlementOwnerService;
 import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -51,9 +52,10 @@ public class TransportSyncController {
 
     private final SettlementDriverDetailDao settlementDriverDetailDao;
 
-
     private final OrderChildSyncTransportRecordService orderChildSyncTransportRecordService;
 
+    private final SettlementOwnerService settlementOwnerService;
+
     /**
      * 支付结果
      * @param param
@@ -81,11 +83,11 @@ public class TransportSyncController {
     @PostMapping("/invoicingStatusNotify")
     public Object invoicingStatusNotify(@RequestBody String param) {
         HttpDTO bean = JSONUtil.toBean(param, HttpDTO.class);
-        log.info("payStatusNotify 原始报文：{}", bean);
+        log.info("invoicingStatusNotify 原始报文：{}", bean);
         String decrypt = ThirdComponent.decrypt(bean.getData());
-        log.info("payStatusNotify 解密后：{}", decrypt);
+        log.info("invoicingStatusNotify 解密后：{}", decrypt);
         InvoicingStatusNotifyDTO invoicingStatusNotifyDTO = JSONUtil.toBean(decrypt, InvoicingStatusNotifyDTO.class);
-//        orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
+        settlementOwnerService.invoicingStatusNotify(invoicingStatusNotifyDTO);
         return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
     }
 

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

 package com.clx.performance.controller.temp;
 
+import com.clx.performance.component.ThirdComponent;
 import com.clx.performance.extranal.transport.TransportService;
 import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 import com.clx.performance.config.MslPaymentConfig;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
+import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 
@@ -37,6 +38,8 @@ public class TempController {
     private MslPaymentConfig mslPaymentConfig;
     @Autowired
     private TransportService transportService;
+    @Autowired
+    private TransportFeignService transportFeignService;
 
 
 
@@ -78,14 +81,24 @@ public class TempController {
     }
 
 
-    @ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
-    public Result<Void> orderChildSync() {
-        ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
-        param.setChildNo("123");
+//    @ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国")
+//    @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
+//    public Result<Void> orderChildSync(@RequestBody ThirdOrderChildBrokerParam param1) {
+//        ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
+//        param.setChildNo("123");
+//
+//        transportService.orderChildSync(param);
+//
+//        return Result.ok();
+//    }
 
-        transportService.orderChildSync(param);
+    @ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/orderChildPaySync", method = RequestMethod.GET)
+    public Result<Void> orderChildPaySync(@RequestBody OrderChildPaySyncParam param) {
 
+        HttpDTO httpDTO = transportFeignService.orderChildPaySync(param);
+        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+        log.info("{}", decrypt);
         return Result.ok();
     }
 

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

 package com.clx.performance.service.impl.settle;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.component.ThirdComponent;
@@ -7,6 +8,7 @@ import com.clx.performance.dao.settle.SettlementLogDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
+import com.clx.performance.dto.InvoicingStatusNotifyDTO;
 import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementLogEnum;
@@ -518,5 +520,19 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         }
     }
 
+    @Override
+    public void invoicingStatusNotify(InvoicingStatusNotifyDTO invoicingStatusNotifyDTO) {
+        List<String> childNoList = invoicingStatusNotifyDTO.getChildNoList();
+        if (CollectionUtil.isEmpty(childNoList)) {
+            return;
+        }
+        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNoList.get(0)).get();
+        String settlementNo = settlementOwnerDetail.getSettlementNo();
+        List<SettlementOwnerDetail> list = settlementOwnerDetailDao.getBySettlementNo(settlementNo);
+        for (SettlementOwnerDetail ownerDetail : list) {
+
+        }
+    }
+
 
 }

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

 package com.clx.performance.service.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dto.InvoicingStatusNotifyDTO;
 import com.clx.performance.param.pc.owner.*;
 import com.clx.performance.vo.pc.carrier.settle.*;
 import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
@@ -52,5 +53,5 @@ public interface SettlementOwnerService {
 
     void payeeConfirm(String settlementNo);
 
-
+    void invoicingStatusNotify(InvoicingStatusNotifyDTO invoicingStatusNotifyDTO);
 }