承运同步网络货运异步

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;
+import lombok.*;
 
 import javax.validation.constraints.NotBlank;
 
 @Getter
 @Setter
-@ToString
-@NoArgsConstructor
+@Builder
 public class ThirdOrderChildRiskStatusParam {
 
     @ApiModelProperty(value = "运单编号")

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

@@ -113,7 +113,7 @@ public class TempController {
     @ApiOperation(value = "获取风控状态 (临时接口)", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/getRiskStatus", method = RequestMethod.POST)
     public Result<Void> getRiskStatus(String childNo) {
-        ThirdOrderChildRiskStatusParam param = new ThirdOrderChildRiskStatusParam();
+        ThirdOrderChildRiskStatusParam param = ThirdOrderChildRiskStatusParam.builder().build();
         param.setChildNo(childNo);
         HttpDTO httpDTO = transportFeignService.getRiskStatus(param);
         String decrypt = ThirdComponent.decrypt(httpDTO.getData());

performance-web/src/main/java/com/clx/performance/dao/OrderChildSyncTransportInvoiceRecordDao.java

@@ -4,10 +4,14 @@ import com.msl.common.dao.BaseDao;
 import com.clx.performance.mapper.OrderChildSyncTransportInvoiceRecordMapper;
 import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2024-01-03
  * Time 10:17
  */
 public interface OrderChildSyncTransportInvoiceRecordDao extends BaseDao<OrderChildSyncTransportInvoiceRecordMapper, OrderChildSyncTransportInvoiceRecord, Integer> {
+
+    List<OrderChildSyncTransportInvoiceRecord> selectListForJob();
 }

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

 package com.clx.performance.dao.impl;
 
+import com.clx.performance.enums.TransportSyncTypeEnum;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import com.clx.performance.dao.OrderChildSyncTransportInvoiceRecordDao;
 import com.clx.performance.mapper.OrderChildSyncTransportInvoiceRecordMapper;
 import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2024-01-03
@@ -13,4 +16,9 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildSyncTransportInvoiceRecordDaoImpl extends BaseDaoImpl<OrderChildSyncTransportInvoiceRecordMapper, OrderChildSyncTransportInvoiceRecord, Integer> implements OrderChildSyncTransportInvoiceRecordDao {
+
+    @Override
+    public List<OrderChildSyncTransportInvoiceRecord> selectListForJob() {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChildSyncTransportInvoiceRecord::getType, TransportSyncTypeEnum.Type.EXCEPTION.getCode()));
+    }
 }

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

+package com.clx.performance.job;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.component.ThirdComponent;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderChildSyncTransportInvoiceRecordDao;
+import com.clx.performance.enums.TransportSyncTypeEnum;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.listener.OrderChildSyncTransportListener;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
+import com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam;
+import com.msl.common.result.Result;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.LinkedList;
+import java.util.List;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class OrderChildSyncTransportInvoiceExceptionJob {
+
+    private final OrderChildSyncTransportInvoiceRecordDao orderChildSyncTransportInvoiceRecordDao;
+
+    private final OrderChildSyncTransportListener orderChildPaySync;
+
+    private final OrderChildDao orderChildDao;
+
+    private final TransportFeignService transportFeignService;
+
+    /**
+     * 同步网络货运
+     */
+    @XxlJob("orderChildSyncTransportInvoiceExceptionJob")
+    @Transactional(rollbackFor = Exception.class)
+    public void orderChildSyncTransportInvoiceExceptionJob() {
+        //只查询同步异常的网络货运任务
+        List<OrderChildSyncTransportInvoiceRecord> recordList = orderChildSyncTransportInvoiceRecordDao.selectListForJob();
+        if (CollectionUtil.isEmpty(recordList)) {
+            return;
+        }
+        List<Integer> ids = new LinkedList<>();
+
+        for (OrderChildSyncTransportInvoiceRecord record : recordList) {
+            String data = transportFeignService.getRiskStatus(ThirdOrderChildRiskStatusParam.builder().childNo(record.getChildNo()).build()).getData();
+            String decrypt = ThirdComponent.decrypt(data);
+            Result bean = JSONUtil.toBean(decrypt, Result.class);
+            if (bean.succeed()) {
+                JSON json = JSONUtil.parse(bean.getData());
+                Object status = json.getByPath("status");
+                if (ObjectUtil.equal(status, 1)) {
+                    OrderChild orderChild = orderChildDao.getByChildNo(record.getChildNo()).get();
+                    ids.add(record.getId());
+                    orderChildPaySync.transportOrderChildProcess(orderChild);
+                } else {
+                    Object riskReason = json.getByPath("riskReason");
+                    OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
+                    entity.setChildNo(json.getByPath("childNo").toString());
+                    entity.setType(TransportSyncTypeEnum.Type.NO_PASS.getCode());
+                    entity.setRemark(riskReason == null ? "" : riskReason.toString());
+                    orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
+                }
+            }
+        }
+
+        orderChildSyncTransportInvoiceRecordDao.deleteByKeys(ids);
+    }
+}

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -29,6 +29,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -72,6 +73,7 @@ public class OrderChildSyncTransportListener {
             transportOrderChildProcess(orderChild);
         } catch (Exception e) {
             log.info("当前OrderChildSyncTransportListener监听同步网络货运失败,运单号{}, 错误信息{}", orderChild.getChildNo(), e.getMessage());
+
             OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
             entity.setChildNo(orderChild.getChildNo());
             entity.setType(TransportSyncTypeEnum.Type.EXCEPTION.getCode());
@@ -91,9 +93,15 @@ public class OrderChildSyncTransportListener {
         HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
         String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
         OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
-        if (bean.getCode() == 0) {
+
+        extracted(orderChild, bean.getData().getStatus(), bean.getCode(), JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
+    }
+
+    private void extracted(OrderChild orderChild, Integer status, Integer code, String remark,
+                           SettlementOwnerDetail settlementOwnerDetail,
+                           Integer invoiceType, SettlementDriverDetail settlementDriverDetail) {
+        if (code == 0) {
             log.info("当前OrderChildSyncTransportListener监听同步网络货运成功,运单号为{}", orderChild.getChildNo());
-            Integer status = bean.getData().getStatus();
             if (status == 1) {
                 //通过风控
                 List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderChild.getOrderNo());
@@ -148,7 +156,6 @@ public class OrderChildSyncTransportListener {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
             }
         } else {
-            String remark = JSONUtil.parse(bean).toString();
             log.info("当前OrderChildSyncTransportListener监听同步网络货运失败,运单号{}, 错误信息{}", orderChild.getChildNo(), remark);
             OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
             entity.setChildNo(orderChild.getChildNo());
@@ -226,17 +233,17 @@ public class OrderChildSyncTransportListener {
         ownerRunningWaterRecordDao.saveEntity(runningWaterRecord);
     }
 
-    private BigDecimal getPrepayFreightPay(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail, BigDecimal accountFrozenPrefreght) {
+    private BigDecimal getPrepayFreightPay(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail, BigDecimal accountFrozenFreight) {
         //订单结算方式为“装车净重”时
         if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) {
             BigDecimal subtract = settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight());
-            if (accountFrozenPrefreght.compareTo(subtract) >= 0) {
+            if (accountFrozenFreight.compareTo(subtract) >= 0) {
                 return subtract;
             } else {
                 return BigDecimal.ZERO;
             }
         } else {
-            if (accountFrozenPrefreght.compareTo(settlementOwnerDetail.getFreight()) >= 0) {
+            if (accountFrozenFreight.compareTo(settlementOwnerDetail.getFreight()) >= 0) {
                 return settlementOwnerDetail.getFreight();
             } else {
                 return BigDecimal.ZERO;

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

@@ -149,12 +149,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
             paySettlementDriver(settlementDriverDetail);
         } else {
-//            if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
-//            && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+            if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
+            && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
                 settlementDriverDetail.setSettlementNo(settlementNo);
                 //插入同步网络货运待支付记录
                 childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
-//            }
+            }
         }
 
         // 更新结算单