Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsTruckBindEnum.java

@@ -19,6 +19,7 @@ public enum OrderGoodsTruckBindEnum {
 
         CANCEL(2, "取消"),
         GET(3, "已接单"),
+        EXPIRE(4, "已失效")
 
         ;
 

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

@@ -33,65 +33,53 @@ public class OrderGoodsIdGenerate {
 
 
     public long getOrderGoodsId(Integer size) {
-        long baseStart = Long.parseLong(DateUtils.formatDate(LocalDate.now(), "yyyyMMdd").get() + "00001");
-        Object o = redisTemplate.opsForValue().get(RedisConstants.ORDER_GOODS_ID_GENERATE);
-        if (o == null) {
-            RLock rLock = null;
-            try {
-                rLock = redissonClient.getLock(RedisConstants.ORDER_NO_BLOCK + type);
-                rLock.lock(5, TimeUnit.SECONDS);
-                o = redisTemplate.opsForValue().get(RedisConstants.ORDER_GOODS_ID_GENERATE);
-                if (o == null) {
-                    Long maxOrderGoodsId = null;
-                    String maxID = orderGoodsDao.getMaxOrderGoodsId();
-                    if (StringUtils.isNotBlank(maxID)) {
-                        maxOrderGoodsId = Long.valueOf(maxID.substring(2));
-                    }
+        RLock rLock = null;
+        try {
+            rLock = redissonClient.getLock(RedisConstants.ORDER_NO_BLOCK + type);
+
+            rLock.lock(5, TimeUnit.SECONDS);
+            long baseStart = Long.parseLong(DateUtils.formatDate(LocalDate.now(), "yyyyMMdd").get() + "00001");
+            Object o = redisTemplate.opsForHash().get(RedisConstants.ORDER_GOODS_ID, type);
+            if (o == null) {
+                Long maxOrderGoodsId = null;
+                String maxID = orderGoodsDao.getMaxOrderGoodsId();
+                if (StringUtils.isNotBlank(maxID)) {
+                    maxOrderGoodsId = Long.valueOf(maxID.substring(2));
+                }
 
-                    if (maxOrderGoodsId == null) {
-                        maxOrderGoodsId = baseStart;
-                    }
-                    if (baseStart == maxOrderGoodsId) {
-                        redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
-                        return baseStart;
-                    } else {
-                        redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
-                        return maxOrderGoodsId;
-                    }
+                if (maxOrderGoodsId == null) {
+                    maxOrderGoodsId = 0L;
+                }
+                if (baseStart > maxOrderGoodsId) {
+                    redisTemplate.opsForHash().put(RedisConstants.ORDER_GOODS_ID, type, String.valueOf(baseStart + size));
+                    return baseStart;
                 } else {
-                    long redisOrderGoodsId = Long.parseLong(o.toString());
-                    if (redisOrderGoodsId < baseStart) {
-                        redisOrderGoodsId = baseStart;
-                    }
-
-                    redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
-                    return redisOrderGoodsId;
+                    long orderGoodsId = maxOrderGoodsId + size;
+                    redisTemplate.opsForHash().put(RedisConstants.ORDER_GOODS_ID, type, String.valueOf(orderGoodsId));
+                    return maxOrderGoodsId + 1;
                 }
-
-            } catch (Exception e) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_ID_GENERATE_LOCK, e.getMessage());
-
-            } finally {
-                try {
-                    if (rLock != null && rLock.isLocked()) {
-                        rLock.unlock();
-                    }
-                    log.info("锁释放完成货单ID生成");
-                } catch (Exception e) {
-                    log.error("redis 货单ID生成 分布式锁释放异常!", e);
+            } else {
+                long redisOrderGoodsId = Long.parseLong(o.toString());
+                if (redisOrderGoodsId < baseStart) {
+                    redisOrderGoodsId = baseStart;
                 }
+                long orderGoodsId = redisOrderGoodsId + size;
+                redisTemplate.opsForHash().put(RedisConstants.ORDER_GOODS_ID, type, String.valueOf(orderGoodsId));
+                return redisOrderGoodsId;
             }
-        } else {
-            long redisOrderGoodsId = Long.parseLong(o.toString());
-            if (redisOrderGoodsId < baseStart) {
-                redisOrderGoodsId = baseStart;
-            }
+        } catch (Exception e) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_ID_GENERATE_LOCK, e.getMessage());
 
-            redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
-            return redisOrderGoodsId;
+        } finally {
+            try {
+                if (rLock != null && rLock.isLocked()) {
+                    rLock.unlock();
+                }
+                log.info("锁释放完成货单ID生成");
+            } catch (Exception e) {
+                log.error("redis 货单ID生成 分布式锁释放异常!", e);
+            }
         }
 
     }
-
-
 }

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

@@ -7,7 +7,9 @@ import com.clx.order.param.feign.UpdateOrderInfoParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.model.OrderGoods;
 import com.msl.common.base.Optional;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -40,6 +42,9 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
     @Autowired
     private OrderFeign orderFeign;
 
+    @Autowired
+    private OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
     public void expireProduce(LocalDateTime localDateTime, String orderGoodsNo) {
         redisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoodsNo, localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
     }
@@ -102,7 +107,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     log.info("当前货单状态为已完结");
                     //更新货单已完结
                     orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.COMPLETED.getCode());
-
+                    orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.EXPIRE.getCode());
                     BigDecimal residueTransportWeight = orderGoods.getResidueTransportWeight();
                     UpdateOrderInfoParam updateOrderInfoParam = new UpdateOrderInfoParam();
                     updateOrderInfoParam.setOrderId(orderInfoFeign.getId());

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

@@ -27,4 +27,6 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     Optional<List<OrderGoodsTruckBind>> getValidByTruckNo(String truckNo);
 
     Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList);
+
+    void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code);
 }

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

@@ -73,4 +73,12 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
                         .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
                 .in(OrderGoodsTruckBind::getTruckNo,truckList).select(OrderGoodsTruckBind::getOrderGoodsNo)));
     }
+
+    @Override
+    public void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code) {
+        update(lUdWrapper()
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .set(OrderGoodsTruckBind::getStatus, code)
+        );
+    }
 }

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

@@ -1114,6 +1114,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) <= 0){
             orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.SUCCESS.getCode());
+            orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(), OrderGoodsTruckBindEnum.Status.EXPIRE.getCode());
         }
 
     }