From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 516a5af..68e789c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
@@ -557,8 +558,10 @@
}
//推广人
if (byId.getInviteUserId() != null) {
- AppUser byId1 = appUserService.getById(byId.getInviteUserId());
- byId.setInviteUserName(byId1.getName());
+ AppUser appUser = appUserService.getById(byId.getInviteUserId());
+ if(null != appUser){
+ byId.setInviteUserName(appUser.getName());
+ }
}
//最后下单时间
R<Order> lastOrder = remoteOrderGoodsClient.getLastOrder(id);
@@ -793,5 +796,17 @@
public void demotionDetection(){
appUserService.demotionDetection();
}
+
+
+ /**
+ * 清空绑定门店的用户门店数据
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/clearBindShop")
+ public R clearBindShop(@RequestParam("shopId") Integer shopId){
+ appUserService.update(new LambdaUpdateWrapper<AppUser>().eq(AppUser::getShopId, shopId).set(AppUser::getShopId, null));
+ return R.ok();
+ }
}
--
Gitblit v1.7.1