From 7ce5b517fc092f0ab7d161e5d044e563bd80e7a6 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 17 Jun 2021 10:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=84=E4=BB=B7=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1=E9=87=8D?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BB=A3=E7=A0=81=E5=A4=8D=E7=94=A8=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=EF=BC=8C=E5=89=8D=E7=AB=AF=E5=8F=AF=E4=BB=A5=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E5=90=8E=E7=AB=AF=E8=AE=BE=E7=BD=AE=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=9A=84=E8=AF=84=E4=BB=B7=E5=86=85=E5=AE=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MemberEvaluationBuyerController.java | 6 +- .../entity/dto/EvaluationQueryParams.java | 13 +++- .../dto/StoreEvaluationQueryParams.java | 59 ------------------- .../member/mapper/MemberEvaluationMapper.java | 2 +- .../service/MemberEvaluationService.java | 15 +---- .../MemberEvaluationServiceImpl.java | 23 +++----- .../MemberEvaluationManagerController.java | 2 +- .../MemberEvaluationStoreController.java | 7 +-- 8 files changed, 30 insertions(+), 97 deletions(-) delete mode 100644 framework/src/main/java/cn/lili/modules/member/entity/dto/StoreEvaluationQueryParams.java diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java index 14c47cb9..dc13e010 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java @@ -1,5 +1,6 @@ package cn.lili.controller.member; +import cn.lili.common.enums.SwitchEnum; import cn.lili.common.security.context.UserContext; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; @@ -55,7 +56,7 @@ public class MemberEvaluationBuyerController { public ResultMessage> queryMineEvaluation(EvaluationQueryParams evaluationQueryParams) { //设置当前登录会员 evaluationQueryParams.setMemberId(UserContext.getCurrentUser().getId()); - return ResultUtil.data(memberEvaluationService.queryByParams(evaluationQueryParams)); + return ResultUtil.data(memberEvaluationService.managerQuery(evaluationQueryParams)); } @ApiOperation(value = "查看某一个商品的评价列表") @@ -65,7 +66,8 @@ public class MemberEvaluationBuyerController { @NotNull @PathVariable("goodsId") String goodsId) { //设置查询查询商品 evaluationQueryParams.setGoodsId(goodsId); - return ResultUtil.data(memberEvaluationService.queryByParams(evaluationQueryParams)); + evaluationQueryParams.setStatus(SwitchEnum.OPEN.name()); + return ResultUtil.data(memberEvaluationService.managerQuery(evaluationQueryParams)); } @ApiOperation(value = "查看某一个商品的评价数量") diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java index aa150722..63881cd3 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java @@ -15,6 +15,10 @@ import lombok.Data; @Data public class EvaluationQueryParams extends PageVO { + + @ApiModelProperty(value = "买家ID") + private String memberId; + @ApiModelProperty(value = "会员名称") private String memberName; @@ -24,9 +28,6 @@ public class EvaluationQueryParams extends PageVO { @ApiModelProperty(value = "卖家ID") private String storeId; - @ApiModelProperty(value = "买家ID", hidden = true) - private String memberId; - @ApiModelProperty(value = "商品名称") private String goodsName; @@ -45,6 +46,9 @@ public class EvaluationQueryParams extends PageVO { @ApiModelProperty(value = "评论日期--结束时间") private String endTime; + @ApiModelProperty(value = "状态") + private String status; + public EvaluationQueryParams() { } @@ -78,6 +82,9 @@ public class EvaluationQueryParams extends PageVO { if (StringUtils.isNotEmpty(haveImage)) { queryWrapper.eq("have_image", haveImage); } + if (StringUtils.isNotEmpty(status)) { + queryWrapper.eq("status", status); + } queryWrapper.eq("delete_flag", false); queryWrapper.orderByDesc("create_time"); return queryWrapper; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/StoreEvaluationQueryParams.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/StoreEvaluationQueryParams.java deleted file mode 100644 index d1d76775..00000000 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/StoreEvaluationQueryParams.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.lili.modules.member.entity.dto; - -import cn.hutool.core.date.DateUtil; -import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.StringUtils; -import cn.lili.common.vo.PageVO; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 店铺评价查询参数 - * - * @author Chopper - * @date 2021/3/20 10:43 - */ - -@Data -public class StoreEvaluationQueryParams extends PageVO { - - @ApiModelProperty(value = "会员名称") - private String memberName; - - @ApiModelProperty(value = "商品名称") - private String goodsName; - - @ApiModelProperty(value = "好中差评 good：好评，neutral：中评，bad：差评", allowableValues = "GOOD,NEUTRAL,BAD") - private String grade; - - @ApiModelProperty(value = "评论日期--开始时间") - private String startDate; - - @ApiModelProperty(value = "评论日期--结束时间") - private String endDate; - - - public QueryWrapper queryWrapper() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - - queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); - - if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) { - queryWrapper.between("create_time", DateUtil.parse(startDate), DateUtil.parse(endDate)); - } - - if (StringUtils.isNotEmpty(grade)) { - queryWrapper.eq("grade", grade); - } - - if (StringUtils.isNotEmpty(goodsName)) { - queryWrapper.eq("goods_name", goodsName); - } - - if (StringUtils.isNotEmpty(memberName)) { - queryWrapper.eq("member_name", memberName); - } - return queryWrapper; - } -} diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java index 829b1b44..5c021159 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java @@ -25,7 +25,7 @@ public interface MemberEvaluationMapper extends BaseMapper { @Select("select me.* from li_member_evaluation as me ${ew.customSqlSegment}") IPage getMemberEvaluationList(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - @Select("select grade,count(1) as num from li_member_evaluation Where goods_id=#{goodsId} GROUP BY grade") + @Select("select grade,count(1) as num from li_member_evaluation Where goods_id=#{goodsId} and status='OPEN' GROUP BY grade") List> getEvaluationNumber(String goodsId); @Select("SELECT round( AVG( delivery_score ), 2 ) AS delivery_score" + diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java index 0e1d44f2..1bebd5bc 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java @@ -1,10 +1,8 @@ package cn.lili.modules.member.service; -import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberEvaluation; import cn.lili.modules.member.entity.dto.EvaluationQueryParams; import cn.lili.modules.member.entity.dto.MemberEvaluationDTO; -import cn.lili.modules.member.entity.dto.StoreEvaluationQueryParams; import cn.lili.modules.member.entity.vo.EvaluationNumberVO; import cn.lili.modules.member.entity.vo.MemberEvaluationListVO; import cn.lili.modules.member.entity.vo.MemberEvaluationVO; @@ -25,23 +23,14 @@ public interface MemberEvaluationService extends IService { * @param evaluationQueryParams 评价查询 * @return 评价分页 */ - IPage queryByParams(EvaluationQueryParams evaluationQueryParams); - - /** - * 商家查询会员的评价分页列表 - * - * @param storeEvaluationQueryParams 评价查询 - * @return 会员的评价分页 - */ - IPage queryByParams(StoreEvaluationQueryParams storeEvaluationQueryParams); + IPage managerQuery(EvaluationQueryParams evaluationQueryParams); /** * 查询评价分页列表 * @param evaluationQueryParams 评价查询条件 - * @param page 分页查询参数 * @return 评价分页列表 */ - IPage queryPage(EvaluationQueryParams evaluationQueryParams, PageVO page); + IPage queryPage(EvaluationQueryParams evaluationQueryParams); /** * 添加会员评价 diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java index 388b9f61..28c5ec5e 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java @@ -3,8 +3,8 @@ package cn.lili.modules.member.serviceimpl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; -import cn.lili.common.enums.SwitchEnum; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.common.rocketmq.tags.GoodsTagsEnum; @@ -12,7 +12,6 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.PageUtil; import cn.lili.common.utils.StringUtils; -import cn.lili.common.vo.PageVO; import cn.lili.config.rocketmq.RocketmqCustomProperties; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.service.GoodsSkuService; @@ -20,7 +19,6 @@ import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberEvaluation; import cn.lili.modules.member.entity.dto.EvaluationQueryParams; import cn.lili.modules.member.entity.dto.MemberEvaluationDTO; -import cn.lili.modules.member.entity.dto.StoreEvaluationQueryParams; import cn.lili.modules.member.entity.enums.EvaluationGradeEnum; import cn.lili.modules.member.entity.vo.EvaluationNumberVO; import cn.lili.modules.member.entity.vo.MemberEvaluationListVO; @@ -42,7 +40,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,20 +81,16 @@ public class MemberEvaluationServiceImpl extends ServiceImpl queryByParams(EvaluationQueryParams queryParams) { + public IPage managerQuery(EvaluationQueryParams queryParams) { //获取评价分页 return this.page(PageUtil.initPage(queryParams), queryParams.queryWrapper()); } @Override - public IPage queryByParams(StoreEvaluationQueryParams storeEvaluationQueryParams) { - return memberEvaluationMapper.getMemberEvaluationList(PageUtil.initPage(storeEvaluationQueryParams), storeEvaluationQueryParams.queryWrapper()); + public IPage queryPage(EvaluationQueryParams evaluationQueryParams) { + return memberEvaluationMapper.getMemberEvaluationList(PageUtil.initPage(evaluationQueryParams), evaluationQueryParams.queryWrapper()); } - @Override - public IPage queryPage(EvaluationQueryParams evaluationQueryParams, PageVO page) { - return memberEvaluationMapper.getMemberEvaluationList(PageUtil.initPage(page), evaluationQueryParams.queryWrapper()); - } @Override public MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO) { @@ -106,7 +99,7 @@ public class MemberEvaluationServiceImpl extends ServiceImpl> list = memberEvaluationMapper.getEvaluationNumber(goodsId); + Integer good = 0; Integer moderate = 0; Integer worse = 0; @@ -204,10 +198,11 @@ public class MemberEvaluationServiceImpl extends ServiceImpl> getByPage(EvaluationQueryParams evaluationQueryParams, PageVO page) { - return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams, page)); + return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams)); } @ApiOperation(value = "修改评价状态") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java index 937a9a8b..71b77c08 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java @@ -2,7 +2,7 @@ package cn.lili.controller.trade; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.member.entity.dto.StoreEvaluationQueryParams; +import cn.lili.modules.member.entity.dto.EvaluationQueryParams; import cn.lili.modules.member.entity.vo.MemberEvaluationListVO; import cn.lili.modules.member.entity.vo.MemberEvaluationVO; import cn.lili.modules.member.service.MemberEvaluationService; @@ -30,9 +30,8 @@ public class MemberEvaluationStoreController { @ApiOperation(value = "分页获取会员评论列表") @GetMapping - public ResultMessage> getByPage(StoreEvaluationQueryParams storeEvaluationQueryParams) { - - return ResultUtil.data(memberEvaluationService.queryByParams(storeEvaluationQueryParams)); + public ResultMessage> getByPage(EvaluationQueryParams evaluationQueryParams) { + return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams)); } @ApiOperation(value = "通过id获取")