修改 添加 正在下单mongo

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

@@ -179,8 +179,6 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
                 }
             }
             String marketSkuId = item.getSkuId().concat(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()).concat(IDGenerator.marketGoodId(params.getSelfMarketId()));
-            redisUtils.setSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), marketSkuId, item.getStockMarketing());
-            redisUtils.addSkuRe(item.getSkuId(), marketSkuId);
             skuVo.setSpuId(marketSpuId);
             skuVo.setSkuId(marketSkuId);
             skuVo.setPrice(bean.getPriceMarketing());
@@ -189,11 +187,14 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             skuVo.setBuyLimit(bean.getBuyLimit());
             skuVo.setBuyRoster(bean.getBuyRoster());
             skuVo.setBuyFactor(bean.getBuyFactor().toString());
+            skuVo.setDelFlg("0");
             skuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId()));
             skuVo.setCreatedAt(LocalDateTime.now());
             mongoUtils.upsertGoodsSkuInfoVo(skuVo);
             //redis
             redisUtils.setGoodsSkuInfoVo(skuVo);
+            redisUtils.setSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), marketSkuId, item.getStockMarketing());
+            redisUtils.addSkuRe(item.getSkuId(), marketSkuId);
             //mysql
             sqlsData.add(new Object[]{zhengzaiId, bean.getSelfMarketId(), bean.getSpuId(), bean.getSkuId(), bean.getStoreId(), bean.getPriceMarketing(),
                     bean.getStockMarketing(), bean.getBuyFactor(), bean.getBuyRoster(), bean.getBuyLimit(), bean.getDelFlag(), bean.getCreatedAt()});
@@ -216,6 +217,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
         spuVo.setSpecMode("2");
         spuVo.setPriceLe(priceList.get(priceList.size() - 1));
         spuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId()));
+        spuVo.setDelFlg("0");
         mongoUtils.upsertGoodsInfoVo(spuVo);
         //redis
         redisUtils.setGoodsInfoVo(spuVo);

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

@@ -511,10 +511,12 @@ public class GoblinMongoUtils {
         return mongoTemplate.insert(vo, GoblinGoodsSkuInfoVo.class.getSimpleName());
     }
 
-    public void upsertGoodsSkuInfoVo(GoblinGoodsSkuInfoVo vo) {
+    public UpdateResult upsertGoodsSkuInfoVo(GoblinGoodsSkuInfoVo vo) {
         Document document = (Document) mongoConverter.convertToMongoType(vo);
         Update update = Update.fromDocument(document);
-        mongoTemplate.upsert(Query.query(Criteria.where("storeId").is(vo.getStoreId()).and("skuId").is(vo.getSkuId())), update, GoblinGoodsInfoVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("storeId").is(vo.getStoreId()).and("skuId").is(vo.getSkuId()));
+        UpdateResult result = mongoTemplate.upsert(query, update, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+        return result;
     }
 
     // SKU信息
@@ -555,6 +557,7 @@ public class GoblinMongoUtils {
         return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId)),
                 GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
     }
+
     public List<GoblinGoodsSkuInfoVo> getGoodsSkuInfoVos(List<String> skuIds) {
         return mongoTemplate.find(Query.query(Criteria.where("skuId").in(skuIds)),
                 GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
@@ -839,7 +842,7 @@ public class GoblinMongoUtils {
         //查询销量
         int size = 20;
         int skipCount = ((page - 1) * size);
-        int finalCount = skipCount+size;
+        int finalCount = skipCount + size;
         List<GoblinGoodsInfoVo> spuIdAndName = null;
         Criteria criteria = Criteria.where("status").in(GoblinStatusConst.Status.ORDER_LOG_STATUS_11.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_28.getValue()).and("storeId").is(storeId);
         if (spuName != null) {
@@ -858,8 +861,8 @@ public class GoblinMongoUtils {
         List<GoblinOrderLogVo> countList = mongoTemplate.find(countQuery, GoblinOrderLogVo.class, GoblinOrderLogVo.class.getSimpleName());
         List<String> spuIdList = countList.stream().map(GoblinOrderLogVo::getSpuId).distinct().collect(Collectors.toList());
         long total = spuIdList.size();
-        if(finalCount>total){
-            finalCount = (int)total;
+        if (finalCount > total) {
+            finalCount = (int) total;
         }
         criteria = criteria.and("spuId").in(spuIdList.subList(skipCount, finalCount));
         //查询聚合数据