From 8c83fad498da51773d4aa6a4aa6af13f8e39e27d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:04:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java
index f2daa57..f703879 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java
@@ -42,6 +42,13 @@
private TokenService tokenService;
@Resource
private ShopBalanceStatementMapper shopBalanceStatementMapper;
+
+ @Resource
+ private ShopService shopService;
+
+
+
+
/**
* 门店分佣统计
@@ -69,8 +76,7 @@
}
- @Resource
- private ShopService shopService;
+
@GetMapping("/commissionStatistics/info")
@ApiOperation(value = "门店余额明细上方数据", notes = "门店余额明细", tags = {"门店后台"})
public R<ShopBalanceDto> shopCommissionStatisticsinfo(){
@@ -131,6 +137,16 @@
public R<List<ShopBalanceStatement>> getList(@RequestBody ShopBalanceStatement shopBalanceStatement){
return R.ok(shopBalanceStatementMapper.selectShopBalanceStatementList(shopBalanceStatement));
}
+
+
+ /**
+ * 保存门店余额流水
+ * @param shopBalanceStatement
+ */
+ @PostMapping("/saveShopBalanceStatement")
+ public void saveShopBalanceStatement(@RequestBody ShopBalanceStatement shopBalanceStatement){
+ shopBalanceStatementService.save(shopBalanceStatement);
+ }
}
--
Gitblit v1.7.1