Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-example/src/main/java/com/sckw/example/controller/TestController.java

@@ -3,8 +3,8 @@ package com.sckw.example.controller;
 import com.sckw.payment.api.dubbo.PayCenterDubboService;
 import com.sckw.payment.api.model.constant.ChannelEnum;
 import com.sckw.payment.api.model.dto.MemberDetail;
-import com.sckw.payment.api.model.dto.R;
 import com.sckw.payment.api.model.dto.WalletDto;
+import com.sckw.payment.api.model.dto.common.R;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.web.bind.annotation.GetMapping;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -993,7 +993,7 @@ public class KwtWaybillOrderService {
 
         /**4更新承运订单entrustAmount**/
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(waybillOrder.getLOrderId());
-        //承运订单已委派量=承运订单原委派量+当前车辆运单委派量
+        //承运订单已装货量=承运订单原装货量+当前车辆运单装货量
         BigDecimal loadAmount = logisticsOrder.getLoadAmount() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getLoadAmount();
         logisticsOrder.setLoadAmount(loadAmount.add(waybillOrder.getLoadAmount()));
         logisticsOrder.setLoadTime(waybillOrder.getUpdateTime());
@@ -1093,26 +1093,29 @@ public class KwtWaybillOrderService {
         waybillOrderTicketDao.insert(ticket);
 
         /**4更新承运订单entrustAmount**/
+        //更新卸货量/卸货时间/亏吨/亏吨扣款
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(waybillOrder.getLOrderId());
-        //承运订单已委派量=承运订单原委派量+当前车辆运单委派量
-        BigDecimal loadAmount = logisticsOrder.getLoadAmount() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getLoadAmount();
-        logisticsOrder.setLoadAmount(loadAmount.add(waybillOrder.getLoadAmount()));
-        logisticsOrder.setLoadTime(waybillOrder.getUpdateTime());
+        //承运订单已卸货量=承运订单原卸货量+当前车辆运单卸货量
+        BigDecimal unloadAmount = logisticsOrder.getUnloadAmount() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getUnloadAmount();
+        logisticsOrder.setUnloadAmount(unloadAmount.add(waybillOrder.getUnloadAmount()));
+        logisticsOrder.setUnloadTime(waybillOrder.getUpdateTime());
+        logisticsOrder.setDeficitAmount(logisticsOrder.getLoadAmount().subtract(logisticsOrder.getUnloadAmount()));
+        logisticsOrder.setDeficitPrice(null);
         logisticsOrderDao.updateById(logisticsOrder);
 
         /**5Mongodb数据更新**/
         //1车辆运单
         SckwWaybillOrder wOrder = new SckwWaybillOrder();
         wOrder.set_id(waybillOrder.getId());
-        wOrder.setLoadAmount(waybillOrder.getLoadAmount());
-        wOrder.setLoadUrls(params.getUrls());
-        wOrder.setLoadTime(waybillOrder.getUpdateTime());
+        wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
+        wOrder.setUnloadUrls(params.getUrls());
+        wOrder.setUnloadTime(waybillOrder.getUpdateTime());
         editSckwWaybillOrder(wOrder, waybillOrder, 2);
 
         //2承运订单
         SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
-        lOrder.setLoadTime(logisticsOrder.getLoadTime());
-        lOrder.setLoadAmount(logisticsOrder.getLoadAmount());
+        lOrder.setUnloadTime(logisticsOrder.getUnloadTime());
+        lOrder.setUnloadAmount(logisticsOrder.getUnloadAmount());
         editSckwLogisticsOrder(lOrder, logisticsOrder);
 
         /**6发送消息**/