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 implements YxStoreProductService { @Autowired @@ -167,14 +169,13 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl getGoodsList(YxStoreProductQueryParam productQueryParam) { QueryWrapper 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 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 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;