From 2ed6444f45d227e2acc6de65c3e8b582440fb83a Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 06 三月 2025 09:20:40 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 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 de23686..ac1f16a 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
@@ -678,8 +678,17 @@
@PostMapping("/getShopIdByName")
public R<Set<Integer>> getShopIdByName(@RequestParam("shopName") String shopName){
List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
- .like(Shop::getName, shopName));
+ .like(Shop::getName, shopName)
+ .eq(Shop::getDelFlag, 0));
return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
+ }
+
+ @PostMapping("/getManagerByManagerName")
+ public R<Set<Long>> getManagerByManagerName(@RequestParam("managerName") String managerName){
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
+ .like(Shop::getShopManager, managerName)
+ .eq(Shop::getDelFlag, 0));
+ return R.ok(list.stream().map(Shop::getAppUserId).collect(Collectors.toSet()));
}
/**
@@ -808,6 +817,21 @@
return R.ok();
}
+ @PostMapping("/saveWithdrawalAppletAccount")
+ @ApiOperation(value = "保存提现账户", tags = {"小程序-个人中心-门店管理-门店钱包"})
+ public R saveWithdrawalAppletAccount(@RequestBody SaveWithdrawalAccount saveWithdrawalAccount){
+
+ Shop shop = shopService.getById(saveWithdrawalAccount.getShopId());
+ if(null != shop){
+ shop.setReceiverAccountNoEnc(saveWithdrawalAccount.getReceiverAccountNoEnc());
+ shop.setReceiverNameEnc(saveWithdrawalAccount.getReceiverNameEnc());
+ shop.setReceiverAccountType(saveWithdrawalAccount.getReceiverAccountType());
+ shop.setReceiverBankChannelNo(saveWithdrawalAccount.getReceiverBankChannelNo());
+ shopService.updateById(shop);
+ }
+ return R.ok();
+ }
+
/**
* 获取所有门店
@@ -831,6 +855,21 @@
}
return R.fail("请先配置收款账户");
}
+
+
+ @ResponseBody
+ @GetMapping("/verifyAppletConfiguration")
+ @ApiOperation(value = "判断是否有提现账户", tags = {"门店后台-财务管理-提现明细","小程序-个人中心-门店管理-门店钱包"})
+ public R verifyAppletConfiguration(Integer shopId){
+ Shop shop = shopService.getById(shopId);
+ if(StringUtils.hasLength(shop.getReceiverAccountNoEnc())){
+ return R.ok(true);
+ }
+ return R.ok(false);
+ }
+
+
+
@@ -865,14 +904,13 @@
/**
* 获取指定用户的服务商
- * @param userId
* @return
*/
@GetMapping("/getServiceProvider")
- public R<Shop> getServiceProvider(Long userId){
+ public R<Shop> getServiceProvider(@RequestParam("appUserId") Long appUserId){
//向上找获取第一个开店的门店
List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
- AppUser appUser = appUserClient.getAppUserById(userId);
+ AppUser appUser = appUserClient.getAppUserById(appUserId);
//上级集合，防止循环关联
Set<Long> pid = new HashSet<>();
Shop shop = getSuperiorStore(appUser, list, 1, 1, pid);
@@ -900,23 +938,25 @@
}
return getSuperiorStore(appUser1, list, hierarchy, num, pid);
}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
/**
* 获取指定用户的高级服务商
* @return
*/
@GetMapping("/getSuperiorServiceProvider")
- public R<Shop> getSuperiorServiceProvider(Long userId){
+ public R<Shop> getSuperiorServiceProvider(@RequestParam("appUserId") Long appUserId){
//向上找获取第一个开店的门店
List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
- AppUser appUser = appUserClient.getAppUserById(userId);
+ AppUser appUser = appUserClient.getAppUserById(appUserId);
//上级集合，防止循环关联
Set<Long> pid = new HashSet<>();
Shop shop = getSuperiorStore(appUser, list, 2, 1, pid);
--
Gitblit v1.7.1