From 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 26 十二月 2024 17:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/statistics/StatisticsService.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
index 92767a5..73d0c99 100644
--- a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
+++ b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
@@ -14,6 +14,7 @@
import com.mzl.flower.dto.response.statistics.OrderStatisticsDTO;
import com.mzl.flower.dto.response.statistics.RateStatisticsDTO;
import com.mzl.flower.dto.response.statistics.SaleStatisticsDTO;
+import com.mzl.flower.dto.response.wallet.WalletWithdrawVO;
import com.mzl.flower.entity.customer.Customer;
import com.mzl.flower.entity.ip.UserAccess;
import com.mzl.flower.entity.payment.Order;
@@ -23,6 +24,7 @@
import com.mzl.flower.mapper.ip.UserAccessMapper;
import com.mzl.flower.mapper.payment.*;
import com.mzl.flower.mapper.supplier.SupplierMapper;
+import com.mzl.flower.mapper.wallet.WalletMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.utils.IpUtil;
import io.micrometer.core.instrument.util.StringUtils;
@@ -65,6 +67,9 @@
@Autowired
private UserAccessMapper userAccessMapper;
+
+ @Autowired
+ private WalletMapper walletMapper;
public SaleStatisticsDTO getSaleStatistics(String date){
if(StringUtils.isEmpty(date)){
@@ -167,8 +172,13 @@
dto.setTotalSaleAmount(a);
dto.setTotalSaleFlowerCount(c == null ? 0 : c.longValue());
- dto.setSupplierPendingAmount(new BigDecimal(0));//TODO 供应商待提现：结算列表待结算（供应商）+供应商钱包余额
- dto.setSupplierCompleteAmount(new BigDecimal(0));//TODO 供应商已提现：结算列表已结算（供应商）+供应商钱包已提现金额
+ WalletWithdrawVO withdrawTotal = walletMapper.getSumWithdrawTotal();
+ BigDecimal sumHistoryWithdrawTotal = walletMapper.getSumHistoryWithdrawTotal();
+ dto.setSupplierPendingAmount(withdrawTotal.getSupplierPendingAmount());
+ dto.setSupplierCompleteAmount(withdrawTotal.getSupplierCompleteAmount().add(sumHistoryWithdrawTotal));
+
+// dto.setSupplierPendingAmount(new BigDecimal(0));//TODO 供应商待提现：结算列表待结算（供应商）+供应商钱包余额
+// dto.setSupplierCompleteAmount(new BigDecimal(0));//TODO 供应商已提现：结算列表已结算（供应商）+供应商钱包已提现金额
return dto;
}
@@ -372,7 +382,7 @@
sq = new OrderItemSalesQueryDTO();
sq.setStatusList(statusList);
sq.setSalesStartDate(begin);
- sq.setSalesStartDate(end);
+ sq.setSalesEndDate(end);
orderItemSalesMapper.selectItemSalesList(page, sq);
dto.setCountToday(page.getTotal());
@@ -380,7 +390,7 @@
sq = new OrderItemSalesQueryDTO();
sq.setStatusList(statusList);
sq.setSalesStartDate(beginY);
- sq.setSalesStartDate(endY);
+ sq.setSalesEndDate(endY);
orderItemSalesMapper.selectItemSalesList(page, sq);
dto.setCountRate(getRate(dto.getCountToday().intValue(), (int)page.getTotal()));
--
Gitblit v1.9.3