From a016ab9f97b76c3b4905b890662d344d47f24005 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 28 六月 2023 18:25:14 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 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 6a6339d..250a4e9 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
@@ -7,10 +7,11 @@
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.security.utils.CodeFactoryUtil;
import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.pojo.ShopTotal;
+import com.ruoyi.shop.domain.pojo.shop.ShopTotal;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
import com.ruoyi.shop.domain.vo.*;
@@ -29,7 +30,6 @@
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteUserService;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -98,6 +98,13 @@
@Resource
private MemberTaskService memberTaskService;
+ @Resource
+ private ShopTransferRecordService shopTransferRecordService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+
/**
* 获取商户详情
* @param shopId
@@ -142,6 +149,21 @@
Shop shop = new Shop();
Boolean newShop = false;
BigDecimal zeroBig = BigDecimal.ZERO;
+ //验证关联账号唯一
+ String relUserIds = mgtEditShopDto.getRelUserIds();
+ if(StringUtils.isNotBlank(relUserIds)) {
+ String[] relUserIdArray = relUserIds.split(",");
+ ShopRelUser shopRelUser;
+ Long userId;
+ for (String str : relUserIdArray) {
+ userId = Long.valueOf(str);
+ shopRelUser = shopRelUserService.getByUserId(userId);
+ if(shopRelUser!=null){
+ throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
+ }
+ }
+ }
+ //验证商户名唯一
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())){
@@ -171,12 +193,12 @@
newShop = true;
}
BeanUtils.copyProperties(mgtEditShopDto,shop);
- this.saveOrUpdate(shop);
//商户编号
if(mgtEditShopDto.getShopId()==null){
String shopNo = CodeFactoryUtil.getShopNo();
shop.setShopNumber(shopNo);
}
+ this.saveOrUpdate(shop);
//商户标签
String shopTagIds = mgtEditShopDto.getShopTagIds();
if(StringUtils.isNotBlank(shopTagIds)){
@@ -199,13 +221,13 @@
this.saveOrUpdate(shop);
}
//商户归属员工
- if(shop.getBelongUserId()!=null){
+ /*if(shop.getBelongUserId()!=null){
SysUser belongSysUser = sysUserService.getSysUser(shop.getBelongUserId()).getData();
handleShopStaff(shop.getShopId(),belongSysUser);
- }
+ }*/
//商户关联人员
- String relUserIds = mgtEditShopDto.getRelUserIds();
if(StringUtils.isNotBlank(relUserIds)){
+ shopStaffService.clearShopStaffRelation(shop.getShopId());
String[] relUserIdArray = relUserIds.split(",");
ShopRelUser shopRelUser;
Long userId;
@@ -524,6 +546,40 @@
this.saveOrUpdate(shop);
}
+
+ /**
+ * @description 转移客户
+ * @author jqs
+ * @date 2023/6/28 16:36
+ * @param mgtTransferShopDto
+ * @return void
+ */
+ @Override
+ public void transferMgtShop(MgtTransferShopDto mgtTransferShopDto){
+ Shop shop = this.getByShopId(mgtTransferShopDto.getShopId());
+ if(shop.getBelongUserId()!=null){
+ ShopTransferRecord shopTransferRecord = new ShopTransferRecord();
+ shopTransferRecord.setDelFlag(0);
+ shopTransferRecord.setShopId(shop.getShopId());
+ shopTransferRecord.setBeforeUserId(shop.getBelongUserId());
+ shopTransferRecord.setAfterUserId(mgtTransferShopDto.getTransferUserId());
+ shopTransferRecord.setTransferRemark(mgtTransferShopDto.getTransferRemark());
+ shopTransferRecordService.save(shopTransferRecord);
+ shopRelUserService.deleteByUserId(shop.getBelongUserId());
+ }
+ shop.setBelongUserId(mgtTransferShopDto.getTransferUserId());
+ this.saveOrUpdate(shop);
+ ShopRelUser shopRelUser = new ShopRelUser();
+ shopRelUser.setDelFlag(0);
+ shopRelUser.setShopId(shop.getShopId());
+ shopRelUser.setUserId(mgtTransferShopDto.getTransferUserId());
+ SysUser sysUser = remoteUserService.getSysUser(mgtTransferShopDto.getTransferUserId()).getData();
+ shopRelUser.setUserMobile(sysUser.getPhonenumber());
+ shopRelUser.setUserDeptId(sysUser.getDeptId());
+ shopRelUser.setUserName(sysUser.getNickName());
+ shopRelUserService.save(shopRelUser);
+ }
+
/**
* 获取附近门店
* @param appNearbyShopDto
--
Gitblit v1.7.1