From 86ce1aaf6819a6d62cfba4233219fa4661aacbff Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 17:49:55 +0800
Subject: [PATCH] bug：测试问题统一修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 320 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 201 insertions(+), 119 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
index 98ae1de..fb1f317 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -1,5 +1,7 @@
package com.dsh.guns.modular.system.controller.code;
import com.dsh.course.feignClient.account.*;
+import com.dsh.course.feignClient.communityWorldCup.Model.WorldCupIncomeVO;
+import com.dsh.course.feignClient.communityWorldCup.WorldCupClient;
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.CompetitionQuery;
import com.dsh.course.feignClient.competition.model.PaymentCompetition;
@@ -24,6 +26,7 @@
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
+import com.dsh.guns.modular.system.util.ResultUtil;
import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import com.sun.org.apache.bcel.internal.generic.NEW;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +39,10 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
@@ -72,69 +78,68 @@
private SiteClient siteClient;
- /**
- * 跳转到充值记录页面
+ /*
+ * 充值记录功能已下线，保留原实现以便后续恢复。
+ *
+ * @RequestMapping("/rechargeRecords")
+ * public String index(Model model) {
+ * List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ * model.addAttribute("list",list);
+ * Integer objectType = UserExt.getUser().getObjectType();
+ * Integer objectId = UserExt.getUser().getObjectId();
+ * model.addAttribute("userType",objectType);
+ * String roleid = UserExt.getUser().getRoleid();
+ * model.addAttribute("objectType",objectType);
+ * return PREFIX + "RechargeRecords.html";
+ * }
+ *
+ * @RequestMapping(value = "/listAll")
+ * @ResponseBody
+ * public List<RechargeRecordsVO> list(String province, String city, String name, String phone, String time, Integer type) {
+ * RechargeRecordsQuery coachQuery = new RechargeRecordsQuery();
+ * Region provinceCode = regionService.getOne(new QueryWrapper<Region>().eq("code", province));
+ * Region cityCode = regionService.getOne(new QueryWrapper<Region>().eq("code", city));
+ * if (provinceCode != null) {
+ * coachQuery.setProvince(provinceCode.getName());
+ * } else {
+ * coachQuery.setProvince(province);
+ * }
+ * if (cityCode != null) {
+ * coachQuery.setCity(cityCode.getName());
+ * } else {
+ * coachQuery.setCity(city);
+ * }
+ * coachQuery.setName(name);
+ * coachQuery.setPhone(phone);
+ * coachQuery.setTime(time);
+ * coachQuery.setType(type);
+ * return financeClient.rechargeList(coachQuery);
+ * }
+ *
+ * @RequestMapping(value = "/getAmount")
+ * @ResponseBody
+ * public BigDecimal getAmount(String province, String city, String name, String phone, String time, Integer type) {
+ * RechargeRecordsQuery coachQuery = new RechargeRecordsQuery();
+ * coachQuery.setProvince(province);
+ * coachQuery.setCity(city);
+ * coachQuery.setName(name);
+ * coachQuery.setPhone(phone);
+ * coachQuery.setTime(time);
+ * coachQuery.setType(type);
+ * List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(coachQuery);
+ * BigDecimal total = new BigDecimal("0.00");
+ * for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
+ * total = total.add(rechargeRecordsVO.getAmount());
+ * }
+ * return total;
+ * }
*/
- @RequestMapping("/rechargeRecords")
- public String index(Model model) {
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("list",list);
- Integer objectType = UserExt.getUser().getObjectType();
- Integer objectId = UserExt.getUser().getObjectId();
- model.addAttribute("userType",objectType);
- String roleid = UserExt.getUser().getRoleid();
- model.addAttribute("objectType",objectType);
- return PREFIX + "RechargeRecords.html";
- }
- /**
- * 获取充值记录
- */
- @RequestMapping(value = "/listAll")
- @ResponseBody
- public List<RechargeRecordsVO> list(String province, String city, String name, String phone,String time,Integer type) {
- RechargeRecordsQuery coachQuery = new RechargeRecordsQuery();
- Region provinceCode = regionService.getOne(new QueryWrapper<Region>().eq("code", province));
- Region cityCode = regionService.getOne(new QueryWrapper<Region>().eq("code", city));
- if (provinceCode!=null){
- coachQuery.setProvince(provinceCode.getName());
- }else{
- coachQuery.setProvince(province);
- }
- if (cityCode!=null){
- coachQuery.setCity(cityCode.getName());
- }else{
- coachQuery.setCity(city);
- }
- coachQuery.setName(name);
- coachQuery.setPhone(phone);
- coachQuery.setTime(time);
- coachQuery.setType(type);
- return financeClient.rechargeList(coachQuery);
- }
-
- /**
- * 获取充值记录
- */
- @RequestMapping(value = "/getAmount")
+ /** 充值记录功能已下线，避免通过历史菜单或直接 URL 继续访问。 */
+ @RequestMapping({"/rechargeRecords", "/listAll", "/getAmount"})
@ResponseBody
- public BigDecimal getAmount(String province, String city, String name, String phone, String time, Integer type) {
- RechargeRecordsQuery coachQuery = new RechargeRecordsQuery();
- coachQuery.setProvince(province);
- coachQuery.setCity(city);
- coachQuery.setName(name);
- coachQuery.setPhone(phone);
- coachQuery.setTime(time);
- coachQuery.setType(type);
- List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(coachQuery);
- BigDecimal total = new BigDecimal("0.00");
- BigDecimal result = new BigDecimal("0.00");
- for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
- BigDecimal amount = rechargeRecordsVO.getAmount();
- total = total.add(amount); // 将新的值赋给total
- result = result.add(amount); // 将新的值赋给result
- }
- return total;
+ public ResultUtil rechargeRecordsUnavailable() {
+ return ResultUtil.error("充值记录功能暂不提供");
}
/**
* 获取报名订单统计数据
@@ -237,12 +242,14 @@
model.addAttribute("roleType",objectType);
return PREFIX + "Income.html";
}
+ @Autowired
+ private WorldCupClient worldCupClient;
/**
* 获取收入管理列表
*/
@RequestMapping(value = "/incomeListAll")
@ResponseBody
- public List<IncomeVO> incomeListAll(String time,Integer incomeType,String userName,String amount) {
+ public List<IncomeVO> incomeListAll(String time,Integer incomeType,String userName,String amount) throws ParseException {
// 充值记录查询query
RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
@@ -260,6 +267,8 @@
IncomeQuery incomeQuery = new IncomeQuery();
// 场地预约记录查询query
SiteBookingQuery siteBookingQuery = new SiteBookingQuery();
+ // 世界杯记录查询query
+ WorldCupQuery worldCupQuery = new WorldCupQuery();
AppUserByNameAndPhoneDTO appUserByNameAndPhoneDTO = new AppUserByNameAndPhoneDTO();
appUserByNameAndPhoneDTO.setUserName(userName);
if (userName!=null){
@@ -272,6 +281,7 @@
query.setUserIds(collect);
incomeQuery.setUserIds(collect);
siteBookingQuery.setUserIds(collect);
+ worldCupQuery.setUserIds(collect);
}
}
if (amount==null || amount.equals("")){
@@ -280,21 +290,36 @@
rechargeRecordsQuery.setAmount(null);
competitionQuery.setAmount(null);
incomeQuery.setAmount(null);
+ worldCupQuery.setAmount(null);
}else {
siteBookingQuery.setAmount(new BigDecimal(amount));
query.setAmount(new BigDecimal(amount));
rechargeRecordsQuery.setAmount(new BigDecimal(amount));
competitionQuery.setAmount(new BigDecimal(amount));
incomeQuery.setAmount(new BigDecimal(amount));
+ worldCupQuery.setAmount(new BigDecimal(amount));
}
+
if (UserExt.getUser().getObjectType()==2){
// 拿到门店集合id
List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
.eq("operatorId", UserExt.getUser().getObjectId())).stream()
.map(TStore::getId).collect(Collectors.toList());
+ if (operatorId.isEmpty()){
+ operatorId.add(0);
+ }
query.setStoresIds(operatorId);
competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
+
siteBookingQuery.setStoreIds(operatorId);
+ }
+ if (UserExt.getUser().getObjectType()==3){
+ // 拿到门店集合id
+ List<Integer> integers = new ArrayList<>();
+ integers.add(UserExt.getUser().getObjectId());
+ siteBookingQuery.setStoreIds(integers);
+ query.setStoresIds(integers);
+ competitionQuery.setStoreId(UserExt.getUser().getObjectId());
}
siteBookingQuery.setTime(time);
@@ -302,10 +327,9 @@
rechargeRecordsQuery.setTime(time);
competitionQuery.setTime(time);
incomeQuery.setTime(time);
+ worldCupQuery.setTime(time);
Integer roleType = UserExt.getUser().getObjectType();
- IncomeVO incomeVO = new IncomeVO();
List<IncomeVO> incomeVOS = new ArrayList<>();
-
if ( incomeType==null || incomeType == 1){
// 会员支付记录
List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
@@ -315,7 +339,8 @@
}
TAppUser tAppUser = appUserClient.queryById(vipPayment.getAppUserId());
IncomeVO temp = new IncomeVO();
- temp.setId(vipPayment.getId());
+ temp.setId(vipPayment.getId().toString());
+ temp.setAppUserId(vipPayment.getAppUserId());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -329,7 +354,7 @@
temp.setStoreName("");
temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
temp.setIncomeType(1);
- temp.setState(vipPayment.getState());
+ temp.setState(2);
temp.setInsertTime(vipPayment.getInsertTime());
if (UserExt.getUser().getObjectType()!=1){
break;
@@ -346,7 +371,8 @@
}
TAppUser tAppUser = appUserClient.queryById(rechargeRecordsVO.getAppUserId());
IncomeVO temp = new IncomeVO();
- temp.setId(rechargeRecordsVO.getId().intValue());
+ temp.setId(rechargeRecordsVO.getId().toString());
+ temp.setAppUserId(rechargeRecordsVO.getAppUserId());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -363,7 +389,7 @@
temp.setAmount(rechargeRecordsVO.getAmount());
}
temp.setIncomeType(2);
- temp.setState(rechargeRecordsVO.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
@@ -377,7 +403,8 @@
}
TAppUser tAppUser = appUserClient.queryById(registerOrderVO.getAppUserId());
IncomeVO temp = new IncomeVO();
- temp.setId(registerOrderVO.getId().intValue());
+ temp.setId(registerOrderVO.getId().toString());
+ temp.setAppUserId(registerOrderVO.getAppUserId());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -396,11 +423,13 @@
temp.setAmount(registerOrderVO.getMoney());
}
temp.setIncomeType(3);
- temp.setState(registerOrderVO.getPayStatus());
+
+ temp.setState(2);
+
incomeVOS.add(temp);
}
}
- if(roleType !=3) {
+
if (incomeType == null || incomeType == 4) {
// 报名活动
List<PaymentCompetition> competitions = competitionClient.listAllPayment(competitionQuery);
@@ -414,8 +443,9 @@
if(null == competition1){
continue;
}
- if (!competition1.getStoreId().equals("")){
- String[] split = competition1.getStoreId().split(",");
+ String competitionStoreIds = resolveCompetitionStoreIds(competition, competition1);
+ if (ToolUtil.isNotEmpty(competitionStoreIds)){
+ String[] split = competitionStoreIds.split(",");
List<Integer> list = new ArrayList<>();
for (String s : split) {
list.add(Integer.valueOf(s));
@@ -430,7 +460,8 @@
temp.setStoreName(substring);
}
- temp.setId(competition.getId().intValue());
+ temp.setId(competition.getId().toString());
+ temp.setAppUserId(competition.getAppUserId());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -446,25 +477,26 @@
temp.setAmount(new BigDecimal(competition.getAmount().toString()));
}
temp.setIncomeType(4);
- temp.setState(competition.getPayStatus());
+
+ temp.setState(2);
+
incomeVOS.add(temp);
}
}
- }
+
if (incomeType == null || incomeType == 5) {
// 预约场地
List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
for (SiteBooking siteBooking : siteBookings) {
IncomeVO temp = new IncomeVO();
- if (siteBooking.getStatus() == 0 || siteBooking.getStatus() == 5 || siteBooking.getStatus() == 4) {
- temp.setState(1);
- } else {
+
temp.setState(2);
- }
+
TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
Store store = storeClient.getStoreById(siteBooking.getStoreId());
- temp.setId(siteBooking.getId());
+ temp.setId(siteBooking.getId().toString());
+ temp.setAppUserId(siteBooking.getAppUserId());
temp.setProvince(siteBooking.getProvince());
temp.setCity(siteBooking.getCity());
temp.setStoreName(store.getName());
@@ -487,6 +519,30 @@
incomeVOS.add(temp);
}
}
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ if (roleType == 1 && (incomeType == null || incomeType == 6)){
+ List<WorldCupIncomeVO> worldCupIncome = worldCupClient.getWorldCupIncome(worldCupQuery);
+ for (WorldCupIncomeVO worldCupIncomeVO : worldCupIncome) {
+ IncomeVO temp = new IncomeVO();
+ temp.setId(worldCupIncomeVO.getId());
+ temp.setProvince(worldCupIncomeVO.getProvince());
+ temp.setCity(worldCupIncomeVO.getCity());
+ temp.setStoreName(worldCupIncomeVO.getStoreName());
+ temp.setPayUser(worldCupIncomeVO.getUserName());
+ temp.setPhone(worldCupIncomeVO.getPhone());
+ temp.setAmount(new BigDecimal(worldCupIncomeVO.getAmount()));
+ temp.setIncomeType(6);
+ temp.setState(2);
+ temp.setInsertTime(simpleDateFormat.parse(worldCupIncomeVO.getPayTime()));
+ incomeVOS.add(temp);
+ }
+ }
+ // 推荐：一行代码解决
+ incomeVOS.sort(Comparator.comparing(
+ IncomeVO::getInsertTime,
+ Comparator.nullsLast(Comparator.reverseOrder())
+ ));
return incomeVOS;
}
@@ -495,7 +551,7 @@
*/
@RequestMapping(value = "/getIncomeData")
@ResponseBody
- public Object getIncomeData(String time,Integer incomeType,String userName,String amount) {
+ public Object getIncomeData(String time,Integer incomeType,String userName,String amount) throws ParseException {
// 充值记录查询query
RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
// 报名课程查询query
@@ -510,6 +566,8 @@
IncomeQuery incomeQuery = new IncomeQuery();
// 场地预约记录查询query
SiteBookingQuery siteBookingQuery = new SiteBookingQuery();
+ // 世界杯查询query
+ WorldCupQuery worldCupQuery = new WorldCupQuery();
AppUserByNameAndPhoneDTO appUserByNameAndPhoneDTO = new AppUserByNameAndPhoneDTO();
appUserByNameAndPhoneDTO.setUserName(userName);
if (userName!=null){
@@ -522,6 +580,7 @@
query.setUserIds(collect);
incomeQuery.setUserIds(collect);
siteBookingQuery.setUserIds(collect);
+ worldCupQuery.setUserIds(collect);
}
}
if (amount==null || amount.equals("")){
@@ -530,12 +589,14 @@
rechargeRecordsQuery.setAmount(null);
competitionQuery.setAmount(null);
incomeQuery.setAmount(null);
+ worldCupQuery.setAmount(null);
}else {
siteBookingQuery.setAmount(new BigDecimal(amount));
query.setAmount(new BigDecimal(amount));
rechargeRecordsQuery.setAmount(new BigDecimal(amount));
competitionQuery.setAmount(new BigDecimal(amount));
incomeQuery.setAmount(new BigDecimal(amount));
+ worldCupQuery.setAmount(new BigDecimal(amount));
}
if (UserExt.getUser().getObjectType()==2){
// 拿到门店集合id
@@ -546,16 +607,22 @@
competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
siteBookingQuery.setStoreIds(operatorId);
}
-
+ if (UserExt.getUser().getObjectType()==3){
+ // 拿到门店集合id
+ List<Integer> integers = new ArrayList<>();
+ integers.add(UserExt.getUser().getObjectId());
+ siteBookingQuery.setStoreIds(integers);
+ query.setStoresIds(integers);
+ competitionQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
siteBookingQuery.setTime(time);
query.setRegisterTime(time);
rechargeRecordsQuery.setTime(time);
competitionQuery.setTime(time);
incomeQuery.setTime(time);
+ worldCupQuery.setTime(time);
Integer roleType = UserExt.getUser().getObjectType();
- IncomeVO incomeVO = new IncomeVO();
List<IncomeVO> incomeVOS = new ArrayList<>();
-
if ( incomeType==null || incomeType == 1){
// 会员支付记录
List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
@@ -565,7 +632,7 @@
}
TAppUser tAppUser = appUserClient.queryById(vipPayment.getAppUserId());
IncomeVO temp = new IncomeVO();
- temp.setId(vipPayment.getId());
+ temp.setId(vipPayment.getId().toString());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -579,7 +646,7 @@
temp.setStoreName("");
temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
temp.setIncomeType(1);
- temp.setState(vipPayment.getState());
+ temp.setState(2);
temp.setInsertTime(vipPayment.getInsertTime());
if (UserExt.getUser().getObjectType()!=1){
break;
@@ -596,7 +663,7 @@
}
TAppUser tAppUser = appUserClient.queryById(rechargeRecordsVO.getAppUserId());
IncomeVO temp = new IncomeVO();
- temp.setId(rechargeRecordsVO.getId().intValue());
+ temp.setId(rechargeRecordsVO.getId().toString());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -613,8 +680,7 @@
temp.setAmount(rechargeRecordsVO.getAmount());
}
temp.setIncomeType(2);
- temp.setState(rechargeRecordsVO.getPayStatus());
-
+ temp.setState(2);
incomeVOS.add(temp);
}
}
@@ -627,12 +693,10 @@
}
TAppUser tAppUser = appUserClient.queryById(registerOrderVO.getAppUserId());
IncomeVO temp = new IncomeVO();
- temp.setId(registerOrderVO.getId().intValue());
- if (registerOrderVO.getPayStatus()==2) {
- temp.setState(2);
- } else {
- temp.setState(1);
- }
+ temp.setId(registerOrderVO.getId().toString());
+
+ temp.setState(2);
+
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -651,11 +715,10 @@
temp.setAmount(registerOrderVO.getMoney());
}
temp.setIncomeType(3);
- temp.setState(registerOrderVO.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
}
- if(roleType !=3) {
if (incomeType == null || incomeType == 4) {
// 报名活动
List<PaymentCompetition> competitions = competitionClient.listAllPayment(competitionQuery);
@@ -669,8 +732,9 @@
if(null == competition1){
continue;
}
- if (!competition1.getStoreId().equals("")){
- String[] split = competition1.getStoreId().split(",");
+ String competitionStoreIds = resolveCompetitionStoreIds(competition, competition1);
+ if (ToolUtil.isNotEmpty(competitionStoreIds)){
+ String[] split = competitionStoreIds.split(",");
List<Integer> list = new ArrayList<>();
for (String s : split) {
list.add(Integer.valueOf(s));
@@ -685,12 +749,10 @@
temp.setStoreName(substring);
}
- if (competition.getPayStatus()==2) {
+
temp.setState(2);
- } else {
- temp.setState(1);
- }
- temp.setId(competition.getId().intValue());
+
+ temp.setId(competition.getId().toString());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -706,25 +768,20 @@
temp.setAmount(new BigDecimal(competition.getAmount().toString()));
}
temp.setIncomeType(4);
- temp.setState(competition.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
}
- }
if (incomeType == null || incomeType == 5) {
// 预约场地
List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
for (SiteBooking siteBooking : siteBookings) {
IncomeVO temp = new IncomeVO();
- if (siteBooking.getStatus() == 0 || siteBooking.getStatus() == 5 || siteBooking.getStatus() == 4) {
- temp.setState(1);
- } else {
- temp.setState(2);
- }
+ temp.setState(2);
TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
Store store = storeClient.getStoreById(siteBooking.getStoreId());
- temp.setId(siteBooking.getId());
+ temp.setId(siteBooking.getId().toString());
temp.setProvince(siteBooking.getProvince());
temp.setCity(siteBooking.getCity());
temp.setStoreName(store.getName());
@@ -747,9 +804,25 @@
incomeVOS.add(temp);
}
}
-
- BigDecimal totalAmount = BigDecimal.ZERO; // 初始化累加变量为0
-
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (roleType == 1 && (incomeType == null || incomeType == 6)){
+ List<WorldCupIncomeVO> worldCupIncome = worldCupClient.getWorldCupIncome(worldCupQuery);
+ for (WorldCupIncomeVO worldCupIncomeVO : worldCupIncome) {
+ IncomeVO temp = new IncomeVO();
+ temp.setId(worldCupIncomeVO.getId());
+ temp.setProvince(worldCupIncomeVO.getProvince());
+ temp.setCity(worldCupIncomeVO.getCity());
+ temp.setStoreName(worldCupIncomeVO.getStoreName());
+ temp.setPayUser(worldCupIncomeVO.getUserName());
+ temp.setPhone(worldCupIncomeVO.getPhone());
+ temp.setAmount(new BigDecimal(worldCupIncomeVO.getAmount()));
+ temp.setIncomeType(6);
+ temp.setState(2);
+ temp.setInsertTime(simpleDateFormat.parse(worldCupIncomeVO.getPayTime()));
+ incomeVOS.add(temp);
+ }
+ }
+ BigDecimal totalAmount = BigDecimal.ZERO; // 初始化累加变量为0
for (IncomeVO vo : incomeVOS) {
if (vo.getAmount() == null ){
BigDecimal temp = BigDecimal.ZERO;
@@ -832,10 +905,19 @@
return coursePackagePaymentClient.listAllRegister(query);
}
+ /**
+ * 获取收入记录对应的门店归属；新订单使用下单快照，兼容未回填的历史订单。
+ *
+ * @param paymentCompetition 活动支付记录
+ * @param competition 活动当前信息
+ * @return 逗号分隔的门店 ID 列表
+ */
+ private String resolveCompetitionStoreIds(PaymentCompetition paymentCompetition, Competition competition) {
+ if (ToolUtil.isNotEmpty(paymentCompetition.getCompetitionStoreIds())) {
+ return paymentCompetition.getCompetitionStoreIds();
+ }
+ return competition.getStoreId();
+ }
}
-
-
-
-
--
Gitblit v1.7.1