From fc3c206439297fedc116e5a05aff799529e93e99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 19:58:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 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 673875d..38a827d 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
@@ -114,6 +114,9 @@
shop.setCustomOrderNumber(0);
shop.setAppUserId(appUser.getId());
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
+ if(!StringUtils.hasLength(city)){
+ city = "510100";
+ }
shop.setProvinceCode(city.substring(0, 2) + "0000");
shop.setCityCode(city.substring(0, 4) + "00");
shop.setDistrictCode(city);
@@ -124,6 +127,7 @@
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shopId);
+ appUserShop.setRoleType(1);
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
throw new RuntimeException("添加失败");
@@ -210,7 +214,15 @@
}
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
+
shopService.updateById(shop);
+ // 查询有没有门店绑定这个被删除的门店
+ List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
+ for (Shop shop1 : shops) {
+ LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
+ .eq(Shop::getId,shop1.getId());
+ shopService.update(set);
+ }
appUserClient.clearBindShop(shop.getId());
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
@@ -258,7 +270,7 @@
if (!shopService.cheUserByPhone(phone)) {
return R.fail("该手机号未注册");
}
- if (shop.getPid()!=null){
+ if (shop.getPid() != null && shop.getPid() != 0){
Shop shopP = shopService.getById(shop.getPid());
if (shopP.getPid()!=null&&shopP.getPid()!=0&& shopP.getPid().equals(shop.getId())){
return R.fail("门店之间不能互相作为上级门店");
@@ -284,6 +296,7 @@
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
appUserShopClient.delAppUserShop(appUserShop);
//添加新管理员
@@ -291,7 +304,11 @@
appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
appUserClient.addAppUserShop(appUserShop);
+ appUser.setUserType(2);
+ appUserClient.editAppUserById(appUser);
+
//修改管理员
shop.setAppUserId(appUser.getId());
@@ -311,6 +328,8 @@
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(sysUser.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
}else{
@@ -335,6 +354,8 @@
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(appUser.getName());
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
return R.ok();
@@ -350,6 +371,21 @@
}
shop.setStatus(status);
shopService.updateById(shop);
+ //处理员工等数据
+ UserShop userSh = new UserShop();
+ userSh.setShopId(id);
+ List<UserShop> data = userShopClient.getUserShop(userSh).getData();
+ for (UserShop datum : data) {
+ UserShop userShop = new UserShop();
+ userShop.setUserId(datum.getUserId());
+ List<UserShop> data1 = userShopClient.getUserShop(userShop).getData();
+ long count = data1.stream().filter(s -> !s.getShopId().equals(id)).count();
+ if(0 == count){
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ sysUser.setStatus(status == 1 ? "0" : "1");
+ sysUserClient.updateUser(sysUser);
+ }
+ }
return R.ok();
}
@@ -666,7 +702,7 @@
@PostMapping("/saveWithdrawalAccount")
@ApiOperation(value = "保存提现账户", tags = {"门店后台-财务统计-提现明细"})
- public R saveWithdrawalAccount(SaveWithdrawalAccount saveWithdrawalAccount) {
+ public R saveWithdrawalAccount(@RequestBody SaveWithdrawalAccount saveWithdrawalAccount) {
shopService.saveWithdrawalAccount(saveWithdrawalAccount);
return R.ok();
}
--
Gitblit v1.7.1