flowerbackend-v2.git

			@@ -1,6 +1,7 @@
			package com.mzl.flower.mapper.wallet;

			import com.mzl.flower.dto.request.wallet.QueryWalletAmountDTO;
			import com.mzl.flower.dto.response.wallet.WalletWithdrawVO;
			import com.mzl.flower.entity.wallet.WalletDO;
			import com.baomidou.mybatisplus.core.mapper.BaseMapper;
			import org.apache.ibatis.annotations.Param;
			@@ -31,4 +32,11 @@

			BigDecimal getSupplierTotalTransactionAmount(@Param("dto") QueryWalletAmountDTO queryWalletAmountDTO);


			@Select("select sum(t.withdrawable_amount) + sum(t.withdrawing_amount) as supplierPendingAmount, sum(t.withdrawn_amount) as supplierCompleteAmount from t_wallet t")
			WalletWithdrawVO getSumWithdrawTotal();

			//历史变动总金额通过备注
			@Select("select sum(t.change_amount) from t_wallet_bill_record t where t.remark = '历史订单统一提现' and type = 'withdraw' ")
			BigDecimal getSumHistoryWithdrawTotal();
			}

			@@ -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().add(sumHistoryWithdrawTotal));
			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()));

	src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawVO.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/statistics/StatisticsService.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

对比新文件
			@@ -0,0 +1,19 @@
			package com.mzl.flower.dto.response.wallet;

			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import java.math.BigDecimal;

			@Data
			public class WalletWithdrawVO {

			@ApiModelProperty(value = "待提现金额")
			private BigDecimal supplierPendingAmount;


			@ApiModelProperty(value = "已提现金额")
			private BigDecimal supplierCompleteAmount;


			}