Merge remote-tracking branch 'origin/feature-201815-liusw' into feature-201815-liusw

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -123,7 +123,7 @@ public class GoodsServiceImpl implements GoodsService {
 
     private final KindService kindService;
     private final StoreInDao storeInDao;
-    private static final long NONE_RESERVE = 0L;
+    private static final int GOOD_SOLD_OUT = 602;
 
     private final StoreInService storeInService;
     /**
@@ -2557,7 +2557,7 @@ public class GoodsServiceImpl implements GoodsService {
         pageInfo.expression(PredicateUtils.or(new SimpleExpression[]{PredicateUtils.eq("status", 601, true), PredicateUtils.eq("status", 602, true)}));
         pageInfo.sorting(Sort.Direction.DESC, "updateDate");
         pageInfo.expression(PredicateUtils.eq("storeid", storeid, false));
-        pageInfo.expression(PredicateUtils.ne("go_reserve",NONE_RESERVE,false));
+        pageInfo.expression(PredicateUtils.ne("go_status",GOOD_SOLD_OUT,false));
         if (StringUtils.hasText(kindUuid)) {
             // 如果包含多个叶子类目ID，则获取所有的叶子类目对应的商品信息
             if ("其他".equals(kindUuid) || "-10".equals(kindUuid)) {