java/qijisheng.git

			@@ -8,7 +8,10 @@
			import com.ruoyi.account.api.model.AppUser;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.order.feignClient.OrderClient;
			import com.ruoyi.order.model.Order;
			import com.ruoyi.other.api.domain.Goods;
			import com.ruoyi.other.api.domain.GoodsEvaluate;
			import com.ruoyi.other.service.GoodsEvaluateService;
			@@ -46,15 +49,20 @@
			private GoodsService goodsService;
			@Resource
			private TokenService tokenService;
			@Resource
			private OrderClient orderClient;




			@GetMapping("/goodsList")
			@ApiOperation(value = "获取商品评价", tags = {"小程序-获取商品评价"})
			public R<List<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId){
			List<GoodsEvaluate> list = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).eq(GoodsEvaluate::getDelFlag, 0).eq(GoodsEvaluate::getStatus, 2).list();
			for (GoodsEvaluate goodsEvaluate : list) {
			public R<PageInfo<GoodsEvaluate>> goodsList(@ApiParam("商品id") Integer goodsId, Integer pageNum, Integer pageSize){
			PageInfo<GoodsEvaluate> pageInfo = new PageInfo<>(pageNum, pageSize);
			PageInfo<GoodsEvaluate> page = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).eq(GoodsEvaluate::getDelFlag, 0)
			.eq(GoodsEvaluate::getStatus, 2).isNotNull(GoodsEvaluate::getComment).ne(GoodsEvaluate::getComment, "")
			.orderByDesc(GoodsEvaluate::getCreateTime).page(pageInfo);
			for (GoodsEvaluate goodsEvaluate : page.getRecords()) {
			AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId());
			if(null != appUserById){
			goodsEvaluate.setUserName(appUserById.getName());
			@@ -62,7 +70,7 @@
			goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId()));
			}
			}
			return R.ok(list);
			return R.ok(page);
			}

			/**
			@@ -85,6 +93,7 @@
			List<GoodsEvaluate> list = goodsEvaluateService.list(new LambdaQueryWrapper<GoodsEvaluate>()
			.eq(GoodsEvaluate::getStatus, 2)
			.eq(GoodsEvaluate::getAppUserId,loginUserApplet.getUserid())
			.eq(GoodsEvaluate::getDelFlag, 0)
			.eq(GoodsEvaluate::getOrderId, orderId));
			for (GoodsEvaluate goodsEvaluate : list) {
			Goods goods = goodsService.getById(goodsEvaluate.getGoodsId());
			@@ -101,7 +110,13 @@
			@DeleteMapping("/delete/{id}")
			@ApiOperation(value = "删除评论", tags = {"管理后台-商品管理-评价管理"})
			public R<Void> delete(@PathVariable("id") Long id){
			goodsEvaluateService.removeById(id);
			GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
			goodsEvaluate.setDelFlag(1);
			goodsEvaluateService.updateById(goodsEvaluate);
			//修改订单为待评价
			Order data = orderClient.getOrderById(goodsEvaluate.getOrderId()).getData();
			data.setOrderStatus(data.getOldOrderStatus());
			orderClient.editOrder(data);
			return R.ok();
			}

			@@ -119,7 +134,7 @@
			List<Long> usersNameList = new ArrayList<>();
			List<Long> usersPhoneList = new ArrayList<>();

			if (StringUtils.isNotEmpty(goodsEvaluate.getUserName())) {
			if (StringUtils.isNotEmpty(goodsEvaluate.getGoodsName())) {
			goodsIds = goodsService.lambdaQuery()
			.like(Goods::getName, goodsEvaluate.getGoodsName())
			.list().stream().map(Goods::getId).collect(Collectors.toList());
			@@ -140,11 +155,18 @@
			return R.ok(new Page<>());
			}
			}
			usersNameList.retainAll(usersPhoneList);
			if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())&&StringUtils.isNotEmpty(goodsEvaluate.getUserName())){
			// 取交集
			usersNameList.retainAll(usersPhoneList);
			if (usersNameList.isEmpty())usersNameList.add(-1L);
			}else{
			usersNameList.addAll(usersPhoneList);
			}
			Page<GoodsEvaluate> page = goodsEvaluateService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsEvaluate>()
			.in(!goodsIds.isEmpty(), GoodsEvaluate::getGoodsId, goodsIds)
			.in(!usersNameList.isEmpty(), GoodsEvaluate::getAppUserId, usersNameList)
			.eq(goodsEvaluate.getStatus() != null, GoodsEvaluate::getStatus, goodsEvaluate.getStatus())
			.eq(GoodsEvaluate::getDelFlag, 0)
			.orderByDesc(GoodsEvaluate::getCreateTime));


			@@ -160,7 +182,9 @@
			item.setUserName(appUser.getName());
			}
			Goods goods = goodsService.getById(item.getGoodsId());
			item.setGoodsName(goods.getName());
			if(null != goods){
			item.setGoodsName(goods.getName());
			}
			}

			/**