From cd2781c1edd9b8b9fd3fd8b6365a65c07adcb109 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 02 一月 2025 16:42:34 +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 | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 617ff88..c84e160 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
@@ -16,6 +16,7 @@
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
+import com.ruoyi.other.vo.SaveWithdrawalAccount;
import com.ruoyi.other.vo.ShopDetailVO;
import com.ruoyi.other.vo.ShopStatistics;
import com.ruoyi.system.api.domain.SysUser;
@@ -116,7 +117,9 @@
@DeleteMapping("/deleteShop")
@ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
- shopService.removeById(id);
+ Shop shop = shopService.getById(id);
+ shop.setDelFlag(1);
+ shopService.updateById(shop);
return R.ok();
}
@@ -298,8 +301,8 @@
*/
@GetMapping("/shopStatistics")
@ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
- public R<ShopStatistics> shopStatistics(@ApiParam("门店名称") String shopName) {
- ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
+ public R<ShopStatistics> shopStatistics(@ApiParam("门店id") Integer shopId) {
+ ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopId);
return R.ok(shopStatistics);
}
@@ -312,5 +315,14 @@
public void updateShop(@RequestBody Shop shop){
shopService.updateById(shop);
}
+
+
+
+ @PostMapping("/saveWithdrawalAccount")
+ @ApiOperation(value = "保存提现账户", tags = {"门店后台-财务统计-提现明细"})
+ public R saveWithdrawalAccount(SaveWithdrawalAccount saveWithdrawalAccount) {
+ shopService.saveWithdrawalAccount(saveWithdrawalAccount);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1