From 3ec572e2cb7adf7d33d2018b24c003d9ef18906a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 13:32:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
index 65268ac..b7d08d6 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
@@ -12,6 +12,8 @@
import com.xinquan.common.security.utils.SecurityUtils;
import com.xinquan.course.api.domain.Course;
import com.xinquan.course.api.feign.RemoteCourseService;
+import com.xinquan.meditation.api.domain.Meditation;
+import com.xinquan.meditation.api.feign.RemoteMeditationService;
import com.xinquan.order.api.domain.Order;
import com.xinquan.order.api.feign.RemoteOrderService;
import com.xinquan.system.api.domain.AppUser;
@@ -63,10 +65,22 @@
private RemoteOrderService remoteOrderService;
@Resource
private RemoteCourseService remoteCourseService;
+ @Resource
+ private RemoteMeditationService remoteMeditationService;
// 用户获得分佣收益 新增一条余额明细记录
@PostMapping("/addBalanceRecord")
public R addBalanceRecord(@RequestBody AppUserWalletRecord appUserWalletRecord) {
appUserWalletRecordService.save(appUserWalletRecord);
+ if(appUserWalletRecord.getReason().contains("分佣")){
+ AppUser byId = appUserService.getById(appUserWalletRecord.getAppUserId());
+ byId.setBalance(byId.getBalance().add(appUserWalletRecord.getAmount()));
+ appUserService.updateById(byId);
+ }
+ if (appUserWalletRecord.getChangeType() == 2){
+ AppUser byId = appUserService.getById(appUserWalletRecord.getAppUserId());
+ byId.setBalance(byId.getBalance().subtract(appUserWalletRecord.getAmount()));
+ appUserService.updateById(byId);
+ }
return R.ok();
}
@@ -86,6 +100,7 @@
appUserWalletRecordLambdaQueryWrapper.eq(AppUser::getInviteUserId, userId);
appUserWalletRecordLambdaQueryWrapper.like(StringUtils.hasLength(dto.getCellPhone()),AppUser::getCellPhone,dto.getCellPhone());
appUserWalletRecordLambdaQueryWrapper.like(StringUtils.hasLength(dto.getNickName()),AppUser::getNickname,dto.getNickName());
+ appUserWalletRecordLambdaQueryWrapper.eq(StringUtils.hasLength(dto.getUserStatus()),AppUser::getUserStatus,dto.getUserStatus());
appUserWalletRecordLambdaQueryWrapper.orderByDesc(BaseModel::getCreateTime);
Page<AppUser> page = appUserService
.page(new Page<>(dto.getPageCurr(), dto.getPageSize()),appUserWalletRecordLambdaQueryWrapper);
@@ -95,9 +110,11 @@
}
for (AppUser record : page.getRecords()) {
// 查询该用户带来收益
- List<AppUserWalletRecord> list = appUserWalletRecordService.lambdaQuery().eq(AppUserWalletRecord::getAppUserId, record.getId())
- .eq(AppUserWalletRecord::getChildAppUserId, record.getUserId()).list();
+ List<AppUserWalletRecord> list = appUserWalletRecordService.lambdaQuery()
+ .eq(AppUserWalletRecord::getAppUserId, userId)
+ .eq(AppUserWalletRecord::getChildAppUserId, record.getId()).list();
BigDecimal bigDecimal = new BigDecimal("0");
+ record.setMoney(new BigDecimal("0"));
for (AppUserWalletRecord appUserWalletRecord : list) {
if (appUserWalletRecord.getAmount()!=null && appUserWalletRecord.getChangeType() == 1){
bigDecimal = bigDecimal.add(appUserWalletRecord.getAmount());
@@ -114,8 +131,8 @@
String endTime = null;
if (org.springframework.util.StringUtils.hasLength(dto.getTime())){
String[] split = dto.getTime().split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
String userId = dto.getUid();
LambdaQueryWrapper<AppUserWalletRecord> appUserWalletRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -128,6 +145,9 @@
if (CollUtils.isEmpty(page.getRecords())){
PageDTO<OrderListVO> empty = PageDTO.empty(page);
return R.ok(empty);
+ }
+ for (AppUserWalletRecord record : page.getRecords()) {
+ record.setId(record.getOrderId());
}
return R.ok(PageDTO.of(page, OrderListVO.class));
}
@@ -182,6 +202,7 @@
if (byId.getReason().equals("提现")){
AppUserWithdraw byId1 = appUserWithdrawService.getById(byId.getOrderId());
orderDetailVO.setType("提现");
+ orderDetailVO.setRemark("银行卡提现");
orderDetailVO.setPayOrderNo(byId1.getSerialNo());
orderDetailVO.setWithdrawType(byId1.getWithdrawType());
orderDetailVO.setAmount(byId1.getAmount());
@@ -193,7 +214,11 @@
orderDetailVO.setType("充值");
orderDetailVO.setPayType(one.getPayType());
orderDetailVO.setPayOrderNo(one.getPayOrderNo());
- orderDetailVO.setRemark(one.getRemark());
+ if (one.getPayType()==1){
+ orderDetailVO.setRemark("微信支付");
+ }else if (one.getPayType()==2){
+ orderDetailVO.setRemark("支付宝支付");
+ }
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setPaymentTime(one.getPaymentTime());
@@ -207,7 +232,7 @@
orderDetailVO.setPaymentTime(byId.getCreateTime());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
- orderDetailVO.setRemark(one.getRemark());
+ orderDetailVO.setRemark("分佣收益");
if (one.getCommissionId()!=null){
AppUser appUserById = appUserService.getById(one.getCommissionId());
orderDetailVO.setUserName(appUserById.getNickname());
@@ -244,7 +269,7 @@
OrderDetailVO orderDetailVO = new OrderDetailVO();
AppUserWalletRecord byId = walletRecordService.getById(id);
if (byId.getOrderId()!=null){
- if (byId.getReason().equals("提现")){
+ if (byId.getReason().contains("提现")){
AppUserWithdraw byId1 = appUserWithdrawService.getById(byId.getOrderId());
orderDetailVO.setType("提现");
orderDetailVO.setPayOrderNo(byId1.getSerialNo());
@@ -254,31 +279,29 @@
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
}else if (byId.getReason().equals("充值")){
Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
- if (byId.getChildAppUserId() == null && one!=null){
orderDetailVO.setType("充值");
orderDetailVO.setPayType(one.getPayType());
- orderDetailVO.setPayOrderNo(one.getPayOrderNo());
+ orderDetailVO.setPayOrderNo(one.getBizOrderNo());
orderDetailVO.setRemark(one.getRemark());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setPaymentTime(one.getPaymentTime());
return R.ok(orderDetailVO);
- }
}else if (byId.getReason().equals("分佣收益")){
Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (byId.getChildAppUserId()!=null && one!=null){
orderDetailVO.setType("分佣");
- orderDetailVO.setPayOrderNo(one.getPayOrderNo());
+ orderDetailVO.setPayOrderNo(one.getBizOrderNo());
orderDetailVO.setPaymentTime(byId.getCreateTime());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setAmount(byId.getAmount());
orderDetailVO.setRemark(one.getRemark());
if (one.getCommissionId()!=null){
- AppUser appUserById = appUserService.getById(one.getCommissionId());
+ AppUser appUserById = appUserService.getById(one.getAppUserId());
orderDetailVO.setUserName(appUserById.getNickname());
orderDetailVO.setAvatar(appUserById.getAvatar());
}
- return R.ok(new OrderDetailVO());
+ return R.ok(orderDetailVO);
}
}else if (byId.getReason().equals("提现回退")){
AppUserWithdraw byId1 = appUserWithdrawService.getById(byId.getOrderId());
@@ -288,17 +311,31 @@
orderDetailVO.setAmount(byId1.getAmount());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(byId1.getUpdateTime());
- return R.ok(new OrderDetailVO());
+ return R.ok(orderDetailVO);
}else if (byId.getReason().contains("课程")){
Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
if (data!=null){
Course data1 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
orderDetailVO.setType("课程购买");
- orderDetailVO.setPayOrderNo(data.getPayOrderNo());
- orderDetailVO.setAmount(data.getRealPayAmount());
+ orderDetailVO.setPayOrderNo(data.getBizOrderNo());
+ orderDetailVO.setAmount(data.getBalance());
orderDetailVO.setChangeType(byId.getChangeType());
orderDetailVO.setPaymentTime(data.getPaymentTime());
}
+ return R.ok(orderDetailVO);
+
+ } else if (byId.getReason().contains("疗愈")) {
+ Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
+ if (data!=null){
+ Meditation data1 = remoteMeditationService.getMeditationById(data.getBusinessId()).getData();
+ orderDetailVO.setType("疗愈购买");
+ orderDetailVO.setPayOrderNo(data.getBizOrderNo());
+ orderDetailVO.setAmount(data.getBalance());
+ orderDetailVO.setChangeType(2);
+ orderDetailVO.setPaymentTime(data.getPaymentTime());
+ }
+ return R.ok(orderDetailVO);
+
}
}
return R.ok(orderDetailVO);
--
Gitblit v1.7.1