逆向

performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java

@@ -19,7 +19,10 @@ public class RedisConstants {
 
     public static final String CARRIER_ORDER_NUM_POOL_KEY = "clx-performance:order:orderNumPool:{date}";
 
-    public static final String ORDER_GOODS_STATUS_LAZY = "clx:order:goods:status:lazy:";
+    public static final String ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME = "clx:order:goods:status:lazy:lastOrderTime";
+
+    public static final String ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME = "clx:order:goods:status:lazy:lastOrderTime";
+
 
     public static final String ORDER_GOODS_TRUCK_RECORD = "clx:order:goods:truck:record:";
     public static final String ORDER_GOODS_RECORD = "clx:order:goods:record:";

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

@@ -56,4 +56,8 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     List<OrderGoods> listIntegralOrderGoodsSync();
 
     boolean updatePendingOrderFreightById(Integer id, BigDecimal pendingOrderFreight);
+
+    boolean updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(Integer orderGoodsId, Integer status);
+
+    Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight,  Integer id);
 }

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

@@ -149,4 +149,17 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public boolean updatePendingOrderFreightById(Integer id, BigDecimal pendingOrderFreight) {
         return update(lUdWrapper().eq(OrderGoods :: getGoodsId,id).set(OrderGoods :: getPendingOrderFreight,pendingOrderFreight));
     }
+
+    @Override
+    public boolean updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(Integer orderGoodsId, Integer status) {
+        return update(lUdWrapper().eq(OrderGoods :: getGoodsId,orderGoodsId)
+                .set(OrderGoods :: getOrderGoodsStatus, status)
+                .set(OrderGoods::getResidueTransportWeight, BigDecimal.ZERO))
+                ;
+    }
+
+    @Override
+    public Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight, Integer id) {
+        return baseMapper.updateOrderGoodsSetResidueWeight(residueWeight,id);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
@@ -12,6 +13,7 @@ import com.clx.performance.vo.pc.OrderGoodsVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -55,4 +57,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "saveBatchEntity")
     void saveBatchEntity(List<OrderGoods> orderGoodsList);
 
+    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeight")
+    Integer updateOrderGoodsSetResidueWeight(@Param(value = "residueWeight") BigDecimal residueWeight, @Param(value = "id") Integer id);
 }

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

 package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.OrderGoodsStopEnum;
 import com.clx.performance.enums.PendingOrderWayStatusEnum;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 
@@ -170,4 +173,14 @@ public class OrderGoodsSqlProvider {
         return sqlList.toString();
     }
 
+    public String updateOrderGoodsSetResidueWeight(@Param(value ="residueWeight") BigDecimal residueWeight,@Param(value ="id") Integer id){
+        String sql = new SQL() {{
+            UPDATE("order_goods")
+                    .SET("residue_weight = residue_weight + #{residueWeight}")
+                    .WHERE("id = #{id}");
+
+        }}.toString();
+        return sql;
+    }
+
 }

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

@@ -158,7 +158,7 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());
             }
             mqMap.put(orderGoodsNo, postedTime);
-            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastOrderTime(), orderGoodsNo);
+            orderGoodsStatusLazyComponent.expireProduceByLastOrderTime(orderGoods.getLastOrderTime(), orderGoodsNo);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
             orderGoodsList.add(orderGoods);

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

@@ -172,7 +172,7 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, truckList);
             }
             mqMap.put(orderNoPrefix + beginOrderGoodsId, postedTime);
-            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastOrderTime(), orderGoodsNo);
+            orderGoodsStatusLazyComponent.expireProduceByLastOrderTime(orderGoods.getLastOrderTime(), orderGoodsNo);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
 

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

@@ -166,7 +166,7 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());
             }
             mqMap.put(orderGoodsNo, postedTime);
-            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastOrderTime(), orderGoodsNo);
+            orderGoodsStatusLazyComponent.expireProduceByLastOrderTime(orderGoods.getLastOrderTime(), orderGoodsNo);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
             orderGoodsList.add(orderGoods);