1

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

@@ -110,6 +110,8 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
         if (hyCarrierInfo != null) {
             //判断暂存提交（前端传参1暂存3提交）
             if ("1".equals(hyCarrierInfo.getStatusFlag())) {
+                hyCarrierInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+                hyCarrierInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
                 this.updateById(hyCarrierInfo);
             } else {
                 hyCarrierInfo.setStatus(StatusEnum.SUBMITTED.getName());

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

@@ -134,6 +134,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 if (freightInfo != null) {
                     dataList.get(i).setFreightInfo(freightInfo);
                 }
+                //承运信息
+                HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>().eq(FreightInfo.QueryFiles.ORDER_ID, dataList.get(i).getId())
+                .eq("delete_flag","0"));
+                if (hyCarrierInfo != null) {
+                    dataList.get(i).setHyCarrierInfo(hyCarrierInfo);
+                }
             }
         }
         Page<OrderInfo> page = new Page<>();
@@ -685,13 +691,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             .eq("order_id", orderInfo.getId()).eq("delete_flag", "0"));
                     //非垫付订单
                     if ("0".equals(orderInfo1.getFreightAdvance())) {
-                        freightInfo.setPayableFreight(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
+                        freightInfo.setPayableFreight(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge() - freightInfo.getPrepaidFreight());
                         freightInfo.setPayabledFreight(freightInfo.getPayableFreight());
                         freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
-                        freightInfo.setFreightBalance(freightInfo.getPayableFreight() - freightInfo.getPrepaidFreight());
+                        freightInfo.setFreightBalance(freightInfo.getPayableFreight());
                         freightInfo.setFreightBalanceDate(df.parse(Time));
                         Double d = freightInfo.getReceivableFreight();
-                        freightInfo.setReceivableFreight(d+freightInfo.getFreightBalance());
+                        freightInfo.setReceivableFreight(d+freightInfo.getActualFreight()-freightInfo.getPrepaidFreight());
                         freightInfo.setReceivabledFreight(freightInfo.getReceivableFreight());
                         freightInfo.setTotalCollection(freightInfo.getPayableFreight());
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
@@ -874,7 +880,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             } else {
                 orderInfo1.setAdvanceCharge(orderInfo.getLoadingAdvancePayment());
             }
-            this.updateById(orderInfo1);
+            boolean one = this.updateById(orderInfo1);
             //承运信息
             HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>()
                     .eq("order_id", orderInfo.getId()));
@@ -883,8 +889,16 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             hyCarrierInfo.setEstimatedFreight(orderInfo1.getFreight());
             hyCarrierInfo.setLoadingDate(orderInfo.getStartDates());
             hyCarrierInfo.setLoadingWeight(Double.valueOf(orderInfo.getWeight()));
-            carrierInfoService.updateById(hyCarrierInfo);
-            return pdfUrl;
+            boolean two = carrierInfoService.updateById(hyCarrierInfo);
+            //更新签名图片
+            CommonUser commonUser = commonUserService.selectById(orderInfo1.getCommonId());
+            commonUser.setSignImg(orderInfo.getDriverAutograph());
+            boolean three = commonUserService.updateById(commonUser);
+            if (one && two && three){
+                return pdfUrl;
+            }else {
+                return "NG";
+            }
         }
 
     }