From a8e56f03a22c722ccf3f67a408919e6c8f256de3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 10 八月 2023 01:45:01 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 7d282f6..6f6f916 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
@@ -193,9 +193,10 @@
//验证商户名唯一
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())){
+ //取消验重
+ /*if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
- }
+ }*/
shop = this.getById(mgtEditShopDto.getShopId());
shop.setUpdateTime(new Date());
shop.setUpdateUserId(mgtEditShopDto.getUserId());
@@ -214,9 +215,10 @@
remoteMemberService.updateMemberShopName(mgtMemberShopNameDto);
}
}else{
- if(shopSame!=null){
+ //取消验重
+ /*if(shopSame!=null){
throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
- }
+ }*/
shop.setDelFlag(0);
shop.setShopStatus(3);
shop.setCreateTime(new Date());
@@ -310,7 +312,7 @@
//生成商户关联记录
initNewShop(shop,mgtEditShopDto.getUserId());
CodeGetDto codeGetDto = new CodeGetDto();
- String url = "https://wxapp.hhhrt.cn/mini/shop?shopId="+shop.getShopId();
+ String url = "https://wxapp.hhhrt.cn/mini/shop?id="+shop.getShopId();
codeGetDto.setUrl(url);
codeGetDto.setFileName("shop-"+shop.getShopId());
String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
--
Gitblit v1.7.1