From 98accdd9c6dd5c20d0b565e4f6ddd382c63b6308 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 16:54:58 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 c5f8073..138fa96 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);
@@ -211,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());
@@ -672,7 +683,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