From 353cf91d3679e68d9b8c07652e4f7791d606dbd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 15:14:39 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
index a40c758..f26ac42 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
@@ -118,6 +118,13 @@
if (byId==null){
return R.fail("订单失效");
}
+ if (byId.getGiveUserId()!=null){
+ AppUser data1 = remoteAppUserService.getAppUserById(byId.getGiveUserId() + "").getData();
+ payOrderVO.setPhone(data1.getCellPhone());
+ }
+
+ AppUser data1 = remoteAppUserService.getAppUserById(byId.getAppUserId() + "").getData();
+ payOrderVO.setBalance(data1.getBalance());
payOrderVO.setOrderId(id);
if (byId.getOrderFrom()==1){
Meditation data = remoteMeditationService.getMeditationById(byId.getBusinessId()).getData();
@@ -299,6 +306,7 @@
@ApiOperation(value = "创建支付订单", notes = "微信|支付宝")
@ApiImplicitParams({
@ApiImplicitParam(name = "targetId", value = "目标id 订单类型为会员和充值时不传", dataType = "Long", required = false),
+ @ApiImplicitParam(name = "orderId", value = "订单id 待支付时传", dataType = "Long", required = false),
@ApiImplicitParam(name = "orderFrom", value = "订单来源 1=冥想音频 2=课程 3=购买会员 4充值", dataType = "Integer", required = true),
@ApiImplicitParam(name = "receiverId", value = "被赠送课程APP用户id", dataType = "Long", required = false),
@ApiImplicitParam(name = "balanceFlag", value = "是否使用余额抵扣 1=是 2=否", dataType = "Integer", required = false),
@@ -308,6 +316,7 @@
})
public R<ClientPlaceOrderVO> placeOrder(
@RequestParam(value = "targetId", required = false) Long targetId,
+ @RequestParam(value = "orderId", required = false) Long orderId,
@RequestParam(value = "orderFrom") Integer orderFrom,
@RequestParam(value = "receiverId", required = false) Long receiverId,
@RequestParam(value = "balanceFlag", required = false) Integer balanceFlag,
@@ -318,7 +327,7 @@
try {
return R.ok(
- orderService.placeOrder(targetId, orderFrom, receiverId,
+ orderService.placeOrder(targetId, orderFrom, receiverId,orderId,
balanceFlag, payType,amount,vipType));
} catch (Exception e) {
throw new RuntimeException(e);
@@ -551,6 +560,8 @@
.ne(OrderPaymentRecord::getPaymentType, 4).one();
if (one2!=null){
one2.setPaymentStatus(2);
+ // 扣除用户余额
+ Object data = remoteAppUserService.deleteBalance(one.getAppUserId() + "", one2.getPayAmount() + "").getData();
orderPaymentRecordService.updateById(one2);
}
// 实际支付金额
@@ -603,18 +614,18 @@
OrderPaymentRecord one1 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
.eq(OrderPaymentRecord::getPaymentType, 4).one();
AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
- appUserWalletRecord.setAppUserId(data.getInviteUserId());
+ appUserWalletRecord.setAppUserId(one.getAppUserId());
String reason=null;
switch (one.getOrderFrom()){
case 1:
Meditation data1 = remoteMeditationService.getMeditationById(one.getBusinessId()).getData();
appUserWalletRecord.setChangeType(2);
- reason = "购买【"+data1.getMeditationTitle()+"】";
+ reason = "购买疗愈【"+data1.getMeditationTitle()+"】";
break;
case 2:
Course data2 = remoteCourseService.getCourseById(one.getBusinessId()).getData();
- reason = "购买【"+data2.getCourseTitle()+"】";
+ reason = "购买课程【"+data2.getCourseTitle()+"】";
appUserWalletRecord.setChangeType(2);
// 增加用户与课程的关系表
if (one.getGiveUserId()!=null){
@@ -626,7 +637,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -637,7 +648,6 @@
}
appUserWalletRecord.setReason(reason);
appUserWalletRecord.setAmount(one1.getPayAmount());
- appUserWalletRecord.setChildAppUserId(one.getAppUserId());
appUserWalletRecord.setOrderId(one.getId());
remoteAppUserService.addBalanceRecord(appUserWalletRecord);
}else{
@@ -744,6 +754,7 @@
}
one.setPaymentStatus(2);
one.setPaymentTime(LocalDateTime.now());
+ orderService.updateById(one);
OrderPaymentRecord one2 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
.ne(OrderPaymentRecord::getPaymentType, 4).one();
if (one2!=null){
@@ -806,12 +817,12 @@
case 1:
Meditation data1 = remoteMeditationService.getMeditationById(one.getBusinessId()).getData();
appUserWalletRecord.setChangeType(2);
- reason = "购买【"+data1.getMeditationTitle()+"】";
+ reason = "购买疗愈【"+data1.getMeditationTitle()+"】";
break;
case 2:
Course data2 = remoteCourseService.getCourseById(one.getBusinessId()).getData();
- reason = "购买【"+data2.getCourseTitle()+"】";
+ reason = "购买课程【"+data2.getCourseTitle()+"】";
appUserWalletRecord.setChangeType(2);
// 增加用户与课程的关系表
if (one.getGiveUserId()!=null){
@@ -823,7 +834,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -861,12 +872,13 @@
}
break;
case 4:
- remoteAppUserService.addBalance(one.getAppUserId(),one.getRealPayAmount());
+ System.err.println("进入充值");
+ remoteAppUserService.addBalance(one.getAppUserId(),one.getTotalAmount());
AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
appUserWalletRecord.setAppUserId(one.getAppUserId());
appUserWalletRecord.setChangeType(1);
appUserWalletRecord.setReason("充值");
- appUserWalletRecord.setAmount(one.getRealPayAmount());
+ appUserWalletRecord.setAmount(one.getTotalAmount());
appUserWalletRecord.setChildAppUserId(one.getAppUserId());
appUserWalletRecord.setOrderId(one.getId());
remoteAppUserService.addBalanceRecord(appUserWalletRecord);
--
Gitblit v1.7.1