增加库存

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/receiver/AbstractOrderCloseReceiver.java

 package com.liquidnet.service.consumer.order.receiver;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
@@ -16,7 +15,6 @@ import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.param.BackCouponParam;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
@@ -241,7 +239,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
             String[] goblin = map.get("goblin");
 
             for (String orderId : goblin) {
-                if("".equals(orderId)){
+                if ("".equals(orderId)) {
                     break;
                 }
                 GoblinStoreOrderVo orderVo = getGoblinOrder(orderId);
@@ -258,8 +256,9 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
                         updateGoblinOrderSkuVo(skuVo.getOrderSkuId(), skuVo);
                         setGoblinOrderSku(skuVo.getOrderSkuId(), skuVo);
                         //库存&限购&&待支付订单
-                        incrSkuStock(orderVo.getMixId(), skuVo.getSkuId(), skuVo.getNum());
-                        decrSkuCountByUid(orderVo.getUserId(), skuVo.getSkuId(), skuVo.getNum());
+                        int count = incrSkuStock(orderVo.getMixId(), skuVo.getSkuId(), skuVo.getNum());
+                        int limit = decrMixLimit(orderVo.getMixId(),orderVo.getUserId());
+                        log.debug("count {} limit {}",count,limit);
                         //mysql
                         sqlDataSku.add(new Object[]{
                                 skuVo.getStatus(), now, skuVo.getOrderSkuId(), now, now
@@ -291,7 +290,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
             }
 
             for (String orderId : nft) {
-                if("".equals(orderId)){
+                if ("".equals(orderId)) {
                     break;
                 }
                 checkNftOrderTime(orderId);
@@ -532,6 +531,12 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
         return vos;
     }
 
+    //混合售限购减少
+    public int decrMixLimit(String mixId, String uid) {
+        String rdk = GoblinRedisConst.GOBLIN_MIX_LIMIT.concat(mixId).concat(":").concat(uid);
+        return (int) redisUtil.decr(rdk, 1);
+    }
+
     public Boolean changeCouponVos(String ucouponId, GoblinUserCouponVo vo) {
         return mongoTemplate.getCollection(GoblinUserCouponVo.class.getSimpleName())
                 .updateOne(Query.query(Criteria.where("ucouponId").is(ucouponId)).getQueryObject(),

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -136,6 +136,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
                 } else {//正常
                     if (skuInfoVo.getSkuType() == 1) {
                         stockSkuId.put(skuId, skuId);
+                        boxSkuId.put(skuId, "");
                     }
                     int stock = redisUtils.decrSkuStock(mixId, skuId, itemVo.getCount());
                     if (stock < 0) {