From 4dfc81531cba8e10ea569559389cdcbd50f4bacd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 十一月 2024 19:24:52 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 100 insertions(+), 3 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 5a5e1d1..e67f753 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
@@ -223,8 +223,9 @@
orderCourseVO.setCourseTitle(data1.getMeditationTitle());
orderCourseVO.setDescription(data1.getCoverDescription());
orderCourseVO.setCoverUrl(data1.getCoverUrl());
- orderCourseVO.setGeneralPrice(data1.getGeneralPrice());
- orderCourseVO.setIosPrice(data1.getIosPrice());
+ Order byId = orderService.getById(orderCourseVO.getId());
+ orderCourseVO.setGeneralPrice(byId.getRealPayAmount());
+ orderCourseVO.setIosPrice(byId.getRealPayAmount());
orderCourseVO.setCount(data1.getRealLearnedNum()+data1.getVirtualLearnedNum());
orderCourseVO.setChargeType(data1.getChargeType());
orderCourseVO.setCoverDescription(data1.getCoverDescription());
@@ -243,6 +244,9 @@
Long data9 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
b+=data9;
}
+ Order byId1 = orderService.getById(orderCourseVO.getId());
+ orderCourseVO.setGeneralPrice(byId1.getRealPayAmount());
+ orderCourseVO.setIosPrice(byId1.getRealPayAmount());
orderCourseVO.setCount(b+temp);
if (data4!=null){
orderCourseVO.setCourseTitle(data4.getCourseTitle());
@@ -342,7 +346,99 @@
@RequestParam(value = "vipType", required = false) Integer vipType)
{
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
try {
+ if (orderId!=null){
+ Order order = orderService.getById(orderId);
+ if (order.getRealPayAmount().compareTo(new BigDecimal("0")) == 0 ){
+ // 无需付款
+ switch (orderFrom){
+ case 1:
+ Meditation data1 = remoteMeditationService.getMeditationById(targetId).getData();
+ order.setBuyContent("购买疗愈【"+data1.getMeditationTitle()+"】");
+ 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();
+
+ order.setBuyContent("购买课程【"+data.getCourseTitle()+"】");
+ 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){
+ remoteAppUserService.addNotice(receiverId + "", data.getId() + "",
+ userId + "", order.getTotalAmount() + "");
+ }
+
+ break;
+ }
+ orderService.updateById(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;
+ }
+
+ 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);
+ }else{
+ OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
+ orderPaymentRecord.setOrderId(order.getId());
+ orderPaymentRecord.setPaymentType(4);
+ orderPaymentRecord.setPayAmount(new BigDecimal("0"));
+ 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());
+ return R.ok(clientPlaceOrderVO);
+ }
+
+ }
+
ClientPlaceOrderVO clientPlaceOrderVO = orderService.placeOrder(targetId, orderFrom, receiverId, orderId,
balanceFlag, payType, amount, vipType,type);
System.err.println("支付返回参数"+clientPlaceOrderVO);
@@ -581,7 +677,8 @@
one.setPaymentStatus(2);
one.setPaymentTime(LocalDateTime.now());
OrderPaymentRecord one2 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
- .ne(OrderPaymentRecord::getPaymentType, 4).one();
+ .ne(OrderPaymentRecord::getPaymentType, 4)
+ .eq(OrderPaymentRecord::getPayOrderNo,string2).one();
if (one2!=null){
one2.setPaymentStatus(2);
one2.setPayOrderNo(string2);
--
Gitblit v1.7.1