Merge branch 'pre' into 'master'

Pre

See merge request !200

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

@@ -463,8 +463,8 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
        // query.addCriteria(Criteria.where("name").regex(pattern).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
         query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null));
         query.with(Sort.by(
-                Sort.Order.desc("count"),
-                Sort.Order.desc("createdAt")
+                //Sort.Order.desc("count"),
+                Sort.Order.desc("shelvesAt")
         ));
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
         ArrayList<GoblinGoodsInfoListVo> list1=ObjectUtil.getGoblinGoodsInfoListVo();
@@ -689,7 +689,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         if(sortType==1){
             sortName = Sort.by(Sort.Direction.DESC, "shelvesAt");
         }else  if(sortType==2){
-            sortName = Sort.by(Sort.Direction.DESC, "count");
+            sortName = Sort.by(Sort.Direction.DESC, "count","createdAt");
         }else  if(sortType==3){
             Document source = new Document();
             source.put("locale", "zh");

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

@@ -105,6 +105,21 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     String pre = GoblinStatusConst.MarketPreStatus.getPre(skuId);
                     int surplusGeneral = redisUtils.decrSkuStock(pre, skuId, number);
                     skuAndPreListAndNumber.add(skuId + "," + pre + "," + number);
+                    // 判断库存
+                    GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId());
+                    int limitCount = skuVo.getBuyLimit() == 0 ? Integer.MAX_VALUE : skuVo.getBuyLimit();
+                    //判断限购
+                    if (orderUtils.noZhengzaiOrder(uid)) {
+                        String res1 = orderUtils.judgeOrderLimit(uid, skuParam.getSkuId(), skuParam.getNumber(), limitCount);
+                        if (!res1.equals("")) {
+                            throw new Exception("已超出限购数量");
+                        }
+                        //权限限购
+                        Boolean res2 = orderUtils.judgeOrderRose(isMember, skuParam.getSkuId(), StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get("mobile")), ""), Integer.parseInt(skuVo.getBuyFactor()));
+                        if (!res2) {
+                            throw new Exception("无权购买");
+                        }
+                    }
                     //库存回滚
                     if (surplusGeneral < 0) {
                         return orderUtils.orderException(skuAndPreListAndNumber, platformCodeList, storeCodeList, uid, "库存不足");
@@ -219,20 +234,6 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             if (!(skuVo.getStatus().equals("3") && skuVo.getShelvesStatus().equals("3")) || skuVo.getDelFlg().equals("1")) {
                 throw new Exception("不可购买");
             }
-            // 判断库存
-            int limitCount = skuVo.getBuyLimit() == 0 ? Integer.MAX_VALUE : skuVo.getBuyLimit();
-            //判断限购
-            if (orderUtils.noZhengzaiOrder(uid)) {
-                String res1 = orderUtils.judgeOrderLimit(uid, skuParam.getSkuId(), skuParam.getNumber(), limitCount);
-                if (!res1.equals("")) {
-                    throw new Exception("已超出限购数量");
-                }
-                //权限限购
-                Boolean res2 = orderUtils.judgeOrderRose(isMember, skuParam.getSkuId(), StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get("mobile")), ""), Integer.parseInt(skuVo.getBuyFactor()));
-                if (!res2) {
-                    throw new Exception("无权购买");
-                }
-            }
             marketId = spuVo.getMarketId();
             marketType = pre;
             skuName = skuName.concat(skuVo.getName()).concat(",");

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

 package com.liquidnet.service.platform.service.impl.goblin;
 
+import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.platform.utils.GoblinRedisUtils;
 import com.liquidnet.service.platform.utils.QueueUtils;
@@ -59,6 +60,9 @@ public class SpuGoodsInfoImpl {
                     obj);
         }
         log.info("执行完毕");
+        goblinRedisUtils.del(GoblinRedisConst.SELECT_GOODS_SPUIDS);
+        goblinRedisUtils.del(GoblinRedisConst.SELECT_GOODS_PAGE1);
+        goblinRedisUtils.del(GoblinRedisConst.SELECT_GOODS_SPUIDS_ISHAVE);
         return true;
     }
 }