修改增吨减吨相关代码

performance-api/src/main/java/com/clx/performance/vo/app/OrderGoodsAPPVO.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 
-
 @Getter
 @Setter
 @NoArgsConstructor
@@ -29,6 +29,11 @@ public class OrderGoodsAPPVO {
     @ApiModelProperty("剩余拉运吨数")
     private String residueTransportWeight;
 
+    public String getResidueTransportWeight(){
+        return new BigDecimal(extractWeight).subtract(StringUtils.isNotBlank(alreadyTransportWeight)
+                ?new BigDecimal(alreadyTransportWeight):BigDecimal.ZERO).toString();
+    }
+
     @ApiModelProperty("已拉运吨数")
     private String alreadyTransportWeight;
 

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -158,7 +158,9 @@ public class OrderCancelComponent implements InitializingBean {
                     reduce = reduce.add(orderChild.getWeight());
                 }
 
-                if (orderGoods.getExtractWeight().compareTo(orderGoods.getResidueTransportWeight().add(reduce)) == 0) {
+                BigDecimal residueTransportWeight = orderGoodsService.calcOrderGoodsResidueWeight
+                        (orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
+                if (orderGoods.getExtractWeight().compareTo(residueTransportWeight.add(reduce)) == 0) {
                     update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
                 } else {
                     orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
@@ -188,7 +190,11 @@ public class OrderCancelComponent implements InitializingBean {
         for (OrderGoods orderGoods : orderGoodsList) {
             OrderGoods update = new OrderGoods();
             update.setId(orderGoods.getId());
-            if (orderGoods.getResidueTransportWeight().compareTo(orderGoods.getExtractWeight()) == 0) {
+
+            BigDecimal residueTransportWeight = orderGoodsService.calcOrderGoodsResidueWeight
+                    (orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
+
+            if (residueTransportWeight.compareTo(orderGoods.getExtractWeight()) == 0) {
                 update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
             } else {
                 orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
@@ -320,7 +326,6 @@ public class OrderCancelComponent implements InitializingBean {
             }
             ArrayList<OrderGoods> list = new ArrayList<>();
             list.add(orderGoods);
-            orderGoodsService.batchUpdateResidueWeight(list);
         } else {
             //返回到货单
             orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight, weight, orderGoods.getId());

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -14,6 +14,7 @@ import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.OrderChildLogService;
+import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.user.enums.driver.DriverInfoEnum;
@@ -63,6 +64,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     private final OrderChildPostService orderChildPostService;
 
+    private final OrderGoodsService orderGoodsService;
+
 
     //根据货单最晚接单时间处理
     public void expireProduceByLastOrderTime(LocalDateTime localDateTime, String orderGoodsNo) {
@@ -120,8 +123,10 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     continue;
                 }
                 OrderGoods orderGoods = optional.get();
+                BigDecimal residueTransportWeight = orderGoodsService.calcOrderGoodsResidueWeight
+                        (orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
 
-                if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0) {
+                if (residueTransportWeight.compareTo(BigDecimal.ZERO) == 0) {
                     List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildByOrderGoodsNo(orderGoodsNo);
                     if (CollectionUtil.isNotEmpty(orderChildren)) {
                         //更新货单已完结

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -41,7 +41,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus);
 
-    void updateOrderGoodsWeightResidueAndAlreadyAndStatus(Integer id, BigDecimal alreadyTransportWeight,BigDecimal residueTransportWeight,Integer orderGoodsStatus);
+    void updateOrderGoodsWeightAlreadyAndStatus(Integer id, BigDecimal residueWeight,Integer orderGoodsStatus);
 
     IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListPageParam,List<String> orderGoodsNoList);
 
@@ -72,7 +72,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     Integer updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal residueWeight, BigDecimal alreadyWeight, Integer id);
 
-    Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(BigDecimal residueWeight, BigDecimal alreadyWeight, Integer status, Integer id);
+    Integer updateOrderGoodsSetAlreadyWeightAndStatus( BigDecimal alreadyWeight, Integer status, Integer id);
 
 
     OrderGoodsVO findOrderGoodsById(Integer id);
@@ -83,7 +83,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     boolean batchUpdateOrderGoodsStatus(Integer status, List<Integer> ids);
 
-    boolean batchUpdateOrderGoodsWeight(BigDecimal residueWeight, List<Integer> ids);
 
 
     void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId);
@@ -99,7 +98,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 
-    void batchUpdateResidueWeight(List<Integer> list, BigDecimal residueWeight);
 
     List<OrderGoodsFleetOpenTruck> queryProcessFleetOpenTruckList();
 

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -78,8 +78,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public void updateOrderGoodsWeightResidueAndAlreadyAndStatus(Integer id, BigDecimal alreadyTransportWeight,BigDecimal residueTransportWeight,Integer orderGoodsStatus) {
-        baseMapper.updateOrderGoodsWeightResidueAndAlreadyAndStatus(id, alreadyTransportWeight, residueTransportWeight, orderGoodsStatus);
+    public void updateOrderGoodsWeightAlreadyAndStatus(Integer id, BigDecimal residueWeight,Integer orderGoodsStatus) {
+        baseMapper.updateOrderGoodsWeightAlreadyAndStatus(id, residueWeight, orderGoodsStatus);
     }
 
     @Override
@@ -187,8 +187,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(BigDecimal residueWeight, BigDecimal alreadyWeight, Integer status, Integer id) {
-        return baseMapper.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(residueWeight,alreadyWeight,status,id);
+    public Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(BigDecimal alreadyWeight, Integer status, Integer id) {
+        return baseMapper.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(alreadyWeight,status,id);
     }
 
     @Override
@@ -213,13 +213,6 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
                 ;
     }
 
-    @Override
-    public boolean batchUpdateOrderGoodsWeight(BigDecimal residueWeight, List<Integer> ids) {
-        return update(lUdWrapper().in(OrderGoods :: getId,ids)
-                .set(OrderGoods::getResidueTransportWeight, residueWeight)
-        );
-    }
-
     @Override
     public List<OrderGoods> getOrderGoodsListByOrderNoAndStatus(String orderNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderGoods::getOrderNo, orderNo)
@@ -269,14 +262,6 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         return baseMapper.indexOrderGoodsListSearch(page,param);
     }
 
-    @Override
-    public void batchUpdateResidueWeight(List<Integer> list, BigDecimal residueWeight) {
-        update(lUdWrapper()
-                .in(OrderGoods::getId, list)
-                .set(OrderGoods::getResidueTransportWeight, residueWeight)
-        );
-    }
-
     @Override
     public List<OrderGoodsFleetOpenTruck> queryProcessFleetOpenTruckList() {
         return baseMapper.queryProcessFleetOpenTruckList();

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -39,10 +39,10 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     void updateOrderGoodsWeightAndStatus(@Param("id") Integer id, @Param("weight") BigDecimal orderChildWeight, @Param("orderGoodsStatus") Integer orderGoodsStatus);
 
     @Update(" update order_goods set " +
-            " already_transport_weight = already_transport_weight+#{alreadyTransportWeight}," +
+            " already_transport_weight = already_transport_weight - #{residueWeight}," +
             "order_goods_status = #{orderGoodsStatus} " +
             " where id = #{id}")
-    void updateOrderGoodsWeightResidueAndAlreadyAndStatus(@Param("id") Integer id, @Param("alreadyTransportWeight") BigDecimal alreadyTransportWeight, @Param("residueTransportWeight") BigDecimal residueTransportWeight,@Param("orderGoodsStatus") Integer orderGoodsStatus);
+    void updateOrderGoodsWeightAlreadyAndStatus(@Param("id") Integer id, @Param("residueWeight") BigDecimal residueWeight, @Param("orderGoodsStatus") Integer orderGoodsStatus);
 
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "openOrderPageGoodsList")
@@ -71,8 +71,8 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoods")
     Integer updateOrderGoods(@Param(value = "params") OrderGoodsEditParams orderGoodsEditParams);
 
-    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus")
-    Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
+    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetAlreadyWeightAndStatus")
+    Integer updateOrderGoodsSetAlreadyWeightAndStatus(@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getAlreadyTransportWeight")
     BigDecimal getAlreadyTransportWeight(@Param("orderNo") String orderNo);

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -99,8 +99,6 @@ public interface OrderGoodsService {
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 
-    void batchUpdateResidueWeight(List<OrderGoods> list);
-
     void saveBindTruck(DistributionTruckParam param);
 
 
@@ -110,4 +108,7 @@ public interface OrderGoodsService {
     List<DriverFreightPriceVO> getDriverFreightPriceList(String orderNo);
 
     List<OrderGoodsPendingVO> getOrderGoodsPendingList(String orderNo);
+
+
+    BigDecimal calcOrderGoodsResidueWeight(BigDecimal extractWeight,BigDecimal alreadyWeight);
 }

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

@@ -414,8 +414,10 @@ public class OrderChildServiceImpl implements OrderChildService {
             }
         }
 
+        BigDecimal residueTransportWeight = orderGoodsService.calcOrderGoodsResidueWeight
+                (orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
         // 验证是否有足量去接该运单
-        if(judgeNotEnoughWeightOrdered(orderGoods.getResidueTransportWeight(),orderInfo.getOrderNo())){
+        if(judgeNotEnoughWeightOrdered(residueTransportWeight,orderInfo.getOrderNo())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
         }
 
@@ -460,22 +462,12 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         Integer overWeight = orderInfo.getOverWeight();
 
+
         if(Objects.equals(overWeight,OrderGoodsOverWeightEnum.NO.getCode())){
-            if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(35)) < 0) {
-                orderChild.setWeight(orderGoods.getResidueTransportWeight());
-            } else {
             orderChild.setWeight(new BigDecimal(35));
-            }
         } else{
-            if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(50)) < 0) {
-                orderChild.setWeight(orderGoods.getResidueTransportWeight());
-            } else {
             orderChild.setWeight(new BigDecimal(50));
         }
-        }
-
-
-
 
         //orderChild.setWeight(orderChild.getTruckLoad());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
@@ -2086,7 +2078,10 @@ public class OrderChildServiceImpl implements OrderChildService {
     private void updateOrderGoodsComplete(OrderGoods orderGoods, OrderChild orderChild, long count){
         if (count > 1) {return;}
         goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo(),orderChild.getTruckNo());
-        if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) <= 0){
+        BigDecimal residueTransportWeight = orderGoodsService.calcOrderGoodsResidueWeight
+                (orderGoods.getExtractWeight(),orderGoods.getAlreadyTransportWeight());
+
+        if (residueTransportWeight.compareTo(BigDecimal.ZERO) <= 0){
             //orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.SUCCESS.getCode());
             orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(), OrderGoodsTruckBindEnum.Status.SUCCESS.getCode());
             goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());

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

@@ -4,6 +4,7 @@ import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.enums.TruckDemandEnum;
@@ -58,11 +59,20 @@ public class OrderWeightServiceImpl implements OrderWeightService {
         BigDecimal platOrderGoodsWeight = BigDecimal.ZERO;
 
         for (OrderGoods item : orderGoodsList) {
+            BigDecimal weight;   //取消，完成，完结的货单取 已拉运吨数 作为提取吨数，
+            if(Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.CANCEL.getCode())
+                || Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.SUCCESS.getCode())
+                    || Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
+                weight = item.getAlreadyTransportWeight();
+            }else{
+                weight = item.getExtractWeight();
+            }
+
             if(Objects.equals(item.getVehicleUsage(), VehicleUsageEnum.Status.OWN.getCode())){
-                ownOrderGoodsWeight = ownOrderGoodsWeight.add(item.getExtractWeight());
+                ownOrderGoodsWeight = ownOrderGoodsWeight.add(weight);
             }
             if(Objects.equals(item.getVehicleUsage(), VehicleUsageEnum.Status.PLATFORM.getCode())){
-                platOrderGoodsWeight = platOrderGoodsWeight.add(item.getExtractWeight());
+                platOrderGoodsWeight = platOrderGoodsWeight.add(weight);
             }
         }
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -33,7 +33,6 @@ public class OrderGoodsSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
-                    " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ," +
                     " a.already_transport_weight,a.already_load_weight,  a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +
@@ -96,7 +95,7 @@ public class OrderGoodsSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
-                    " a.residue_transport_weight,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +
                     " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
@@ -147,7 +146,7 @@ public class OrderGoodsSqlProvider {
         StringBuffer sqlList = new StringBuffer();
         sqlList.append("select a.id, a.order_no," +
                 " a.order_goods_no, a.order_goods_status," +
-                " a.extract_weight,a.residue_transport_weight," +
+                " a.extract_weight," +
                 "a.already_transport_weight, a.send_address_id, " +
                 "a.send_address_shorter,a.send_longitude,a.send_latitude," +
                 "a.receive_address_id, a.receive_address_shorter,a.receive_longitude," +
@@ -182,7 +181,7 @@ public class OrderGoodsSqlProvider {
     public String saveBatchEntity( List<OrderGoods> orderGoodsList) {
         StringBuffer sqlList = new StringBuffer();
 
-        sqlList.append("INSERT INTO order_goods(extract_weight,residue_transport_weight,already_transport_weight,loss_price,truck_demand,extract_way," +
+        sqlList.append("INSERT INTO order_goods(extract_weight,already_transport_weight,loss_price,truck_demand,extract_way," +
                 "need_truck_num,vehicle_usage,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id," +
                 "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_system_address_id,send_longitude," +
                 "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,receive_system_address_id,goods_name,goods_id,create_time,modified_time," +
@@ -192,7 +191,7 @@ public class OrderGoodsSqlProvider {
         for (int i = 0; i < orderGoodsList.size(); i++) {
             OrderGoods o = orderGoodsList.get(i);
 
-            sqlList.append(" ('").append(o.getExtractWeight()).append("','").append(o.getResidueTransportWeight()).append("','").append(o.getAlreadyTransportWeight()).append("','")
+            sqlList.append(" ('").append(o.getExtractWeight()).append("','").append(o.getAlreadyTransportWeight()).append("','")
                     .append(o.getLossPrice()).append("','").append(o.getTruckDemand()).append("','").append(o.getExtractWay()).append("','")
                     .append(o.getNeedTruckNum()).append("','").append(o.getVehicleUsage()).append("','").append(o.getPendingOrderWay()).append("','").append(o.getPendingOrderTime()).append("','")
                     .append(o.getPendingOrderFreight()).append("','").append(o.getLastArriveSendTime()).append("','").append(o.getSeniorLogisticsManagerId()).append("','")
@@ -237,7 +236,7 @@ public class OrderGoodsSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
-                    " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +
                     " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
@@ -282,7 +281,7 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
-    public String updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value ="residueWeight") BigDecimal residueWeight, @Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value ="status") Integer status,@Param(value ="id") Integer id){
+    public String updateOrderGoodsSetAlreadyWeightAndStatus(@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value ="status") Integer status,@Param(value ="id") Integer id){
         String sql = new SQL() {{
             UPDATE("order_goods")
                     .SET("already_transport_weight = already_transport_weight - #{alreadyWeight}")
@@ -299,7 +298,7 @@ public class OrderGoodsSqlProvider {
 
         sqlList.append(" select a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
-                    " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +
                     " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
@@ -337,7 +336,7 @@ public class OrderGoodsSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
-                    " a.residue_transport_weight,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +
                     " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +

performance-web/src/main/java/com/clx/performance/strategy/impl/OwnGoodsOrderStrategy.java

@@ -106,7 +106,6 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             OrderGoods orderGoods = new OrderGoods();
             //提取吨数
             orderGoods.setExtractWeight(child.getExtractWeight());
-            orderGoods.setResidueTransportWeight(child.getExtractWeight());
             orderGoods.setAlreadyTransportWeight(BigDecimal.ZERO);
 
             orderGoods.setLossPrice(orderInfo.getLossPrice());

performance-web/src/main/java/com/clx/performance/strategy/impl/PartGoodsOrderStrategy.java

@@ -109,7 +109,6 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
             OrderGoods orderGoods = new OrderGoods();
             //提取吨数
             orderGoods.setExtractWeight(child.getExtractWeight());
-            orderGoods.setResidueTransportWeight(child.getExtractWeight());
             orderGoods.setAlreadyTransportWeight(BigDecimal.ZERO);
 
             orderGoods.setLossPrice(orderInfo.getLossPrice());

performance-web/src/main/java/com/clx/performance/strategy/impl/PlatformGoodsOrderStrategy.java

@@ -107,7 +107,6 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
             OrderGoods orderGoods = new OrderGoods();
             //提取吨数
             orderGoods.setExtractWeight(child.getExtractWeight());
-            orderGoods.setResidueTransportWeight(child.getExtractWeight());
             orderGoods.setAlreadyTransportWeight(BigDecimal.ZERO);
             orderGoods.setLossPrice(orderInfo.getLossPrice());
             orderGoods.setTruckDemand(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode());