订单关闭接口修改

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java

@@ -110,6 +110,8 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     private String marketId;
     @ApiModelProperty(value = " 创建时间")
     private String createdAt;
+    @ApiModelProperty(value = " 创建时间")
+    private int randomKey;
 
     @ApiModelProperty(value = "orderAttr")
     private GoblinOrderAttrVo orderAttrVo;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java

@@ -570,7 +570,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                     redisUtils.setGoblinOrder(orderId, orderVo);
                     redisUtils.setOffCode(orderVo.getWriteOffCode(), orderVo.getMasterOrderCode());
                     //删除未支付订单
-                    redisUtils.removeGoblinOrder(null, orderId);
+                    redisUtils.removeGoblinOrder(orderVo.getRandomKey()+"", orderId);
                     //mongo
                     mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
                     //mysql

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -514,15 +514,16 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             //订单attr vo
             GoblinOrderAttrVo orderAttrVo = GoblinOrderAttrVo.getNew();
             BeanUtils.copyProperties(orderAttr, orderAttrVo);
+            //redis 添加未支付列表
+            int randomKey = redisUtils.addUnPayOrder(orderVo.getOrderId());
             //redis 赋值
+            orderVo.setRandomKey(randomKey);
             orderVo.setOrderAttrVo(orderAttrVo);
             orderVo.setOrderSkuVoIds(goblinOrderSkuIdList);
             orderVo.setCreatedAt(getNowTime());
             redisUtils.setGoblinOrder(orderVo.getOrderId(), orderVo);
             redisUtils.setMasterCode(preParam.getOrderMasterCode(), preParam.getOrderIdList().substring(1));
             mongoUtils.insertGoblinStoreOrderVo(orderVo);
-            //redis 添加未支付列表
-            redisUtils.addUnPayOrder(orderVo.getOrderId());
             //redis 订单列表
             if (noZhengzaiOrder(uid)) {
                 if (orderVo.getMarketType() == null) {
@@ -746,7 +747,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 redisUtils.setGoblinOrder(orderId, orderVo);
                 redisUtils.setOffCode(orderVo.getWriteOffCode(), orderVo.getMasterOrderCode());
                 //删除未支付订单
-                redisUtils.removeGoblinOrder(null, orderId);
+                redisUtils.removeGoblinOrder(orderVo.getRandomKey()+"", orderId);
                 //mongo
                 mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
                 //mysql

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinZhengzaiServiceImpl.java

@@ -328,7 +328,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             redisUtils.incrSkuStock(null, skuId, restStock + restStockDe);
             mongoUtils.delGoodsSkuInfoVo(marketSkuId);
             redisUtils.delGoodsSkuInfoVo(marketSkuId);
-            redisUtils.removeGoblinOrder(skuId, marketSkuId);
+            redisUtils.removeGoblinOrder(null, marketSkuId);
         }
         //mongo
         mongoUtils.delGoodsInfoVo(marketSpuId);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -804,13 +804,14 @@ public class GoblinRedisUtils {
         }
     }
 
-    // 添加 未支付订单id列表
-    public void addUnPayOrder(String orderId) {
+    // 添加 未支付订单id列表 返回 radomKey
+    public int addUnPayOrder(String orderId) {
         int randomKey = RandomUtil.getRandomInt(0, randomMax);
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_UN_PAY.concat(randomKey + "");
         List<String> list = getUnPayOrder(randomKey + "");
         list.add(orderId);
         redisUtil.set(redisKey, list);
+        return randomKey;
     }
 
     // 删除 未支付订单id列表