From f94d845814d209b7b5cda0ea70a2e8cb6cda5b39 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 15:22:50 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index ee2356d..64e4910 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -94,10 +94,10 @@
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
String phone = shop.getPhone();
- if (!shopService.cheUserByPhone(phone)) {
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ if (appUser == null){
return R.fail("该手机号未注册");
}
- AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
shop.setShopAllPoint(0);
shop.setLowerLevelSharePoint(0);
shop.setSharePoint(0);
@@ -119,9 +119,11 @@
shop.setDistrictCode(city);
shopService.save(shop);
+ Integer shopId = shop.getId();
+
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(shop.getId());
+ appUserShop.setShopId(shopId);
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
throw new RuntimeException("添加失败");
@@ -136,14 +138,14 @@
if(null != sysUser){
UserShop userShop = new UserShop();
userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setNickName(sysUser.getNickName());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setRoleId(2L);
userShop.setCreateTime(LocalDateTime.now());
@@ -160,7 +162,7 @@
user.setStatus("0");
user.setDelFlag("0");
user.setRoleType(2);
- user.setObjectId(shop.getId());
+ user.setObjectId(shopId);
user.setAppUserId(appUser.getId());
user.setPassword(phone.substring(5));
user.setCreateTime(new Date());
@@ -168,11 +170,17 @@
UserShop userShop = new UserShop();
userShop.setUserId(userId);
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setRoleId(2L);
userShopClient.saveUserShop(userShop);
}
+
+ // 更换下级会员绑定门店
+ R<List<AppUser>> lowerShopR = appUserClient.setLowerUserShop(appUser.getId(), shopId);
+ if (R.isError(lowerShopR)){
+ throw new RuntimeException("更换下级会员绑定门店失败");
+ }
return R.ok();
}
--
Gitblit v1.7.1