From e50954f0708ecbbc672352102ae3b24279d40cc1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 16 四月 2026 20:12:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/impl/RevenueServiceImpl.java | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 87 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RevenueServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RevenueServiceImpl.java
index 441ea60..16e0ab0 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RevenueServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RevenueServiceImpl.java
@@ -11,13 +11,21 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.RevenueMapper;
+import com.doumee.dao.business.WithdrawalOrdersMapper;
+import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.ShopInfoMapper;
import com.doumee.dao.business.model.Revenue;
+import com.doumee.dao.business.model.ShopInfo;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.WithdrawalOrders;
+import com.doumee.dao.vo.RevenueStatisticsVO;
import com.doumee.service.business.RevenueService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -30,6 +38,15 @@
@Autowired
private RevenueMapper revenueMapper;
+
+ @Autowired
+ private WithdrawalOrdersMapper withdrawalOrdersMapper;
+
+ @Autowired
+ private ShopInfoMapper shopInfoMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
@Override
public Integer create(Revenue revenue) {
@@ -148,4 +165,74 @@
return revenueMapper.selectCount(wrapper);
}
+ @Override
+ public RevenueStatisticsVO getShopRevenueStatistics(Integer shopId) {
+ ShopInfo shop = shopInfoMapper.selectById(shopId);
+ if (shop == null || Constants.equalsInteger(shop.getDeleted(), Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "闂ㄥ簵涓嶅瓨鍦�");
+ }
+ Integer memberId = shop.getRegionMemberId();
+ return buildRevenueStatistics(memberId, Constants.TWO, shop.getBalance());
+ }
+
+ @Override
+ public RevenueStatisticsVO getDriverRevenueStatistics(Integer memberId) {
+ Member member = memberMapper.selectById(memberId);
+ if (member == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ return buildRevenueStatistics(memberId, Constants.ONE, member.getAmount());
+ }
+
+ /**
+ * 鏋勫缓鏀剁泭缁熻
+ *
+ * @param memberId 浼氬憳涓婚敭
+ * @param memberType 浼氬憳绫诲瀷锛�1=鍙告満锛�2=闂ㄥ簵
+ * @param balance 褰撳墠浣欓锛堝垎锛�
+ */
+ private RevenueStatisticsVO buildRevenueStatistics(Integer memberId, Integer memberType, Long balance) {
+ RevenueStatisticsVO vo = new RevenueStatisticsVO();
+ vo.setBalance(balance != null ? balance : 0L);
+
+ // 寰呯粨绠楅噾棰濓細revenue涓� vaildStatus=0 涓� type=0锛堝畬鎴愯鍗曪級鐨勬敹鍏ヤ箣鍜�
+ QueryWrapper<Revenue> pendingWrapper = new QueryWrapper<>();
+ pendingWrapper.select("IFNULL(SUM(AMOUNT), 0) as amount")
+ .eq("MEMBER_ID", memberId)
+ .eq("MEMBER_TYPE", memberType)
+ .eq("VAILD_STATUS", Constants.ZERO)
+ .eq("TYPE", Constants.ZERO)
+ .eq("OPT_TYPE", Constants.ONE)
+ .eq("DELETED", Constants.ZERO);
+ Map<String, Object> pendingResult = revenueMapper.selectMaps(pendingWrapper).stream().findFirst().orElse(null);
+ vo.setPendingAmount(pendingResult != null && pendingResult.get("amount") != null
+ ? Long.parseLong(pendingResult.get("amount").toString()) : 0L);
+
+ // 绱鎻愮幇閲戦锛歸ithdrawal_orders涓� status=1锛堟彁鐜版垚鍔燂級涓� type=0锛堟彁鐜帮級
+ QueryWrapper<WithdrawalOrders> successWrapper = new QueryWrapper<>();
+ successWrapper.select("IFNULL(SUM(AMOUNT), 0) as amount")
+ .eq("MEMBER_ID", memberId)
+ .eq("MEMBER_TYPE", memberType)
+ .eq("STATUS", Constants.ONE)
+ .eq("TYPE", Constants.ZERO)
+ .eq("DELETED", Constants.ZERO);
+ Map<String, Object> successResult = withdrawalOrdersMapper.selectMaps(successWrapper).stream().findFirst().orElse(null);
+ vo.setTotalWithdrawn(successResult != null && successResult.get("amount") != null
+ ? Long.parseLong(successResult.get("amount").toString()) : 0L);
+
+ // 鎻愮幇涓噾棰濓細withdrawal_orders涓� status=0锛堟彁鐜扮敵璇蜂腑锛変笖 type=0锛堟彁鐜帮級
+ QueryWrapper<WithdrawalOrders> progressWrapper = new QueryWrapper<>();
+ progressWrapper.select("IFNULL(SUM(AMOUNT), 0) as amount")
+ .eq("MEMBER_ID", memberId)
+ .eq("MEMBER_TYPE", memberType)
+ .eq("STATUS", Constants.ZERO)
+ .eq("TYPE", Constants.ZERO)
+ .eq("DELETED", Constants.ZERO);
+ Map<String, Object> progressResult = withdrawalOrdersMapper.selectMaps(progressWrapper).stream().findFirst().orElse(null);
+ vo.setWithdrawingAmount(progressResult != null && progressResult.get("amount") != null
+ ? Long.parseLong(progressResult.get("amount").toString()) : 0L);
+
+ return vo;
+ }
+
}
--
Gitblit v1.9.3