同步运单风控

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

@@ -3,10 +3,12 @@ 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;
@@ -104,7 +106,7 @@ public class OrderCancelController {
 
     @ApiOperation(value = "syncTest", notes = "<br>By:胡宇帆")
     @GetMapping("/syncTest")
-    public Result<HttpDTO> syncTest(@RequestParam String childNo) {
+    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);
@@ -113,7 +115,9 @@ public class OrderCancelController {
         ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
         log.info("=======================生成Param{}", JSONUtil.parse(param));
         Result<HttpDTO> httpDTOResult = transportFeignService.orderChildSync(param);
-        return httpDTOResult;
+        String decrypt = ThirdComponent.decrypt(httpDTOResult.getData().getData());
+        OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
+        return Result.ok(bean);
     }
 
 

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

@@ -147,9 +147,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void settlementDetailAdd(SettlementDetailAddMqParam mq) {
-
-        //查询网络货运运单是否合规
-
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getEntityByKey(mq.getSettlementOwnerDetailId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         //SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getEntityByKey(mq.getSettlementDriverDetailId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);