From 5cf8494a6da08dfcdc5fdb4c5e55aefd8b27d684 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 十一月 2024 18:34:28 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java | 258 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 198 insertions(+), 60 deletions(-)
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
index b52f0b0..b92359d 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
@@ -1,11 +1,8 @@
package com.xinquan.order.service.impl;
import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xinquan.common.core.constant.Constants;
import com.xinquan.common.core.constant.SecurityConstants;
-import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.enums.ChargeTypeEnum;
import com.xinquan.common.core.enums.DisabledEnum;
import com.xinquan.common.core.enums.PaymentStatusEnum;
@@ -13,7 +10,6 @@
import com.xinquan.common.core.exception.ServiceException;
import com.xinquan.common.core.utils.ip.IpUtils;
import com.xinquan.common.security.service.TokenService;
-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;
@@ -24,15 +20,19 @@
import com.xinquan.order.mapper.OrderMapper;
import com.xinquan.order.service.OrderPaymentRecordService;
import com.xinquan.order.service.OrderService;
-import com.xinquan.order.utils.JuHeFuUtil;
+import com.xinquan.common.core.utils.JuHeFuUtil;
import com.xinquan.order.utils.OrderUtil;
import com.xinquan.system.api.domain.AppUser;
+import com.xinquan.system.api.domain.AppUserWalletRecord;
import com.xinquan.system.api.model.LoginUser;
import com.xinquan.user.api.domain.dto.AppUserDTO;
import com.xinquan.user.api.feign.RemoteAppUserService;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.time.LocalDateTime;
import java.util.List;
+
+import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +77,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public ClientPlaceOrderVO placeOrder(Long targetId, Integer orderFrom, Long receiverId, Long orderId,
- Integer balanceFlag, Integer payType,BigDecimal amount,Integer vipType) throws Exception {
+ Integer balanceFlag, Integer payType,BigDecimal amount,Integer vipType,Integer type) throws Exception {
// 获取当前登录用户id
LoginUser loginUser = tokenService.getLoginUser();
if (loginUser==null){
@@ -91,6 +91,9 @@
AppUser appUser = getAppUserById(userId);
ClientPlaceOrderVO clientPlaceOrderVO = new ClientPlaceOrderVO();
Order order = new Order();
+ order.setPayType(payType);
+ AppUser data = remoteAppUserService.getAppUserById(userId + "").getData();
+
// 购买冥想音频
if (orderFrom == 1) {
Meditation meditation = remoteMeditationService.getMeditationById(targetId,
@@ -106,41 +109,33 @@
order.setBizOrderNo(orderNo);
order.setBusinessId(meditation.getId());
order.setAppUserId(userId);
- order.setRealPayAmount(meditation.getGeneralPrice());
+ order.setRealPayAmount(type==null?meditation.getGeneralPrice():meditation.getIosPrice());
+ order.setTotalAmount(type==null?meditation.getGeneralPrice():meditation.getIosPrice());
order.setPayType(payType);
order.setBuyContent("购买疗愈【"+meditationTitle+"】");
- order.setTotalAmount(meditation.getGeneralPrice());
order.setGiveUserId(receiverId);
this.save(order);
}else{
order = this.getById(orderId);
- order.setBuyContent("购买疗愈【"+meditationTitle+"】");
+ order.setBuyContent("购买疗愈【"+meditationTitle+"】");
}
Long orderId9 = order.getId();
clientPlaceOrderVO.setOrderNo(orderNo);
clientPlaceOrderVO.setId(orderId9);
+
// 如果冥想音频价格设定为单独收费，且需要使用余额抵扣
- if (balanceFlag.equals(1) && meditation.getChargeType().equals(ChargeTypeEnum.SEPARATE_CHARGE.getCode())) {
+ if (data.getBalance().compareTo(new BigDecimal("0")) > 0 && balanceFlag.equals(1) && meditation.getChargeType().equals(ChargeTypeEnum.SEPARATE_CHARGE.getCode())) {
BigDecimal needPayAmount = handleBalancePayment(appUser,
- meditation.getGeneralPrice(),
+ type==null?meditation.getGeneralPrice():meditation.getIosPrice(),
orderId9);
if (needPayAmount.compareTo(BigDecimal.ZERO) <= 0) {
clientPlaceOrderVO.setZeroFlag(DisabledEnum.YES.getCode());
// 抵扣后金额为0 为余额支付
order.setPayType(4);
- order.setRealPayAmount(meditation.getGeneralPrice());
order.setBuyContent("购买疗愈【"+meditationTitle+"】");
this.updateById(order);
return clientPlaceOrderVO;
- }else{
- // 余额抵扣不完
- OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getPaymentType, 4)
- .eq(OrderPaymentRecord::getOrderId, orderId9).one();
- if (one!=null){
- one.setPayAmount(meditation.getGeneralPrice().subtract(needPayAmount));
- orderPaymentRecordService.updateById(one);
- }
}
if (payType==1){
// 微信+余额
@@ -156,7 +151,7 @@
wxOpenId, orderId9, clientPlaceOrderVO);
} else {
// 创建支付订单
- createPayment(payType, orderNo, meditation.getGeneralPrice(), meditationTitle,
+ createPayment(payType, orderNo, type==null?order.getRealPayAmount():order.getRealPayAmount(), meditationTitle,
detailDescription, wxOpenId, orderId9, clientPlaceOrderVO);
}
}
@@ -174,10 +169,11 @@
order.setBizOrderNo(orderNo);
order.setGiveUserId(receiverId);
order.setBusinessId(course.getId());
+
order.setAppUserId(userId);
order.setBuyContent("购买课程【"+courseTitle+"】");
- order.setRealPayAmount(course.getGeneralPrice());
- order.setTotalAmount(course.getGeneralPrice());
+ order.setRealPayAmount(type==null?course.getGeneralPrice():course.getIosPrice());
+ order.setTotalAmount(type==null?course.getGeneralPrice():course.getIosPrice());
this.save(order);
}else{
order = this.getById(orderId);
@@ -188,28 +184,19 @@
clientPlaceOrderVO.setOrderNo(orderNo);
clientPlaceOrderVO.setId(orderId8);
- if (balanceFlag.equals(1) && course.getChargeType()
+ if (data.getBalance().compareTo(new BigDecimal("0")) > 0 && balanceFlag.equals(1) && course.getChargeType()
.equals(ChargeTypeEnum.SEPARATE_CHARGE.getCode())) {
- BigDecimal needPayAmount = handleBalancePayment(appUser, course.getGeneralPrice(),
+ BigDecimal needPayAmount = handleBalancePayment(appUser, type==null?course.getGeneralPrice():course.getIosPrice(),
orderId8);
if (needPayAmount.compareTo(BigDecimal.ZERO) <= 0) {
clientPlaceOrderVO.setZeroFlag(DisabledEnum.YES.getCode());
// 抵扣后金额为0 为余额支付
order.setPayType(4);
- order.setRealPayAmount(course.getGeneralPrice());
order.setBuyContent("购买课程【"+courseTitle+"】");
this.updateById(order);
return clientPlaceOrderVO;
- }else{
- // 余额抵扣不完
- OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getPaymentType, 4)
- .eq(OrderPaymentRecord::getOrderId, orderId8).one();
- if (one!=null){
- one.setPayAmount(course.getGeneralPrice().subtract(needPayAmount));
- orderPaymentRecordService.updateById(one);
- }
}
if (payType==1){
// 微信+余额
@@ -226,7 +213,7 @@
wxOpenId, orderId8, clientPlaceOrderVO);
} else {
// 创建支付订单
- createPayment(payType, orderNo, course.getGeneralPrice(), courseTitle,
+ createPayment(payType, orderNo, order.getRealPayAmount(), courseTitle,
description, wxOpenId, orderId8, clientPlaceOrderVO);
}
}
@@ -298,21 +285,40 @@
if (appUser.getBalance().compareTo(BigDecimal.ZERO) < 0) {
throw new ServiceException("用户可用余额不足，请重新选择支付方案");
}
- // 更新用户余额
- remoteAppUserService.updateAppUser(
- AppUserDTO.builder().balance(
- appUser.getBalance().subtract(generalPrice))
- .build(), SecurityConstants.INNER);
+ Order one = this.lambdaQuery().eq(Order::getId, orderId).one();
- OrderPaymentRecord balancePaymentRecord = new OrderPaymentRecord();
- balancePaymentRecord.setOrderId(orderId);
- balancePaymentRecord.setPaymentType(PaymentTypeEnum.BALANCE_PAY.getCode());
- balancePaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
- orderPaymentRecordService.save(balancePaymentRecord);
+ // 如果余额大于通用价格 则实际支付价格为0
+ if (appUser.getBalance().compareTo(one.getRealPayAmount())>=0){
+ // 更新用户余额
+// remoteAppUserService.updateAppUser(
+// AppUserDTO.builder().balance(
+// appUser.getBalance().subtract(one.getRealPayAmount()))
+// .build(), SecurityConstants.INNER);
+ OrderPaymentRecord balancePaymentRecord = new OrderPaymentRecord();
+ balancePaymentRecord.setOrderId(orderId);
+ balancePaymentRecord.setPayAmount(one.getRealPayAmount());
+ balancePaymentRecord.setPaymentType(PaymentTypeEnum.BALANCE_PAY.getCode());
+ balancePaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
+ orderPaymentRecordService.save(balancePaymentRecord);
+ return new BigDecimal("0");
+ }else {
+ // 更新用户余额
+// remoteAppUserService.updateAppUser(
+// AppUserDTO.builder().balance(
+// one.getRealPayAmount().subtract(appUser.getBalance()))
+// .build(), SecurityConstants.INNER);
- // 计算除去余额还需支付的金额
- return generalPrice
- .subtract(appUser.getBalance());
+ OrderPaymentRecord balancePaymentRecord = new OrderPaymentRecord();
+ balancePaymentRecord.setOrderId(orderId);
+ balancePaymentRecord.setPaymentType(PaymentTypeEnum.BALANCE_PAY.getCode());
+ balancePaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
+ balancePaymentRecord.setPayAmount(appUser.getBalance());
+ orderPaymentRecordService.save(balancePaymentRecord);
+ // 计算除去余额还需支付的金额
+ return one.getRealPayAmount()
+ .subtract(appUser.getBalance());
+ }
+
}
/**
@@ -348,8 +354,9 @@
JSONObject payInfo = JuHeFuUtil.createPayment1(orderNo, payType,
needPayAmount.toString(), goodsTitle, goodsDesc,
IpUtils.getIpAddr(), wxOpenId,
- // "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback")
- "https://xq.xqzhihui.com/api/order/client/order/order/base/callback");
+ "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"
+// "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"
+ );
// 第三方支付记录
OrderPaymentRecord paymentRecord = new OrderPaymentRecord();
paymentRecord.setOrderId(orderId);
@@ -358,10 +365,11 @@
clientPlaceOrderVO.setPayAmt(payInfo.getString("pay_amt"));
clientPlaceOrderVO.setPath(payInfo.getJSONObject("expend").getString("path"));
clientPlaceOrderVO.setPayInfo(payInfo.getJSONObject("expend").getString("pay_info"));
- clientPlaceOrderVO.setOrgId(payInfo.getJSONObject("expend").getString("org_id"));
- clientPlaceOrderVO.setAppId(payInfo.getJSONObject("expend").getString("app_id"));
+ clientPlaceOrderVO.setOrgId(payInfo.getJSONObject("expend").getString("orgId"));
+ clientPlaceOrderVO.setAppId(payInfo.getJSONObject("expend").getString("appId"));
paymentRecord.setPaymentType(PaymentTypeEnum.WECHAT_PAY.getCode());
paymentRecord.setPayOrderNo(payInfo.getString("id"));
+ clientPlaceOrderVO.setOrderId(payInfo.getString("id"));
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
paymentRecord.setPayAmount(needPayAmount);
orderPaymentRecordService.save(paymentRecord);
@@ -372,19 +380,25 @@
JSONObject payInfo = JuHeFuUtil.createPayment(orderNo, payType,
needPayAmount.toString(), goodsTitle, goodsDesc,
IpUtils.getIpAddr(), wxOpenId,
- // "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback")
- "https://xq.xqzhihui.com/api/order/client/order/order/base/callback");
+ "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"
+// "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"
+
+ );
// 第三方支付记录
OrderPaymentRecord paymentRecord = new OrderPaymentRecord();
paymentRecord.setOrderId(orderId);
paymentRecord.setPayAmount(needPayAmount);
Order byId = this.getById(orderId);
- byId.setPayOrderNo(payInfo.getString("id"));
this.updateById(byId);
- clientPlaceOrderVO.setQrcodeUrl(payInfo.getString("qrcode_url"));
+ JSONObject expend = payInfo.getJSONObject("expend");
+ String string = expend.getString("qrcode_url");
+ clientPlaceOrderVO.setQrcodeUrl(string);
paymentRecord.setPaymentType(PaymentTypeEnum.ALI_PAY.getCode());
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
+ paymentRecord.setPayOrderNo(payInfo.getString("id"));
orderPaymentRecordService.save(paymentRecord);
+ clientPlaceOrderVO.setPayAmt(payInfo.getString("pay_amt"));
+ clientPlaceOrderVO.setOrderId(payInfo.getString("id"));
// 设置订单是否需要支付标识
clientPlaceOrderVO.setZeroFlag(DisabledEnum.NO.getCode());
}
@@ -584,15 +598,139 @@
return order.getId()+"";
}
+
+
@Override
public String refund(Long uid) throws Exception {
Order byId = this.getById(uid);
+ OrderPaymentRecord two = orderPaymentRecordService.lambdaQuery()
+ .eq(OrderPaymentRecord::getPaymentType,4)
+ .eq(OrderPaymentRecord::getOrderId, uid)
+ .one();
+ if (byId.getPayType() == 4){
+ // 纯余额支付 直接退还余额
+ // 回退余额记录
+ AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
+ appUserWalletRecord.setAppUserId(byId.getAppUserId());
+ appUserWalletRecord.setChangeType(1);
+ appUserWalletRecord.setReason("后台退款");
+ appUserWalletRecord.setOrderId(byId.getId());
+ appUserWalletRecord.setAmount(two.getPayAmount());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord);
+ remoteAppUserService.addBalance(byId.getAppUserId(),two.getPayAmount());
+ byId.setRefundStatus(3);
+ byId.setRefundRemark("后台退款");
+ byId.setRefundTime(LocalDateTime.now());
+ byId.setPaymentStatus(3);
+ two.setPaymentStatus(3);
+ this.updateById(byId);
+ orderPaymentRecordService.updateById(two);
+ switch (byId.getOrderFrom()){
+ case 1:
+ // 冥想订单 删除
+ break;
+ case 2:
+ // 删除用户与课程的关系表
+ remoteAppUserService.deleteAppUserCourse(byId.getBusinessId(),byId.getAppUserId());
+ break;
+ case 3:
+ // 会员订单 将用户会员到期时间回退
+ if (byId.getBuyContent().contains("月")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),1);
+ }else if (byId.getBuyContent().contains("季")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),2);
+ }else if (byId.getBuyContent().contains("年")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),3);
+ }
+ break;
+ }
+ return "success";
+ }else if (byId.getPayType() == 5 || byId.getPayType() == 6 || byId.getPayType() == 7){
+ OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery()
+ .eq(OrderPaymentRecord::getOrderId, uid)
+ .ne(OrderPaymentRecord::getPaymentType, 4)
+ .ne(OrderPaymentRecord::getPaymentType, 3)
+ .one();
+ JSONObject refund = JuHeFuUtil.refund(one.getPayOrderNo(), byId.getBizOrderNo());
+ if (refund.getString("error_msg")!=null){
+ return refund.getString("error_msg");
+ }
+ // 回退余额记录
+ AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
+ appUserWalletRecord.setAppUserId(byId.getAppUserId());
+ appUserWalletRecord.setChangeType(1);
+ appUserWalletRecord.setReason("后台退款");
+ appUserWalletRecord.setOrderId(byId.getId());
+ appUserWalletRecord.setAmount(two.getPayAmount());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord);
+ remoteAppUserService.addBalance(byId.getAppUserId(),two.getPayAmount());
+ byId.setRefundStatus(3);
+ byId.setRefundRemark("后台退款");
+ byId.setRefundTime(LocalDateTime.now());
+ byId.setPaymentStatus(3);
+ two.setPaymentStatus(3);
+ this.updateById(byId);
+ orderPaymentRecordService.updateById(two);
+
+ switch (byId.getOrderFrom()){
+ case 1:
+ // 冥想订单 删除
+ break;
+ case 2:
+ // 删除用户与课程的关系表
+ remoteAppUserService.deleteAppUserCourse(byId.getBusinessId(),byId.getAppUserId());
+ break;
+ case 3:
+ // 会员订单 将用户会员到期时间回退
+ if (byId.getBuyContent().contains("月")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),1);
+ }else if (byId.getBuyContent().contains("季")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),2);
+ }else if (byId.getBuyContent().contains("年")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),3);
+ }
+ break;
+ }
+ return "success";
+ }
OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery()
.eq(OrderPaymentRecord::getOrderId, uid)
+ .ne(OrderPaymentRecord::getPaymentType, 4)
.ne(OrderPaymentRecord::getPaymentType, 3)
- .ne(OrderPaymentRecord::getPaymentType, 4).one();
-
- JuHeFuUtil.refund(one.getPayOrderNo(),byId.getBizOrderNo());
- return null;
+ .one();
+ JSONObject refund = JuHeFuUtil.refund(one.getPayOrderNo(), byId.getBizOrderNo());
+ if (refund.getString("error_msg")!=null){
+ return refund.getString("error_msg");
+ }
+ one.setPaymentStatus(3);
+ orderPaymentRecordService.updateById(one);
+ String string = refund.getString("payment_id");
+ if (string!=null){
+ byId.setRefundCode(string);
+ }
+ byId.setRefundTime(LocalDateTime.now());
+ byId.setRefundStatus(3);
+ byId.setRefundRemark("后台退款");
+ this.updateById(byId);
+ switch (byId.getOrderFrom()){
+ case 1:
+ // 冥想订单 删除
+ break;
+ case 2:
+ // 删除用户与课程的关系表
+ remoteAppUserService.deleteAppUserCourse(byId.getBusinessId(),byId.getAppUserId());
+ break;
+ case 3:
+ // 会员订单 将用户会员到期时间回退
+ if (byId.getBuyContent().contains("月")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),1);
+ }else if (byId.getBuyContent().contains("季")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),2);
+ }else if (byId.getBuyContent().contains("年")){
+ remoteAppUserService.subVipExpireTime(byId.getAppUserId(),3);
+ }
+ break;
+ }
+ return "success";
}
}
--
Gitblit v1.7.1