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

performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildPaySyncParam.java

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildPaySyncParam {
+
+    @ApiModelProperty(value = "运单编号列表")
+    @NotEmpty(message = "运单编号不能为空")
+    private List<String> childNoList;
+
+}

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

@@ -18,6 +18,7 @@ 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.service.TransportSyncService;
+import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
 import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -37,24 +38,26 @@ import org.springframework.web.bind.annotation.*;
 public class TransportSyncController {
 
 
-    @Autowired
-    private TransportSyncService transportSyncService;
+    private final TransportSyncService transportSyncService;
 
-    @Autowired
-    private OrderChildDao orderChildDao;
+    private final OrderChildDao orderChildDao;
 
-    @Autowired
-    private SettlementOwnerDetailDao settlementOwnerDetailDao;
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
 
-    @Autowired
-    private OrderGoodsDao orderGoodsDao;
+    private final OrderGoodsDao orderGoodsDao;
 
-    @Autowired
-    private TransportFeignService transportFeignService;
+    private final TransportFeignService transportFeignService;
 
-    @Autowired
-    private SettlementDriverDetailDao settlementDriverDetailDao;
+    private final SettlementDriverDetailDao settlementDriverDetailDao;
 
+
+    private final OrderChildSyncTransportRecordService orderChildSyncTransportRecordService;
+
+    /**
+     * 支付结果
+     * @param param
+     * @return
+     */
     @ApiOperation(value = "payStatusNotify", notes = "<br>By:胡宇帆")
     @PostMapping("/payStatusNotify")
     public Object payStatusNotify(@RequestBody String param) {
@@ -62,6 +65,25 @@ public class TransportSyncController {
         log.info("payStatusNotify 原始报文：{}", bean);
         String decrypt = ThirdComponent.decrypt(bean.getData());
         log.info("payStatusNotify 解密后：{}", decrypt);
+        PayStatusNotifyDTO payStatusNotifyDTO = JSONUtil.toBean(decrypt, PayStatusNotifyDTO.class);
+        orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
+        return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
+    }
+
+    /**
+     * 开票结果
+     * @param param
+     * @return
+     */
+    @ApiOperation(value = "invoicingStatusNotify", notes = "<br>By:胡宇帆")
+    @PostMapping("/invoicingStatusNotify")
+    public Object invoicingStatusNotify(@RequestBody String param) {
+//        HttpDTO bean = JSONUtil.toBean(param, HttpDTO.class);
+//        log.info("payStatusNotify 原始报文：{}", bean);
+//        String decrypt = ThirdComponent.decrypt(bean.getData());
+//        log.info("payStatusNotify 解密后：{}", decrypt);
+//        PayStatusNotifyDTO payStatusNotifyDTO = JSONUtil.toBean(decrypt, PayStatusNotifyDTO.class);
+//        orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
         return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
     }
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/OrderChildSyncTransportRecordDaoImpl.java

@@ -21,4 +21,11 @@ public class OrderChildSyncTransportRecordDaoImpl extends BaseDaoImpl<OrderChild
     public List<OrderChildSyncTransportRecord> selectListForJob() {
         return baseMapper.selectList(lQrWrapper().eq(OrderChildSyncTransportRecord::getStatus, 0));
     }
+
+    @Override
+    public void updateStatus(String childNo) {
+        update(lUdWrapper().eq(OrderChildSyncTransportRecord::getChildNo, childNo)
+                .set(OrderChildSyncTransportRecord::getStatus, 2)
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/OrderChildSyncTransportRecordDao.java

@@ -16,4 +16,6 @@ public interface OrderChildSyncTransportRecordDao extends BaseDao<OrderChildSync
 
 
     List<OrderChildSyncTransportRecord> selectListForJob();
+
+    void updateStatus(String childNo);
 }

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

 package com.clx.performance.feign;
 
-import com.clx.performance.param.feign.transport.OwnerLegalSyncParam;
-import com.clx.performance.param.feign.transport.OwnerPersonalSyncParam;
-import com.clx.performance.param.feign.transport.OwnerSettlementSyncParam;
-import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
+import com.clx.performance.param.feign.transport.*;
 import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -29,7 +26,7 @@ public interface TransportFeignService {
      * 运单支付运费同步
      */
     @RequestMapping(value = "/transport-service/thirdParty/order/orderChildPaySync", method = RequestMethod.POST)
-    HttpDTO orderChildPaySync(@RequestBody @NotEmpty(message = "运单编号不能为空") List<String> childNoList);
+    HttpDTO orderChildPaySync(@RequestBody OrderChildPaySyncParam param);
 
     /**
      * 获取运单开票状态

performance-web/src/main/java/com/clx/performance/job/OrderChildPaySyncTransportJob.java

@@ -7,6 +7,7 @@ import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
 import com.clx.performance.dto.OrderChildSyncDTO;
 import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
 import com.msl.common.dto.HttpDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
@@ -36,7 +37,9 @@ public class OrderChildPaySyncTransportJob {
         }
 
         List<String> orderChilList = recordList.stream().map(OrderChildSyncTransportRecord::getChildNo).collect(Collectors.toList());
-        HttpDTO httpDTO = transportFeignService.orderChildPaySync(orderChilList);
+        OrderChildPaySyncParam param = new OrderChildPaySyncParam();
+        param.setChildNoList(orderChilList);
+        HttpDTO httpDTO = transportFeignService.orderChildPaySync(param);
         String decrypt = ThirdComponent.decrypt(httpDTO.getData());
         OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
         if (bean.getCode() == 0) {

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.settle;
 
 
 import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
+import com.clx.performance.dto.PayStatusNotifyDTO;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
@@ -31,4 +32,10 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         record.setStatus(0);
         orderChildSyncTransportRecordDao.saveEntity(record);
     }
+
+    @Override
+    public void updateStatus(PayStatusNotifyDTO payStatusNotifyDTO) {
+        String childNo = payStatusNotifyDTO.getChildNo();
+        orderChildSyncTransportRecordDao.updateStatus(childNo);
+    }
 }

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

 package com.clx.performance.service.settle;
 
+import com.clx.performance.dto.PayStatusNotifyDTO;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 
 /**
@@ -10,4 +11,6 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 public interface OrderChildSyncTransportRecordService {
 
     void addOrderChildSyncTransportRecord(SettlementDriverDetail detail);
+
+    void updateStatus(PayStatusNotifyDTO payStatusNotifyDTO);
 }