同步网络货运

performance-api/src/main/java/com/clx/performance/enums/IdTypeEnum.java

@@ -18,7 +18,8 @@ public enum IdTypeEnum {
         CASE_OUT_SUCCESS(4L, "提现成功"),
         TOP_UP_SUCCESS(5L, "充值成功"),
         FROZEN(6L, "冻结"),
-        THAW(7L, "解冻")
+        THAW(7L, "解冻"),
+        TAKE_OUT(8L, "扣除")
         ;
         private final Long code;
         private final String msg;

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

@@ -29,4 +29,7 @@ public interface OwnerRunningWaterRecordDao extends BaseDao<OwnerRunningWaterRec
     List<OwnerRunningWaterRecord> getOwnerRunningWaterRecord(String orderNo);
 
     List<OwnerAccountRunningWaterRecordVO> marginAccountList(PagePlatformMarginAccountParam param);
+
+    OwnerRunningWaterRecord getOneByOrderNoAndRunningWaterTypeAndAccountType(String orderNo, Integer runningWaterType, Integer accountType);
+
 }

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

@@ -58,4 +58,12 @@ public class OwnerRunningWaterRecordDaoImpl extends BaseDaoImpl<OwnerRunningWate
     public List<OwnerAccountRunningWaterRecordVO> marginAccountList(PagePlatformMarginAccountParam param) {
         return baseMapper.marginAccountList(param);
     }
+
+    @Override
+    public OwnerRunningWaterRecord getOneByOrderNoAndRunningWaterTypeAndAccountType(String orderNo, Integer runningWaterType, Integer accountType) {
+        return baseMapper.selectOne(lQrWrapper().eq(OwnerRunningWaterRecord::getOrderNo, orderNo)
+                .eq(OwnerRunningWaterRecord::getRunningWaterType, runningWaterType)
+                .eq(OwnerRunningWaterRecord::getAccountType, accountType)
+        );
+    }
 }

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

@@ -23,10 +23,11 @@ import java.util.Objects;
 @Repository
 public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> implements SettlementDriverDetailDao {
     @Override
-    public boolean updateInvoiceType(SettlementDriverDetail item) {
+    public boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item) {
         return update(lUdWrapper()
                 .eq(SettlementDriverDetail::getId, item.getId())
                 .set(SettlementDriverDetail::getInvoiceType, item.getInvoiceType())
+                .set(SettlementDriverDetail::getPrepayFreightFlag, item.getPrepayFreightFlag())
         );
     }
 

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

@@ -15,7 +15,7 @@ import com.msl.common.dao.BaseDao;
  */
 public interface SettlementDriverDetailDao extends BaseDao<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> {
 
-    boolean updateInvoiceType(SettlementDriverDetail item);
+    boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item);
     boolean updateSettlementNo(SettlementDriverDetail item);
 
 

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

@@ -165,6 +165,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private ZjxlGpsService zjxlGpsService;
 
+    @Autowired
+    private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
+
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
 
@@ -1055,6 +1058,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新车辆状态
         updateDriverOrderStatusDriverConfirm(orderChild.getTruckId());
 
+        // 生成扣除流水
+
         // 生成计费单
         saveSettlementDetail(orderChild,orderGoods);
 

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

@@ -2,11 +2,18 @@ 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.IdGenerateSnowFlake;
+import com.clx.performance.dao.OwnerAccountDao;
+import com.clx.performance.dao.OwnerRunningWaterRecordDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.enums.IdTypeEnum;
+import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.OwnerAccount;
+import com.clx.performance.model.OwnerRunningWaterRecord;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
@@ -41,6 +48,9 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
     private final SettlementOwnerDetailDao settlementOwnerDetailDao;
     private final SettlementOwnerDetailStruct settlementOwnerDetailStruct;
+    private final IdGenerateSnowFlake idGenerateSnowFlake;
+    private final OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
+    private final OwnerAccountDao ownerAccountDao;
 
 
     @Override
@@ -75,7 +85,50 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         settlementOwnerDetail.setLossFreight(lossFreightCalc(settlementOwnerDetail.getLossPrice(), settlementOwnerDetail.getLossWeight()));
 
         // 预付运费
+        BigDecimal ans = settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight());
+        if (ans.compareTo(BigDecimal.ZERO) <= 0) {
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
+        } else {
+            List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderChild.getOrderNo());
+            BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
+                return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode());
+            }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            BigDecimal takeOut = runningWaterRecordList.stream().filter(item -> {
+                return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
+            }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal subtract = frozen.subtract(takeOut);
+            if (subtract.compareTo(BigDecimal.ZERO) <= 0) {
+                settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
+            }
+            if (subtract.subtract(ans).compareTo(BigDecimal.ZERO) >= 0) {
+                OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
+                        OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+
+                settlementOwnerDetail.setPrepayFreight(ans);
+                OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
+                runningWaterRecord.setOwnerUserName(orderChild.getOwnerName());
+                runningWaterRecord.setMobile(orderChild.getDriverMobile());
+                runningWaterRecord.setCreateBy("系统");
+                runningWaterRecord.setOrderId(orderChild.getId());
+                runningWaterRecord.setOrderNo(orderChild.getOrderNo());
+
+                runningWaterRecord.setRelationId(null);
+                runningWaterRecord.setAlterationBalance(ans);
+                runningWaterRecord.setFrozenBalance(ans);
+                runningWaterRecord.setUsableBalance(account.getUsableBalance());
+                runningWaterRecord.setTakeOutBalance(BigDecimal.ZERO);
+                runningWaterRecord.setAccountBalance(account.getAccountBalance());
+                runningWaterRecord.setOwnerUserNo(account.getOwnerUserNo());
+
+                runningWaterRecord.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+                runningWaterRecord.setRunningWaterType(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
+                runningWaterRecord.setRunningWaterNo(idGenerateSnowFlake.nextId(IdTypeEnum.Type.TAKE_OUT.getCode()));
+                ownerRunningWaterRecordDao.saveEntity(runningWaterRecord);
+            } else {
+                settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
+            }
+        }
 
         // 开票金额
         settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));

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

@@ -42,13 +42,19 @@ public class SettlementServiceImpl implements SettlementService {
 
         if (settlementOwnerDetail.getInvoiceType() != null) {return;}
 
+        //设置司机预付运费标示
+        if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+            settlementDriverDetail.setPrepayFreightFlag(1);
+        } else {
+            settlementDriverDetail.setPrepayFreightFlag(0);
+        }
         // 货主结算金额<0走普通单
         if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) < 0){
             invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
             settlementDriverDetail.setPrepayFreightFlag(0);
         } else {
             //是否通过风控,调用网络货运
-            //设置预付运费标示
+
             if (SettlementOwnerEnum.InvoiceType.ONLINE.getCode().equals(invoiceType) && settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
                 settlementDriverDetail.setPrepayFreightFlag(1);
             }
@@ -64,7 +70,7 @@ public class SettlementServiceImpl implements SettlementService {
         }
 
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
-        settlementDriverDetailDao.updateInvoiceType(settlementDriverDetail);
+        settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
 
         // 发送mq 通过开票标识
         settlementMqService.invoiceTypeSync(childNo, invoiceType);

performance-web/src/test/java/com/clx/performance/JobTest.java

@@ -7,8 +7,15 @@ import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 import com.clx.performance.param.mq.OrderCancelMqParam;
 import com.clx.performance.service.OrderCancelService;
+import com.clx.performance.vo.feign.transport.ThirdOrderChildBrokerResultVO;
+import com.clx.user.feign.TruckFeign;
+import com.msl.common.result.Result;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.amqp.core.Message;
@@ -49,6 +56,9 @@ public class JobTest {
     @Autowired
     private OrderCancelService orderCancelService;
 
+    @Autowired
+    private TransportFeignService transportFeignService;
+
     @Test
     public void test1() {
 
@@ -62,7 +72,20 @@ public class JobTest {
 
         //orderCancelService.ownerCancelOrderPre("PT2023102700473");
         //orderCancelService.ownerCancelOrder("PT2023102600466");
-        recordComponent.deleteTruckRecord("123");
-        System.out.println();
+        OrderChild orderChild = new OrderChild();
+        OrderGoods orderGoods = new OrderGoods();
+        ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
+        param.setOrderNo(orderChild.getOrderNo());
+        param.setChildNo(orderChild.getChildNo());
+        param.setTruckNo(orderChild.getTruckNo());
+        param.setFreightPrice(Integer.valueOf(orderChild.getFreightPrice().toString()));
+        param.setFreight(Integer.valueOf(orderChild.getFreight().toString()));
+        param.setSendAddress(orderGoods.getSendAddressShorter());
+        //缺省市区
+        param.setSendName(orderGoods.getUserName());
+
+
+        Result<ThirdOrderChildBrokerResultVO> thirdOrderChildBrokerResultVOResult = transportFeignService.orderChildSync(param);
+        System.out.println(thirdOrderChildBrokerResultVOResult);
     }
 }