1

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

@@ -58,6 +58,16 @@ public class FreightInfo extends BaseModel<FreightInfo> {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date freightBalanceDate;
+    /**
+     * 货主运费尾款
+     */
+    private Double ownerFreightBalance;
+    /**
+     * 货主运费尾款支付时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ownerFreightBalanceDate;
     /**
      * 实际运费
      */
@@ -94,6 +104,10 @@ public class FreightInfo extends BaseModel<FreightInfo> {
      * 已收
      */
     private Double receivabledFreight;
+    /**
+     * 货主合计付款
+     */
+    private Double totalPayment;
 
 
     @Override

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

@@ -89,11 +89,14 @@ public class FreightInfoServiceImpl extends ServiceImpl<FreightInfoMapper, Freig
         FreightInfo freightInfo1 = this.selectById(freightInfo.getId());
         freightInfo1.setFreightBalance(freightInfo.getFreightBalance());
         freightInfo1.setFreightBalanceDate(df.parse(Time));
+        freightInfo1.setOwnerFreightBalance(freightInfo.getFreightBalance() + freightInfo1.getDriverServiceCharge());
+        freightInfo1.setOwnerFreightBalanceDate(df.parse(Time));
         Double d = freightInfo1.getPayabledFreight();
         freightInfo1.setPayabledFreight(d + freightInfo.getFreightBalance());
         freightInfo1.setNopayableFreight(freightInfo1.getPayableFreight() - freightInfo1.getPayabledFreight());
         Double d1 = freightInfo1.getReceivableFreight();
         freightInfo1.setReceivableFreight(d1 + freightInfo.getFreightBalance());
+        freightInfo1.setTotalPayment(freightInfo1.getActualFreight() + freightInfo1.getOwnerServiceCharge());
         boolean one = this.updateById(freightInfo1);
         //查询订单
         OrderInfo orderInfo1 = orderInfoService.selectById(freightInfo1.getOrderId());

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

@@ -740,17 +740,20 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
                         freightInfo.setFreightBalance(freightInfo.getPayableFreight());
                         freightInfo.setFreightBalanceDate(df.parse(Time));
+                        freightInfo.setOwnerFreightBalance(freightInfo.getActualFreight() - freightInfo.getPrepaidFreight());
+                        freightInfo.setOwnerFreightBalanceDate(df.parse(Time));
                         Double d = freightInfo.getReceivableFreight();
                         freightInfo.setReceivableFreight(d + freightInfo.getActualFreight() - freightInfo.getPrepaidFreight());
                         freightInfo.setReceivabledFreight(freightInfo.getReceivableFreight());
-                        freightInfo.setTotalCollection(freightInfo.getPayableFreight());
+                        freightInfo.setTotalCollection(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
+                        freightInfo.setTotalPayment(freightInfo.getActualFreight() + freightInfo.getOwnerServiceCharge());
                         orderInfo1.setFreight(freightInfo.getPrepaidFreight() + freightInfo.getFreightBalance());
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
                             //将货主冻结金额减去
                             Double d1 = hyCompanyInfo.getFrozenAmount();
-                            hyCompanyInfo.setFrozenAmount(d1 - freightInfo.getFreightBalance() - freightInfo.getDriverServiceCharge() - freightInfo.getOwnerServiceCharge());
+                            hyCompanyInfo.setFrozenAmount(d1 - freightInfo.getOwnerFreightBalance() - freightInfo.getOwnerServiceCharge());
                             companyInfoService.updateById(hyCompanyInfo);
                             //生成货主账单信息
                             HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
@@ -767,7 +770,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                                     .eq("common_id", orderInfo1.getCargoCommonId()).eq("delete_flag", "0"));
                             //将货主冻结金额减去
                             Double d1 = hyCargoOwnerInfo.getFrozenAmount();
-                            hyCargoOwnerInfo.setFrozenAmount(d1 - freightInfo.getFreightBalance() - freightInfo.getDriverServiceCharge() - freightInfo.getOwnerServiceCharge());
+                            hyCargoOwnerInfo.setFrozenAmount(d1 - freightInfo.getOwnerFreightBalance() - freightInfo.getOwnerServiceCharge());
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
                             //生成货主账单信息
                             HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
@@ -900,7 +903,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 orderInfo1.setDriverContract("1");
             }
             orderInfo1.setDriverAutograph(orderInfo.getDriverAutograph());
-            orderInfo1.setContractNo(orderInfo1.getOrderNo().replace("CY", "HT"));
+            orderInfo1.setContractNo(orderInfo1.getOrderNo().replace("CY", "CYHT"));
             String pdfUrl = pdfUtil.tranContract(orderInfo);
             orderInfo1.setDriverContractUrl(pdfUrl);
             orderInfo1.setBankCard(orderInfo.getBankCard());