修改恢复订单吨数逻辑

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

@@ -56,9 +56,9 @@ public class OrderGoodsDtsListener {
 
     //货单剩余吨数不足35吨，自动恢复吨数到订单上
     public void backFillOrderWeight(OrderGoods after){
-        //剩余吨数小于35吨，自动归还订单上
+        //剩余吨数小于35吨并且大于0，自动归还订单上
         if(new BigDecimal("35").compareTo(after.getResidueTransportWeight()) > 0 &&
-                BigDecimal.ZERO.compareTo(after.getResidueTransportWeight()) != 0){
+                after.getResidueTransportWeight().compareTo(BigDecimal.ZERO) > 0){
             log.info("开始自动恢复吨数到订单,订单号:{},货单号:{},货单剩余吨数:{}",
                     after.getOrderNo(),after.getOrderGoodsNo(),after.getResidueTransportWeight());
             orderCancelComponent.backFillOrderWeight(after,after.getResidueTransportWeight(), UpdateEnum.ADD.getCode());

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

@@ -758,7 +758,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         //更新订单吨数
         orderCancelComponent.backFillOrderWeight(orderGoods,borrowOrderWeight, UpdateEnum.SUB.getCode());
         //更新货单吨数
-        orderGoodsDao.updateOrderGoodsWeightResidueAndAlreadyAndStatus(orderGoods.getId(),subOrderGoodsResidue,addAlready,orderGoodsStatus);
+        orderGoodsDao.updateOrderGoodsWeightResidueAndAlreadyAndStatus(orderGoods.getId(),addAlready,subOrderGoodsResidue,orderGoodsStatus);
 
 
     }

performance-web/src/test/java/com/clx/performance/JobTest.java

 package com.clx.performance;
 
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.OrderFeign;
-import com.clx.order.vo.feign.OrderOwnTruckVo;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
-import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.param.mq.OrderCancelMqParam;
 import com.clx.performance.service.LargeScreenService;
 import com.clx.performance.service.OrderCancelService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class JobTest {
@@ -56,7 +44,7 @@ public class JobTest {
 
     @Test
     public void test1() {
-        JSONObject jsonObject = largeScreenService.receiveAddress(27);
+        String jsonObject = largeScreenService.receiveAddress(27);
         System.out.println(jsonObject);
 //        OrderCancelMqParam mqParam = new OrderCancelMqParam();
 //        mqParam.setType("2");