From 73372f312e8b8bae98623006640b016f9a433988 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 15:12:49 +0800
Subject: [PATCH] 10.16
---
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
index a3e5662..86b0cec 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -4,16 +4,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.account.entity.CoachType;
import com.dsh.account.entity.RechargeRecords;
+import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.VipPayment;
import com.dsh.account.model.IncomeQuery;
import com.dsh.account.model.query.RechargeRecordsQuery;
import com.dsh.account.model.query.coachQuery.CoachQuery;
import com.dsh.account.model.vo.CoachSerchVO;
import com.dsh.account.model.vo.RechargeRecordsVO;
-import com.dsh.account.service.CoachService;
-import com.dsh.account.service.CoachTypeService;
-import com.dsh.account.service.IVipPaymentService;
-import com.dsh.account.service.RechargeRecordsService;
+import com.dsh.account.service.*;
+import net.bytebuddy.asm.Advice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -31,6 +30,8 @@
private RechargeRecordsService rechargeRecordsService;
@Autowired
private IVipPaymentService vipPaymentService;
+ @Autowired
+ private TAppUserService appUserService;
/**
@@ -42,6 +43,20 @@
return rechargeRecordsService.rechargeList(query);
}
/**
+ * 数据统计-充值记录列表数据
+ */
+ @ResponseBody
+ @RequestMapping("/finance/rechargeList1")
+ public List<RechargeRecords> rechargeList1(@RequestBody RechargeRecordsQuery query){
+ List<RechargeRecords> payStatus = rechargeRecordsService.list(new QueryWrapper<RechargeRecords>().eq("payStatus", 2));
+ for (RechargeRecords list : payStatus) {
+ TAppUser byId = appUserService.getById(list.getAppUserId());
+ Integer addUserId = byId.getAddUserId();
+
+ }
+ return payStatus;
+ }
+ /**
* 加入会员列表数据
*/
@ResponseBody
--
Gitblit v1.7.1