From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 194 ++++++++++++++++++++++++++++++------------------
1 files changed, 122 insertions(+), 72 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 7557675..458a72c 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
@@ -134,7 +134,6 @@
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);
@@ -174,6 +173,7 @@
payOrderVO.setAmount(payOrderVO.getAmount().add(byId.getChangePrice()));
}
}
+ payOrderVO.setAmount(byId.getRealPayAmount());
return R.ok(payOrderVO);
}
@@ -195,24 +195,21 @@
.eq(Order::getOrderFrom, state)
.ne(Order::getPaymentStatus, 3)
.orderByDesc(BaseModel::getCreateTime).list();
- List<Order> list = orderService.lambdaQuery().eq(Order::getGiveUserId, userId).list();
for (Order order : page) {
OrderCourseVO orderCourseVO = new OrderCourseVO();
orderCourseVO.setId(order.getId());
orderCourseVO.setOrderFrom(order.getOrderFrom());
orderCourseVO.setBusinessId(order.getBusinessId());
- if (order.getAppUserId().equals(userId) && order.getGiveUserId() == null){
+ if (order.getAppUserId().equals(userId)){
BeanUtils.copyProperties(order, orderCourseVO);
orderCourseVO.setBusinessId(order.getBusinessId());
res.add(orderCourseVO);
}
- if (order.getGiveUserId()!=null&&order.getGiveUserId().equals(userId)){
+ if (order.getGiveUserId()!=null&&order.getGiveUserId().equals(userId)&&order.getPaymentStatus()==2){
BeanUtils.copyProperties(order, orderCourseVO);
orderCourseVO.setBusinessId(order.getBusinessId());
res.add(orderCourseVO);
-
}
-
}
List<OrderCourseVO> res1 = new ArrayList<>();
for (OrderCourseVO orderCourseVO : res) {
@@ -363,16 +360,12 @@
switch (payType){
case 1:
order.setTotalAmount(data1.getGeneralPrice());
- order.setRealPayAmount(data1.getGeneralPrice());
break;
case 2:
order.setTotalAmount(data1.getIosPrice());
- order.setRealPayAmount(data1.getIosPrice());
break;
}
-
-
break;
case 2:
Course data = remoteCourseService.getCourseById(targetId).getData();
@@ -381,12 +374,10 @@
switch (payType){
case 1:
order.setTotalAmount(data.getGeneralPrice());
- order.setRealPayAmount(data.getGeneralPrice());
break;
case 2:
order.setTotalAmount(data.getIosPrice());
- order.setRealPayAmount(data.getIosPrice());
break;
}
if (receiverId!=null){
@@ -409,14 +400,24 @@
break;
}
- OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, order.getId())
- .eq(OrderPaymentRecord::getPaymentType, 4).one();
- if (one!=null){
- one.setOrderId(order.getId());
- one.setPaymentType(4);
- one.setPayAmount(new BigDecimal("0"));
- one.setPaymentStatus(2);
- orderPaymentRecordService.updateById(one);
+ // 删除原有非余额支付详细记录
+ OrderPaymentRecord two = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, order.getId())
+ .ne(OrderPaymentRecord::getPaymentType, 4).one();
+ if (two!=null){
+ orderPaymentRecordService.removeById(two.getId());
+ }
+ List<OrderPaymentRecord> one = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, order.getId())
+ .eq(OrderPaymentRecord::getPaymentType, 4).list();
+ if (!one.isEmpty()){
+ for (OrderPaymentRecord orderPaymentRecord : one) {
+ orderPaymentRecordService.removeById(orderPaymentRecord);
+ }
+ OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
+ orderPaymentRecord.setOrderId(order.getId());
+ orderPaymentRecord.setPaymentType(4);
+ orderPaymentRecord.setPayAmount(new BigDecimal("0"));
+ orderPaymentRecord.setPaymentStatus(2);
+ orderPaymentRecordService.save(orderPaymentRecord);
}else{
OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
orderPaymentRecord.setOrderId(order.getId());
@@ -425,20 +426,15 @@
orderPaymentRecord.setPaymentStatus(2);
orderPaymentRecordService.save(orderPaymentRecord);
}
- OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
- orderPaymentRecord.setOrderId(order.getId());
- orderPaymentRecord.setPaymentType(4);
- orderPaymentRecord.setPayAmount(order.getTotalAmount());
- orderPaymentRecord.setPaymentStatus(2);
- orderPaymentRecordService.save(orderPaymentRecord);
ClientPlaceOrderVO clientPlaceOrderVO = new ClientPlaceOrderVO();
clientPlaceOrderVO.setId(order.getId());
clientPlaceOrderVO.setOrderNo(order.getBizOrderNo());
+ order.setRealPayAmount(new BigDecimal("0"));
+ order.setPayType(4);
+ orderService.updateById(order);
return R.ok(clientPlaceOrderVO);
}
-
}
-
ClientPlaceOrderVO clientPlaceOrderVO = orderService.placeOrder(targetId, orderFrom, receiverId, orderId,
balanceFlag, payType, amount, vipType,type);
System.err.println("支付返回参数"+clientPlaceOrderVO);
@@ -568,37 +564,93 @@
break;
}
-
- orderService.save(order);
- switch (orderFrom){
- case 2:
- if (receiverId!=null){
- remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getGiveUserId(),order.getId(),1);
- remoteAppUserService.addNotice(receiverId+"",order.getBusinessId()+"",order.getAppUserId()+"",order.getTotalAmount()+"");
- }else{
- // 自己购买
- remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getAppUserId(),order.getId(),2);
- }
- break;
+ Order one = new Order();
+ if (receiverId==null){
+ one = orderService.lambdaQuery().eq(Order::getBusinessId, order.getBusinessId())
+ .eq(Order::getAppUserId,userId)
+ .isNull(Order::getGiveUserId)
+ .eq(Order::getPaymentStatus, 1).one();
+ }else{
+ one = orderService.lambdaQuery().eq(Order::getBusinessId, order.getBusinessId())
+ .eq(Order::getAppUserId,userId)
+ .eq(Order::getGiveUserId,receiverId)
+ .eq(Order::getPaymentStatus, 1).one();
}
- OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
- orderPaymentRecord.setOrderId(order.getId());
- orderPaymentRecord.setPaymentType(4);
- orderPaymentRecord.setPayAmount(order.getTotalAmount());
- orderPaymentRecord.setPaymentStatus(2);
- orderPaymentRecordService.save(orderPaymentRecord);
- // 增加用户余额购买流水记录
- AppUserWalletRecord appUserWalletRecord1 = new AppUserWalletRecord();
- appUserWalletRecord1.setAppUserId(order.getAppUserId());
- appUserWalletRecord1.setChangeType(2);
- appUserWalletRecord1.setReason(order.getBuyContent());
- appUserWalletRecord1.setAmount(order.getRealPayAmount());
- appUserWalletRecord1.setChildAppUserId(order.getAppUserId());
- appUserWalletRecord1.setOrderId(order.getId());
- remoteAppUserService.addBalanceRecord(appUserWalletRecord1);
+
+ if (one!=null){
+ AppUser data = remoteAppUserService.getAppUserById(one.getAppUserId()+"").getData();
+ if (data.getBalance().compareTo(one.getRealPayAmount())<0){
+ return R.fail("余额不足");
+ }
+ one.setPayType(4);
+ one.setPaymentStatus(2);
+ orderService.updateById(one);
+ // 删除原有的支付详细数据
+ List<OrderPaymentRecord> list = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId()).list();
+ for (OrderPaymentRecord orderPaymentRecord : list) {
+ orderPaymentRecordService.removeById(orderPaymentRecord.getId());
+ }
+ OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
+ orderPaymentRecord.setOrderId(one.getId());
+ orderPaymentRecord.setPaymentType(4);
+ orderPaymentRecord.setPayAmount(one.getRealPayAmount());
+ orderPaymentRecord.setPaymentStatus(2);
+ orderPaymentRecordService.save(orderPaymentRecord);
+ // 增加用户余额购买流水记录
+ AppUserWalletRecord appUserWalletRecord1 = new AppUserWalletRecord();
+ appUserWalletRecord1.setAppUserId(one.getAppUserId());
+ appUserWalletRecord1.setChangeType(2);
+ appUserWalletRecord1.setReason(one.getBuyContent());
+ appUserWalletRecord1.setAmount(one.getRealPayAmount());
+ appUserWalletRecord1.setChildAppUserId(one.getAppUserId());
+ appUserWalletRecord1.setOrderId(one.getId());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord1);
+ if (one.getOrderFrom() == 2) {
+ if (receiverId != null) {
+ remoteAppUserService.addAppUserCourse(one.getBusinessId(), one.getGiveUserId(), one.getId(), 1);
+ remoteAppUserService.addNotice(receiverId + "", one.getBusinessId() + "", one.getAppUserId() + "", one.getTotalAmount() + "");
+ } else {
+ // 自己购买
+ remoteAppUserService.addAppUserCourse(one.getBusinessId(), one.getAppUserId(), one.getId(), 2);
+ }
+ }
+ }else{
+ AppUser data = remoteAppUserService.getAppUserById(order.getAppUserId()+"").getData();
+ if (data.getBalance().compareTo(order.getRealPayAmount())<0){
+ return R.fail("余额不足");
+ }
+ orderService.save(order);
+ OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
+ orderPaymentRecord.setOrderId(order.getId());
+ orderPaymentRecord.setPaymentType(4);
+ orderPaymentRecord.setPayAmount(order.getTotalAmount());
+ orderPaymentRecord.setPaymentStatus(2);
+ orderPaymentRecordService.save(orderPaymentRecord);
+ // 增加用户余额购买流水记录
+ AppUserWalletRecord appUserWalletRecord1 = new AppUserWalletRecord();
+ appUserWalletRecord1.setAppUserId(order.getAppUserId());
+ appUserWalletRecord1.setChangeType(2);
+ appUserWalletRecord1.setReason(order.getBuyContent());
+ appUserWalletRecord1.setAmount(order.getRealPayAmount());
+ appUserWalletRecord1.setChildAppUserId(order.getAppUserId());
+ appUserWalletRecord1.setOrderId(order.getId());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord1);
+ if (order.getOrderFrom() == 2) {
+ if (receiverId != null) {
+ remoteAppUserService.addAppUserCourse(order.getBusinessId(), order.getGiveUserId(), order.getId(), 1);
+ remoteAppUserService.addNotice(receiverId + "", order.getBusinessId() + "", order.getAppUserId() + "", order.getTotalAmount() + "");
+ } else {
+ // 自己购买
+ remoteAppUserService.addAppUserCourse(order.getBusinessId(), order.getAppUserId(), order.getId(), 2);
+ }
+ }
+ }
+
+
+
// 判断订单所属用户是否有上级 是否需要做分佣处理
AppUser data = remoteAppUserService.getAppUserById(order.getAppUserId() + "").getData();
- BigDecimal realPayAmount = order.getRealPayAmount();
+
if (data.getInviteUserId()!=null) {
if (order.getOrderFrom() == 1 || order.getOrderFrom() == 2 || order.getOrderFrom() == 3) {
// // 查询实际支付价格 不包含余额抵扣价格
@@ -690,11 +742,9 @@
AppUser data = remoteAppUserService.getAppUserById(one.getAppUserId() + "").getData();
if (one.getGiveUserId()!=null){
remoteAppUserService.addNotice(one.getGiveUserId() + "", one.getBusinessId() + "",
- one.getAppUserId() + "", one.getTotalAmount() + "");
+ one.getAppUserId() + "", realPayAmount + "");
}
-
if (data.getInviteUserId()!=null) {
-
if (one.getOrderFrom() == 1 || one.getOrderFrom() == 2 || one.getOrderFrom() == 3) {
// 查询实际支付价格 不包含余额抵扣价格
OrderPaymentRecord one1 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
@@ -703,8 +753,7 @@
CommissionRule data1 = sysUserClient.getCommission().getData();
if (data1 != null) {
if (data1.getProportion() != null) {
-
- BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
+ BigDecimal bigDecimal = one1.getPayAmount().add(one.getChangePrice()!=null?one.getChangePrice():new BigDecimal("0")).multiply(data1.getProportion()).divide(new BigDecimal("100"))
.setScale(2, BigDecimal.ROUND_DOWN);
// 上级获取的分佣金额
AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
@@ -714,16 +763,18 @@
// appUserById.getBalance().add(bigDecimal))
// .build(), SecurityConstants.INNER);
// 新增分佣流水明细
- AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
- appUserWalletRecord.setAppUserId(data.getInviteUserId());
- appUserWalletRecord.setChangeType(1);
- appUserWalletRecord.setReason("分佣收益");
- appUserWalletRecord.setAmount(bigDecimal);
- appUserWalletRecord.setChildAppUserId(one.getAppUserId());
- appUserWalletRecord.setOrderId(one.getId());
- remoteAppUserService.addBalanceRecord(appUserWalletRecord);
- one.setCommissionAmount(bigDecimal);
- one.setCommissionId(data.getInviteUserId());
+ if (bigDecimal.compareTo(new BigDecimal("0"))>0){
+ AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
+ appUserWalletRecord.setAppUserId(data.getInviteUserId());
+ appUserWalletRecord.setChangeType(1);
+ appUserWalletRecord.setReason("分佣收益");
+ appUserWalletRecord.setAmount(bigDecimal);
+ appUserWalletRecord.setChildAppUserId(one.getAppUserId());
+ appUserWalletRecord.setOrderId(one.getId());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord);
+ one.setCommissionAmount(bigDecimal);
+ one.setCommissionId(data.getInviteUserId());
+ }
orderService.updateById(one);
}
}
@@ -741,7 +792,6 @@
Meditation data1 = remoteMeditationService.getMeditationById(one.getBusinessId()).getData();
appUserWalletRecord.setChangeType(2);
reason = "购买疗愈【"+data1.getMeditationTitle()+"】";
-
break;
case 2:
Course data2 = remoteCourseService.getCourseById(one.getBusinessId()).getData();
--
Gitblit v1.7.1