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

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildRiskStatusParam.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;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class ThirdOrderChildRiskStatusParam {
+
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;
+
+    @ApiModelProperty(value = "合规状态：0不合规 1合规 2未同步 ")
+    private Integer status;
+
+    @ApiModelProperty(value = "风控原因")
+    private String riskReason;
+
+
+}

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

@@ -18,6 +18,7 @@ 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.feign.transport.ThirdOrderChildRiskStatusParam;
 import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
 import com.clx.performance.service.settle.SettlementOwnerService;
@@ -91,6 +92,23 @@ public class TransportSyncController {
         return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
     }
 
+    /**
+     * 风控结果
+     * @param param
+     * @return
+     */
+    @ApiOperation(value = "riskStatusNotify", notes = "<br>By:艾庆国")
+    @PostMapping("/riskStatusNotify")
+    public Object riskStatusNotify(@RequestBody String param) {
+        HttpDTO bean = JSONUtil.toBean(param, HttpDTO.class);
+        log.info("riskStatusNotify 原始报文：{}", bean);
+        String decrypt = ThirdComponent.decrypt(bean.getData());
+        log.info("riskStatusNotify 解密后：{}", decrypt);
+        ThirdOrderChildRiskStatusParam invoicingStatusNotifyDTO = JSONUtil.toBean(decrypt, ThirdOrderChildRiskStatusParam.class);
+
+        return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
+    }
+
 
     @ApiOperation(value = "syncTest", notes = "<br>By:胡宇帆")
     @GetMapping("/syncTest")

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

@@ -22,6 +22,14 @@ public interface TransportFeignService {
     @RequestMapping(value = "/transport-service/thirdParty/order/orderChildSync", method = RequestMethod.POST)
     HttpDTO orderChildSync(@RequestBody ThirdOrderChildBrokerParam param);
 
+    /**
+     * 获取风控状态
+     * @return
+     * @see com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/order/getRiskStatus", method = RequestMethod.POST)
+    HttpDTO getRiskStatus(@RequestBody @NotBlank(message = "运单编号不能为空") String childNo);
+
     /**
      * 运单支付运费同步
      */

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

@@ -117,7 +117,7 @@ public class SettlementServiceImpl implements SettlementService {
                     log.info("冻结预付运费:{}, 扣除的流水总和：{}", frozen, takeOut);
                     invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
 
-                    //此刻预付运费也可能为0，那么就不用生成扣除相关流水逻辑
+                    //冻结的预付运费为0 或者 此刻预付运费也可能为0，那么就不用生成扣除相关流水逻辑
                     if (subtract.compareTo(BigDecimal.ZERO) <= 0  || ans.compareTo(BigDecimal.ZERO) == 0) {
                         settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
                         settlementDriverDetail.setPrepayFreightFlag(0);