1

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -14,7 +14,7 @@ spring:
     serialization:
       write_dates_as_timestamps: false
   profiles:
-    active: prod
+    active: local
   resources:
     static-locations: file:///winsea/static/
   thymeleaf:
@@ -155,7 +155,7 @@ auth:
   expire-in: 2592000
   login-url: /login.html
   logout-url: /auth/api/logout
-  session-timeout: -1
+  session-timeout: 1800000
   success-url: ''
   unauthorized-url: ''
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","hy_bao_token");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","hy_freezing_money_info");
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -117,6 +117,7 @@ public enum StatusEnum {
     NO_PAYMENT("1", "待支付", "NO_PAYMENT"),
     PEND_ING("3", "暂缓中", "PEND_ING"),
     PAYMENT_ED("5", "已付款", "PAYMENT_ED"),
+    RECEIVED("7", "已到账", "received"),
 
     //货主还款状态
     OUTSTANDING("1", "未还款", "outstanding"),

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyFreezingMoneyInfoController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录货主冻结金额流向信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-16
+ */
+@RestController
+@RequestMapping("/hyFreezingMoneyInfo")
+public class HyFreezingMoneyInfoController {
+
+}
+

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyFreezingMoneyInfo.java

@@ -0,0 +1,60 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录货主冻结金额流向信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class HyFreezingMoneyInfo extends BaseModel<HyFreezingMoneyInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 订单id
+     */
+    private String orderId;
+    /**
+     * 用户id
+     */
+    private String commonId;
+    /**
+     * 企业id
+     */
+    private String companyId;
+    /**
+     * 类型（冻结，解冻，扣除）
+     */
+    private String type;
+    /**
+     * 金额（元）
+     */
+    private Double amountMoney;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyFreezingMoneyInfoMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyFreezingMoneyInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录货主冻结金额流向信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-16
+ */
+public interface HyFreezingMoneyInfoMapper extends BaseMapper<HyFreezingMoneyInfo> {
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyFreezingMoneyInfoService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyFreezingMoneyInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录货主冻结金额流向信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-16
+ */
+public interface IHyFreezingMoneyInfoService extends IService<HyFreezingMoneyInfo> {
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CarrierInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.google.gson.internal.$Gson$Preconditions;
+import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -26,14 +27,12 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
     @Autowired
     private IOrderInfoService orderInfoService;
     @Autowired
-    private ICarrierInfoService carrierInfoService;
+    private IHyFreezingMoneyInfoService hyFreezingMoneyInfoService;
     @Autowired
     private INewsInfoService newsInfoService;
     @Autowired
     private IFreightInfoService freightInfoService;
     @Autowired
-    private IPublishTaskInfoService publishTaskInfoService;
-    @Autowired
     private ICompanyInfoService companyInfoService;
     @Autowired
     private ICargoOwnerInfoService cargoOwnerInfoService;
@@ -164,6 +163,12 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                     orderInfo.setCargoOwnerStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
                     //查询订单是否垫付
                     if("0".equals(orderInfo.getFreightAdvance())){
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo.getId());
+                        hyFreezingMoneyInfo.setType("冻结");
+                        hyFreezingMoneyInfo.setAmountMoney(orderInfo.getAdvanceCharge());
                         if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()){
                            //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
@@ -177,6 +182,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                                 hyCompanyInfo.setAccountBalance(d-orderInfo.getAdvanceCharge());
                                 hyCompanyInfo.setFrozenAmount(d1+orderInfo.getAdvanceCharge());
                                 companyInfoService.updateById(hyCompanyInfo);
+                                hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                             }
                         }
                         else {
@@ -193,8 +199,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                                 hyCargoOwnerInfo.setAccountBalance(d-orderInfo.getAdvanceCharge());
                                 hyCargoOwnerInfo.setFrozenAmount(d1+orderInfo.getAdvanceCharge());
                                 cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                                hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                             }
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
                 } else {
                     //驳回装车更改订单状态
@@ -238,6 +246,14 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                         Double weikuan = freightInfo.getActualFreight() - freightInfo.getPrepaidFreight();
                         //尾款+服务费
                         Double zong = weikuan + freightInfo.getOwnerServiceCharge();
+
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo.getId());
+                        hyFreezingMoneyInfo.setType("冻结");
+                        hyFreezingMoneyInfo.setAmountMoney(zong);
+
                         if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()){
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
@@ -251,6 +267,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                                 hyCompanyInfo.setAccountBalance(d-zong);
                                 hyCompanyInfo.setFrozenAmount(d1+zong);
                                 companyInfoService.updateById(hyCompanyInfo);
+                                hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                             }
                         }
                         else {
@@ -267,8 +284,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                                 hyCargoOwnerInfo.setAccountBalance(d-zong);
                                 hyCargoOwnerInfo.setFrozenAmount(d1+zong);
                                 cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                                hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                             }
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
                 } else {
                     //驳回卸车更改订单状态

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyFreezingMoneyInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyFreezingMoneyInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.HyFreezingMoneyInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IHyFreezingMoneyInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录货主冻结金额流向信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-16
+ */
+@Service
+public class HyFreezingMoneyInfoServiceImpl extends ServiceImpl<HyFreezingMoneyInfoMapper, HyFreezingMoneyInfo> implements IHyFreezingMoneyInfoService {
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyFreightSettlementInfoServiceImpl.java

@@ -50,6 +50,8 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
     private IDriverCarInfoService driverCarInfoService;
     @Autowired
     private ICommonSysParameterService commonSysParameterService;
+    @Autowired
+    private IHyFreezingMoneyInfoService hyFreezingMoneyInfoService;
 
     /**
      * 后台管理司机运费结算列表
@@ -114,8 +116,8 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
         if (CollectionUtils.isNotEmpty(hyFreightSettlementInfoList)) {
             for (int i = 0; i < hyFreightSettlementInfoList.size(); i++) {
                 HyFreightSettlementInfo hyFreightSettlementInfo1 = this.selectById(hyFreightSettlementInfoList.get(i).getId());
-                hyFreightSettlementInfo1.setStatusKey(StatusEnum.PAYMENT_ED.getFlag());
-                hyFreightSettlementInfo1.setStatus(StatusEnum.PAYMENT_ED.getName());
+                hyFreightSettlementInfo1.setStatusKey(StatusEnum.RECEIVED.getFlag());
+                hyFreightSettlementInfo1.setStatus(StatusEnum.RECEIVED.getName());
                 hyFreightSettlementInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
                 hyFreightSettlementInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
                 hyFreightSettlementInfo1.setPaymentDate(new Date());
@@ -191,6 +193,12 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                         repaymentInfo.setTotalRepayable(freightInfo.getReceivableFreight());
                         repaymentInfo.setNotRepaid(freightInfo.getReceivableFreight());
                         repaymentInfoService.updateById(repaymentInfo);
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo1.getId());
+                        hyFreezingMoneyInfo.setType("冻结");
+                        hyFreezingMoneyInfo.setAmountMoney(freightInfo.getReceivableFreight());
                         //冻结货主可用余额
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
@@ -205,6 +213,7 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                                 hyCompanyInfo.setAccountBalance(d2 - freightInfo.getReceivableFreight());
                                 hyCompanyInfo.setFrozenAmount(d3 + freightInfo.getReceivableFreight());
                                 companyInfoService.updateById(hyCompanyInfo);
+                                hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                             }
                         } else {
                             //货主是个人
@@ -220,8 +229,10 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                                 hyCargoOwnerInfo.setAccountBalance(d2 - freightInfo.getReceivableFreight());
                                 hyCargoOwnerInfo.setFrozenAmount(d3 + freightInfo.getReceivableFreight());
                                 cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                                hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                             }
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
                 }
                 //非垫付订单

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -95,7 +95,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Autowired
     private IHyCargoOwnerCapitalInfoService hyCargoOwnerCapitalInfoService;
     @Autowired
-    private IHyDriverCapitalInfoService hyDriverCapitalInfoService;
+    private IHyFreezingMoneyInfoService hyFreezingMoneyInfoService;
     @Autowired
     private IHyFreightSettlementInfoService hyFreightSettlementInfoService;
     @Value("${file-root-path}")
@@ -547,6 +547,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Double weikuan = freightInfo.getActualFreight() - freightInfo.getPrepaidFreight();
                     //尾款+服务费
                     Double zong = weikuan + freightInfo.getOwnerServiceCharge();
+
+                    //生成货主冻结金额流向信息
+                    HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                    hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                    hyFreezingMoneyInfo.setOrderId(orderInfo1.getId());
+                    hyFreezingMoneyInfo.setType("冻结");
+                    hyFreezingMoneyInfo.setAmountMoney(zong);
+
                     if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()){
                         //货主是公司
                         HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
@@ -560,6 +568,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCompanyInfo.setAccountBalance(d-zong);
                             hyCompanyInfo.setFrozenAmount(d1+zong);
                             companyInfoService.updateById(hyCompanyInfo);
+                            hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                         }
                     }
                     else {
@@ -576,8 +585,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCargoOwnerInfo.setAccountBalance(d-zong);
                             hyCargoOwnerInfo.setFrozenAmount(d1+zong);
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                            hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                         }
                     }
+                    hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                 }
             }
             //司机
@@ -605,6 +616,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         Double weikuan = freightInfo.getActualFreight() - freightInfo.getPrepaidFreight();
                         //尾款+服务费
                         Double zong = weikuan + freightInfo.getOwnerServiceCharge();
+
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo1.getId());
+                        hyFreezingMoneyInfo.setType("解冻");
+                        hyFreezingMoneyInfo.setAmountMoney(zong);
+
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
@@ -614,6 +633,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCompanyInfo.setAccountBalance(d + zong);
                             hyCompanyInfo.setFrozenAmount(d1 - zong);
                             companyInfoService.updateById(hyCompanyInfo);
+                            hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                         } else {
                             //货主是个人
                             HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
@@ -624,7 +644,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCargoOwnerInfo.setAccountBalance(d + zong);
                             hyCargoOwnerInfo.setFrozenAmount(d1 - zong);
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                            hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
                 }
             }
@@ -869,7 +891,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     FreightInfo freightInfo = new FreightInfo();
                     freightInfo.setId(IdGenerator.generateUUID());
                     freightInfo.setOrderId(orderInfo1.getId());
-                    freightInfo.setDriverServiceCharge(150d);
+                    freightInfo.setDriverServiceCharge(0d);
                     freightInfo.setPayableFreight(orderInfo1.getAdvanceCharge());
                     freightInfo.setPayabledFreight(0d);
                     freightInfo.setNopayableFreight(freightInfo.getPayableFreight());
@@ -879,6 +901,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         freightInfo.setPrepaidFreight(orderInfo1.getAdvanceCharge());
                         freightInfo.setReceivableFreight(orderInfo1.getAdvanceCharge());
                         freightInfo.setReceivabledFreight(orderInfo1.getAdvanceCharge());
+
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo1.getId());
+                        hyFreezingMoneyInfo.setType("扣除");
+                        hyFreezingMoneyInfo.setAmountMoney(orderInfo1.getAdvanceCharge());
+
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
@@ -886,7 +916,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             Double d1 = hyCompanyInfo.getFrozenAmount();
                             hyCompanyInfo.setFrozenAmount(d1 - orderInfo1.getAdvanceCharge());
                             companyInfoService.updateById(hyCompanyInfo);
-                            if (freightInfo.getReceivableFreight() != 0) {
+                            hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
+                            if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
                                 //生成货主账单信息
                                 HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
                                 hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
@@ -905,7 +936,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             Double d1 = hyCargoOwnerInfo.getFrozenAmount();
                             hyCargoOwnerInfo.setFrozenAmount(d1 - orderInfo1.getAdvanceCharge());
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
-                            if (freightInfo.getReceivableFreight() != null &&freightInfo.getReceivableFreight() != 0) {
+                            hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
+                            if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
                                 //生成货主账单信息
                                 HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
                                 hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
@@ -917,6 +949,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                                 hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
                             }
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
                     freightInfoService.insert(freightInfo);
                     //如果应付款大于0，生成司机运费结算信息
@@ -948,6 +981,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     orderInfo1.setCargoOwnerStatusKey(StatusEnum.PLATFORM_REJECT_LOADING.getFlag());
                     //非垫付订单
                     if ("0".equals(orderInfo1.getFreightAdvance())) {
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo1.getId());
+                        hyFreezingMoneyInfo.setType("解冻");
+                        hyFreezingMoneyInfo.setAmountMoney(orderInfo1.getAdvanceCharge());
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
@@ -957,6 +996,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCompanyInfo.setAccountBalance(d + orderInfo1.getAdvanceCharge());
                             hyCompanyInfo.setFrozenAmount(d1 - orderInfo1.getAdvanceCharge());
                             companyInfoService.updateById(hyCompanyInfo);
+                            hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                         } else {
                             //货主是个人
                             HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
@@ -967,7 +1007,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCargoOwnerInfo.setAccountBalance(d + orderInfo1.getAdvanceCharge());
                             hyCargoOwnerInfo.setFrozenAmount(d1 - orderInfo1.getAdvanceCharge());
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                            hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
                 }
             }
@@ -1000,6 +1042,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         freightInfo.setReceivabledFreight(freightInfo.getReceivableFreight());
                         freightInfo.setTotalCollection(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
                         freightInfo.setTotalPayment(freightInfo.getActualFreight() + freightInfo.getOwnerServiceCharge());
+
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo1.getId());
+                        hyFreezingMoneyInfo.setType("扣除");
+                        hyFreezingMoneyInfo.setAmountMoney(freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
@@ -1007,6 +1057,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             Double d1 = hyCompanyInfo.getFrozenAmount();
                             hyCompanyInfo.setFrozenAmount(d1 - freightInfo.getOwnerFreightBalance() - freightInfo.getOwnerServiceCharge());
                             companyInfoService.updateById(hyCompanyInfo);
+                            hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                             //生成货主账单信息
                             HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
                             hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
@@ -1024,6 +1075,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             Double d1 = hyCargoOwnerInfo.getFrozenAmount();
                             hyCargoOwnerInfo.setFrozenAmount(d1 - freightInfo.getOwnerFreightBalance() - freightInfo.getOwnerServiceCharge());
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                            hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                             //生成货主账单信息
                             HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
                             hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
@@ -1034,6 +1086,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCargoOwnerCapitalInfo.setOrderNo(orderInfo1.getOrderNo());
                             hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                         //司机承运次数+1,计算累计支付运费
                         HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
                                 .eq("common_id", orderInfo1.getCommonId()).eq("delete_flag", "0"));
@@ -1096,6 +1149,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         Double weikuan = freightInfo.getActualFreight() - freightInfo.getPrepaidFreight();
                         //尾款+服务费
                         Double zong = weikuan + freightInfo.getOwnerServiceCharge();
+
+                        //生成货主冻结金额流向信息
+                        HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
+                        hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
+                        hyFreezingMoneyInfo.setOrderId(orderInfo1.getId());
+                        hyFreezingMoneyInfo.setType("解冻");
+                        hyFreezingMoneyInfo.setAmountMoney(zong);
+
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
@@ -1105,6 +1166,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCompanyInfo.setAccountBalance(d + zong);
                             hyCompanyInfo.setFrozenAmount(d1 - zong);
                             companyInfoService.updateById(hyCompanyInfo);
+                            hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
                         } else {
                             //货主是个人
                             HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
@@ -1115,7 +1177,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             hyCargoOwnerInfo.setAccountBalance(d + zong);
                             hyCargoOwnerInfo.setFrozenAmount(d1 - zong);
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+                            hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
                         }
+                        hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
                     }
                 }
             }

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyFreezingMoneyInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.HyFreezingMoneyInfoMapper">
+
+</mapper>