From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index a327624..ac16539 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -210,7 +210,7 @@
}
//验证商户名唯一
- Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
+ //Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
if(mgtEditShopDto.getShopId()!=null){
//取消验重
/*if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
@@ -243,7 +243,7 @@
shop.setCreateTime(new Date());
shop.setCreateUserId(mgtEditShopDto.getUserId());
shop.setFrozenFlag(0);
- shop.setCooperativeFlag(0);
+ shop.setCooperativeFlag(1);
shop.setAuthFlag(0);
newShop = true;
}
@@ -817,6 +817,7 @@
for(Shop shop : shopList){
shopIds.add(shop.getShopId());
}
+ userIds.add(userId);
}
}
//分别查询
@@ -859,7 +860,7 @@
if(shop.getFrozenFlag()==1){
String userKey = SecurityUtils.getUserKey();
redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
- throw new ServiceException("商户已被冻结",401);
+ throw new ServiceException("商户已被冻结,请联系管理员",401);
}
merHomeShopTotalVo.setShopType(shop.getShopType());
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
@@ -1116,8 +1117,12 @@
String[] shopSalesKey = new String[shopSalesRank.size()];
BigDecimal[] shopSalesValue = new BigDecimal[shopSalesRank.size()];
// 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
+ Long shopId;
+ Shop shop;
for (int i = 0; i < shopSalesRank.size(); i++) {
- shopSalesKey[i] = shopSalesRank.get(i).getMapKey();
+ shopId = Long.valueOf(shopSalesRank.get(i).getMapKey());
+ shop = this.getByShopId(shopId);
+ shopSalesKey[i] = shop.getShopName();
shopSalesValue[i] = shopSalesRank.get(i).getMapValue();
}
plTotalShopTotalVo.setShopSalesRankKey(shopSalesKey);
@@ -1603,4 +1608,19 @@
throw new RuntimeException(e);
}
}
+
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/29 14:33
+ * @param
+ * @return List<MgtUserTaskMsgVo>
+ */
+ @Override
+ public List<MgtUserTaskMsgVo> getTaskMsgList(){
+ return shopMapper.getTaskMsgList();
+ }
+
}
--
Gitblit v1.7.1