From 122bb1142631e31ce50716495dba420102f58f56 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 31 七月 2023 20:05:05 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 2d6a532..3505a77 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
@@ -5,11 +5,14 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
@@ -107,6 +110,9 @@
@Resource
private ShopTaskService shopTaskService;
+ @Resource
+ private RedisService redisService;
+
/**
* 获取商户详情
* @param shopId
@@ -193,6 +199,12 @@
//清空归属
shopRelUserService.deleteByShopId(shop.getShopId());
shopStaffService.clearShopStaffRelation(shop.getShopId());
+ if(!shop.getShopName().equals(mgtEditShopDto.getShopName())){
+ MgtMemberShopNameDto mgtMemberShopNameDto = new MgtMemberShopNameDto();
+ mgtMemberShopNameDto.setShopId(mgtEditShopDto.getShopId());
+ mgtMemberShopNameDto.setShopName(mgtEditShopDto.getShopName());
+ remoteMemberService.updateMemberShopName(mgtMemberShopNameDto);
+ }
}else{
if(shopSame!=null){
throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
@@ -409,6 +421,7 @@
shop.setFrozenFlag(0);
}
shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag()));
+ this.saveOrUpdate(shop);
}
/**
@@ -749,14 +762,21 @@
}
/**
* 获取商户端
- * @param userId
+ * @param merBaseDto
* @return
*/
@Override
- public MerHomeShopTotalVo getMerHomeTotal(Long userId){
+ public MerHomeShopTotalVo getMerHomeTotal(MerBaseDto merBaseDto){
+ Long userId = merBaseDto.getUserId();
MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
Long shopId = shopRelUser.getShopId();
+ //如果商户变动刷新token
+ if(!shopId.equals(merBaseDto.getShopId())){
+ String userKey = SecurityUtils.getUserKey();
+ redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
+ throw new ServiceException("登录状态已过期",401);
+ }
merHomeShopTotalVo.setShopId(shopId);
Shop shop = this.getById(shopId);
merHomeShopTotalVo.setShopType(shop.getShopType());
@@ -963,19 +983,24 @@
submitInfo.setId_card_info(id_card_info);
//企业填写
if(shopAuthentication.getMainType()==2){
- submitInfo.setOwner(true);
- List<UboInfo> ubo_info_list = new ArrayList<>();
- UboInfo uboInfo = new UboInfo();
- uboInfo.setUbo_id_doc_type("IDENTIFICATION_TYPE_MAINLAND_IDCARD");
- uboInfo.setUbo_id_doc_copy(shopAuthentication.getUboIcFront());
- uboInfo.setUbo_id_doc_copy_back(shopAuthentication.getUboIcBack());
- uboInfo.setUbo_id_doc_name(shopAuthentication.getUboName());
- uboInfo.setUbo_id_doc_number(shopAuthentication.getUboIdCard());
- uboInfo.setUbo_id_doc_address(shopAuthentication.getUboIcAddress());
- uboInfo.setUbo_id_doc_period_begin(shopAuthentication.getUboIcStartDate());
- uboInfo.setUbo_id_doc_period_end(shopAuthentication.getUboIcEndDate());
- ubo_info_list.add(uboInfo);
- submitInfo.setUbo_info_list(ubo_info_list);
+ //受益人
+ if(shopAuthentication.getOwner()==1){
+ submitInfo.setOwner(true);
+ }else{
+ submitInfo.setOwner(false);
+ List<UboInfo> ubo_info_list = new ArrayList<>();
+ UboInfo uboInfo = new UboInfo();
+ uboInfo.setUbo_id_doc_type("IDENTIFICATION_TYPE_MAINLAND_IDCARD");
+ uboInfo.setUbo_id_doc_copy(shopAuthentication.getUboIcFront());
+ uboInfo.setUbo_id_doc_copy_back(shopAuthentication.getUboIcBack());
+ uboInfo.setUbo_id_doc_name(shopAuthentication.getUboName());
+ uboInfo.setUbo_id_doc_number(shopAuthentication.getUboIdCard());
+ uboInfo.setUbo_id_doc_address(shopAuthentication.getUboIcAddress());
+ uboInfo.setUbo_id_doc_period_begin(shopAuthentication.getUboIcStartDate());
+ uboInfo.setUbo_id_doc_period_end(shopAuthentication.getUboIcEndDate());
+ ubo_info_list.add(uboInfo);
+ submitInfo.setUbo_info_list(ubo_info_list);
+ }
}
//结算账户信息
AccountInfo accountInfo = new AccountInfo();
--
Gitblit v1.7.1