From 43e450a06066011f5efb463954a667c076cc6645 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Mon, 6 Apr 2020 23:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YxStoreProductServiceImpl.java    | 14 ++++++++------
 .../web/controller/StoreProductController.java     |  2 +-
 .../shop/web/param/YxStoreProductQueryParam.java   |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
index fee98e82..2e260679 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
@@ -12,6 +12,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.common.web.vo.Paging;
+import co.yixiang.enums.CommonEnum;
 import co.yixiang.exception.ErrorRequestException;
 import co.yixiang.modules.shop.entity.YxStoreProduct;
 import co.yixiang.modules.shop.entity.YxStoreProductAttrValue;
@@ -53,6 +54,7 @@ import java.util.Map;
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
+@SuppressWarnings("unchecked")
 public class YxStoreProductServiceImpl extends BaseServiceImpl<YxStoreProductMapper, YxStoreProduct> implements YxStoreProductService {
 
     @Autowired
@@ -167,14 +169,13 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<YxStoreProductMap
      * @return
      */
     @Override
-    @SuppressWarnings("unchecked")
     public List<YxStoreProductQueryVo> getGoodsList(YxStoreProductQueryParam productQueryParam) {
 
         QueryWrapper<YxStoreProduct> wrapper = new QueryWrapper<>();
-        wrapper.eq("is_del",0).eq("is_show",1).orderByDesc("sort");
+        wrapper.eq("is_del", CommonEnum.DEL_STATUS_0.getValue()).eq("is_show",CommonEnum.SHOW_STATUS_1.getValue());
 
         //分类搜索
-        if(productQueryParam.getSid() > 0){
+        if(StrUtil.isNotBlank(productQueryParam.getSid()) && !productQueryParam.getSid().equals("0")){
             wrapper.eq("cate_id",productQueryParam.getSid());
         }
         //关键字搜索
@@ -183,21 +184,22 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<YxStoreProductMap
         }
 
         //新品搜索
-        if(productQueryParam.getNews() == 1){
+        if(StrUtil.isNotBlank(productQueryParam.getNews()) && productQueryParam.getNews().equals("1")){
             wrapper.eq("is_new",1);
         }
         //销量排序
         if(productQueryParam.getSalesOrder().equals("desc")){
             wrapper.orderByDesc("sales");
-        }else{
+        }else if(productQueryParam.getSalesOrder().equals("asc")) {
             wrapper.orderByAsc("sales");
         }
         //价格排序
         if(productQueryParam.getPriceOrder().equals("desc")){
             wrapper.orderByDesc("price");
-        }else{
+        }else if(productQueryParam.getPriceOrder().equals("asc")){
             wrapper.orderByAsc("price");
         }
+        wrapper.orderByDesc("sort");
 
 
         Page<YxStoreProduct> pageModel = new Page<>(productQueryParam.getPage(),
diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java
index ba165809..995f20c6 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java
@@ -231,7 +231,7 @@ public class StoreProductController extends BaseController {
     @ApiOperation(value = "获取产品评论",notes = "获取产品评论")
     public ApiResult<Object> replyList(@PathVariable Integer id,
                                        YxStoreProductQueryParam queryParam){
-        return ApiResult.ok(replyService.getReplyList(id,queryParam.getType(),
+        return ApiResult.ok(replyService.getReplyList(id,Integer.valueOf(queryParam.getType()),
                 queryParam.getPage().intValue(),queryParam.getLimit().intValue()));
     }
 
diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java
index 76ad7e5b..6f693dd6 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java
@@ -20,9 +20,9 @@ import co.yixiang.common.web.param.QueryParam;
 public class YxStoreProductQueryParam extends QueryParam {
     private static final long serialVersionUID = 1L;
 
-    private int type;
-    private int sid;
-    private int news;
+    private String type;
+    private String sid;
+    private String news;
     private String priceOrder;
     private String salesOrder;
     private String keyword;