From 3348eda2c33469e9935ae6afcf83ea5c52cea906 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 09 六月 2025 20:07:12 +0800
Subject: [PATCH] 修改bug-初验阶段
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index ac388e0..cf664fb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -75,6 +75,8 @@
private GoodsShopMapper goodsShopMapper;
@Resource
private GoodsShopService goodsShopService;
+ @Resource
+ private GoodsEvaluateMapper goodsEvaluateMapper;
/**
@@ -225,7 +227,9 @@
public PageInfo<ShopBalanceStatementVO> getShopBalanceStatementList(Integer shopId, LocalDateTime startTime, LocalDateTime endTime, Integer type, Integer pageCurr, Integer pageSize) {
PageInfo<ShopBalanceStatementVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
List<ShopBalanceStatementVO> ShopBalanceStatementList = shopBalanceStatementMapper.getShopBalanceStatementList(pageInfo, shopId, startTime, endTime, type);
+
for (ShopBalanceStatementVO shopBalanceStatementVO : ShopBalanceStatementList) {
+ log.error(shopBalanceStatementVO.toString());
BigDecimal historicalBalance = shopBalanceStatementVO.getHistoricalBalance();
BigDecimal balance = shopBalanceStatementVO.getBalance();
if (historicalBalance != null && balance != null) {
@@ -319,6 +323,7 @@
//一个商品只有一个秒杀活动
SeckillActivityInfo seckillActivityInfo = seckillActivityInfoService.getOne(new LambdaQueryWrapper<SeckillActivityInfo>()
.eq(SeckillActivityInfo::getGoodId, goodsId)
+ .eq(SeckillActivityInfo::getIsShelves,1)
.eq(SeckillActivityInfo::getDelFlag, 0));
//商品是否开启秒杀活动
goodsVO.setIsSkillActivity(0);
@@ -331,6 +336,12 @@
goodsVO.setEditActivityPrice(one.getSellingPrice());
}
+ //商品评价
+ GoodsEvaluate goodsEvaluateOne = goodsEvaluateMapper.getGoodsEvaluateOne(goods.getId());
+ AppUser appUserById = appUserClient.getAppUserById(goodsEvaluateOne.getAppUserId());
+ goodsEvaluateOne.setUserName(appUserById.getName());
+ goodsEvaluateOne.setAvatar(appUserById.getAvatar());
+ goodsVO.setGoodsEvaluate(goodsEvaluateOne);
return goodsVO;
}
@@ -357,6 +368,9 @@
goodsShop.setGoodsId(goods.getId());
goodsShop.setShopId(addGoodsDTO.getShopId());
Shop shop = shopMapper.selectById(addGoodsDTO.getShopId());
+ if(shop==null){
+ throw new ServiceException("门店不存在");
+ }
goodsShop.setShopName(shop.getName());
goodsShop.setOwnerName(shop.getShopManager());
goodsShop.setPhone(shop.getPhone());
@@ -454,6 +468,17 @@
return goods.getId();
}
+ @Override
+ public PageInfo<ShopBalanceListVO> getBalanceList(String name, Integer pageCurr, Integer pageSize) {
+ PageInfo<ShopBalanceListVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
+
+ List<ShopBalanceListVO> list = shopMapper.getBalanceList(pageInfo,name);
+
+
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
/**
* 获取商品当前的价格，就是看当前商品是否在秒杀活动中
*/
--
Gitblit v1.7.1