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

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

@@ -275,17 +275,21 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         List<OrderGoods> orderGoodsList = null;
         BigDecimal orderGoodsResidueWeight = BigDecimal.ZERO;
         String residueWeight = orderInfoFeign.getResidueWeight();
-
+        BigDecimal ans = new BigDecimal(residueWeight);
         switch (optionType) {
             case "1":
-                return new BigDecimal(residueWeight);
+                return ans;
             case "2":
                 orderGoodsList  = orderGoodsDao.getOrderGoodsListByOrderNoAndStatus(orderNo);
                 if (CollectionUtil.isNotEmpty(orderGoodsList)) {
                     orderGoodsResidueWeight = orderGoodsList.stream().map(OrderGoods::getResidueTransportWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
                 }
-                return orderGoodsResidueWeight.add(new BigDecimal(residueWeight));
-
+                ans = orderGoodsResidueWeight.add(new BigDecimal(residueWeight));
+                if (ans.compareTo(new BigDecimal("35")) <= 0) {
+                    return BigDecimal.ZERO;
+                } else {
+                    return ans.subtract(new BigDecimal("35"));
+                }
             case "3":
                 List<OrderChild> orderChildList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
                 BigDecimal childResidueWeight = BigDecimal.ZERO;
@@ -297,12 +301,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 if (CollectionUtil.isNotEmpty(orderGoodsList)) {
                     orderGoodsResidueWeight = orderGoodsList.stream().map(OrderGoods::getResidueTransportWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
                 }
-                return new BigDecimal(residueWeight).add(orderGoodsResidueWeight).add(childResidueWeight);
-
+                ans = ans.add(orderGoodsResidueWeight).add(childResidueWeight);
+                if (ans.compareTo(new BigDecimal("35")) <= 0) {
+                    return BigDecimal.ZERO;
+                } else {
+                    return ans.subtract(new BigDecimal("35"));
+                }
             default:throw new RuntimeException("参数错误");
         }
 
-
     }
 
 

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

@@ -14,6 +14,7 @@ import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +41,8 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void truckTracSync(TruckTraceSyncMqParam mq) {
+
+        if (StringUtils.isNotBlank(mq.getChildNo())) {
             VehicleWarnChild vehicleWarnChild = vehicleWarnChildDao.findByChildNo(mq.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
             OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
@@ -48,6 +51,12 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
             }
             vehicleWarnChild.setTraceTime(LocalDateTimeUtils.parseTime(mq.getEndTime()));
 
+            // 更新同步时间
+            if (StringUtils.isNotBlank(mq.getChildNo())) {
+                vehicleWarnChildDao.updateTraceTime(vehicleWarnChild);
+            }
+        }
+
         List<TruckTraceDTO> list = zjxlGpsService.getTruckTrace(mq.getTruckNo(), mq.getBeginTime(), mq.getEndTime());
         if (list.isEmpty()) {return;}
 
@@ -67,9 +76,6 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
 
         // 保存
         truckTraceESPlusMapper.insertBatch(esList);
-
-        // 更新同步时间
-        vehicleWarnChildDao.updateTraceTime(vehicleWarnChild);
     }
 
 }