Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

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

 package com.clx.performance.controller.pc;
 
 
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.component.ThirdComponent;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
-import com.clx.performance.dto.OrderChildSyncDTO;
-import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.feign.TransportFeignService;
-import com.clx.performance.model.OrderChild;
-import com.clx.performance.model.OrderGoods;
-import com.clx.performance.model.settle.SettlementDriverDetail;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
-import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 import com.clx.performance.param.pc.ArtificialCancelOrderParam;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.OrderChildCancelRecordParam;
-import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.service.OrderCancelService;
 import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.vo.app.OrderChildVO;
-import com.clx.performance.vo.feign.transport.ThirdOrderChildBrokerResultVO;
-import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
-import com.msl.common.base.PageParam;
-import com.msl.common.convertor.aspect.UnitCovert;
-import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,8 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Slf4j
 @RestController
 @RequestMapping(value="/pc/order/")
@@ -50,23 +33,6 @@ public class OrderCancelController {
 
     private final OrderCancelService orderCancelService;
 
-    @Autowired
-    private TransportSyncService transportSyncService;
-
-    @Autowired
-    private OrderChildDao orderChildDao;
-
-    @Autowired
-    private SettlementOwnerDetailDao settlementOwnerDetailDao;
-
-    @Autowired
-    private OrderGoodsDao orderGoodsDao;
-
-    @Autowired
-    private TransportFeignService transportFeignService;
-
-    @Autowired
-    private SettlementDriverDetailDao settlementDriverDetailDao;
 
     @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/platformCancelOrderPre")
@@ -104,21 +70,5 @@ public class OrderCancelController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
-    @ApiOperation(value = "syncTest", notes = "<br>By:胡宇帆")
-    @GetMapping("/syncTest")
-    public Result<OrderChildSyncDTO> syncTest(@RequestParam String childNo) {
-        OrderChild orderChild = orderChildDao.getByChildNo(childNo).get();
-        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
-        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
-        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
-        log.info("=======================生成Param{}", JSONUtil.parse(param));
-        HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
-        String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
-        OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
-        return Result.ok(bean);
-    }
-
 
 }

performance-web/src/main/java/com/clx/performance/feign/TransportFeignService.java

@@ -39,7 +39,7 @@ public interface TransportFeignService {
      * 货主结算单同步 (只推同一货主)
      */
     @RequestMapping(value = "/transport-service/thirdParty/order/ownerSettlementSync", method = RequestMethod.POST)
-    Result ownerSettlementSync(@RequestBody OwnerSettlementSyncParam param);
+    HttpDTO ownerSettlementSync(@RequestBody OwnerSettlementSyncParam param);
 
     /**
      * 货主同步(法人模式)

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

@@ -332,6 +332,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
 
     public void generateRouteList(GdRouteDTO gdRouteDTO, ThirdOrderChildBrokerParam param) {
         if ("13005382757".equals(param.getDriverInfoDTO().getMobile())) {
+            log.info("当前司机不需要获取轨迹");
             return;
         }
         List<OrderChildTruckTraceDTO> list = new LinkedList<>();

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.component.ThirdComponent;
 import com.clx.performance.dao.settle.SettlementLogDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
@@ -12,9 +13,12 @@ import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
+import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.model.settle.SettlementPlatformAccount;
+import com.clx.performance.param.feign.transport.OwnerSettlementSyncParam;
 import com.clx.performance.param.pc.owner.*;
 import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.service.settle.SettlementLogService;
@@ -28,7 +32,9 @@ import com.clx.performance.utils.excel.ExcelUtil;
 import com.clx.performance.vo.pc.carrier.settle.*;
 import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
+import com.clx.user.feign.OwnerFeign;
 import com.clx.user.vo.pc.owner.OwnerBindCardVO;
+import com.msl.common.dto.HttpDTO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
@@ -40,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 
@@ -69,6 +76,9 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
 
     private final OwnerAccountService ownerAccountService;
 
+    private final OwnerFeign ownerFeign;
+
+    private final TransportFeignService transportFeignService;
 
     @Override
     public CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id) {
@@ -471,7 +481,24 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         }else{
             if (Objects.equals(settlementOwner.getInvoiceType(), SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
                 settlementOwnerDao.updateStatusBySettlementNo(settlementNo,SettlementOwnerEnum.Status.COMPLETED.getCode());
+                String mobile = ownerFeign.getOwnerInfo(settlementOwner.getOwnerUserNo()).getData().getMobile();
                 //TODO 通知网络货运做货主计费开票标识通知
+                OwnerSettlementSyncParam param = new OwnerSettlementSyncParam();
+                param.setOwnerMobile(mobile);
+                List<OwnerSettlementSyncParam.SettlementItem> settlementList = new LinkedList<>();
+                param.setSettlementList(settlementList);
+                List<SettlementOwnerDetail> settlementOwnerDetailList = settlementOwnerDetailDao.getBySettlementNo(settlementNo);
+                for (SettlementOwnerDetail settlementOwnerDetail : settlementOwnerDetailList) {
+                    String childNo = settlementOwnerDetail.getChildNo();
+                    OwnerSettlementSyncParam.SettlementItem  item = new OwnerSettlementSyncParam.SettlementItem();
+                    item.setChildNo(childNo);
+                    item.setSettlementNo(settlementOwnerDetail.getSettlementNo());
+                    settlementList.add(item);
+                }
+                HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param);
+                String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+                log.info("通知网络货运做货主计费开票标识通知请求解密后：{}", decrypt);
+
             }else{
                 settlementOwnerDao.updateStatusBySettlementNo(settlementNo,SettlementOwnerEnum.Status.INVOICE_TO_BE_MAILED.getCode());
             }