From 210828d1a6947596fe00ab30fcd8725c6714dde4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 02 一月 2025 21:04:16 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 6167079..c0d33fb 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
@@ -9,6 +9,7 @@
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.dto.ShopBalanceDto;
+import com.ruoyi.other.mapper.ShopBalanceStatementMapper;
import com.ruoyi.other.service.ShopBalanceStatementService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.ShopCommissionStatisticsVO;
@@ -41,6 +42,13 @@
private TokenService tokenService;
@Resource
private ShopBalanceStatementMapper shopBalanceStatementMapper;
+
+ @Resource
+ private ShopService shopService;
+
+
+
+
/**
* 门店分佣统计
@@ -68,15 +76,14 @@
}
- @Resource
- private ShopService shopService;
+
@GetMapping("/commissionStatistics/info")
@ApiOperation(value = "门店余额明细上方数据", notes = "门店余额明细", tags = {"门店后台"})
public R<ShopBalanceDto> shopCommissionStatisticsinfo(){
Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
ShopBalanceDto dto = new ShopBalanceDto();
List<ShopBalanceStatement> list = shopBalanceStatementService.lambdaQuery().eq(ShopBalanceStatement::getShopId,objectId).eq(ShopBalanceStatement::getType, 3).list();
- List<ShopBalanceStatement> list1 = shopBalanceStatementService.lambdaQuery().eq(ShopBalanceStatement::getShopId,objectId).eq(ShopBalanceStatement::getType, 4).list();
+ List<ShopBalanceStatement> list1 = shopBalanceStatementService.lambdaQuery().eq(ShopBalanceStatement::getShopId,objectId).eq(ShopBalanceStatement::getType, 1).list();
BigDecimal bigDecimal1 = new BigDecimal(0);
for (ShopBalanceStatement shopBalanceStatement : list) {
bigDecimal1 = bigDecimal1.add(shopBalanceStatement.getVariableAmount());
@@ -130,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