From bbc55de9bb0f6e5d3d8267c628d25780c19ebf36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 08 二月 2025 17:20:06 +0800
Subject: [PATCH] 冥想2.0新增代码
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 677 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 587 insertions(+), 90 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 3d61e14..8dfb209 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
@@ -1,6 +1,8 @@
package com.xinquan.order.controller.client;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONObject;
import com.auth0.jwt.JWT;
import com.auth0.jwt.algorithms.Algorithm;
@@ -11,6 +13,7 @@
import com.sun.corba.se.spi.ior.IdentifiableFactory;
import com.xinquan.common.core.constant.SecurityConstants;
import com.xinquan.common.core.domain.R;
+import com.xinquan.common.core.utils.JuHeFuUtil;
import com.xinquan.common.core.utils.page.BeanUtils;
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
@@ -30,6 +33,7 @@
import com.xinquan.order.service.OrderPaymentRecordService;
import com.xinquan.order.service.OrderService;
import com.xinquan.course.api.domain.OrderCourseVO;
+import com.xinquan.order.utils.IosVerifyUtil;
import com.xinquan.order.utils.OrderUtil;
import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.AppUserCourse;
@@ -51,6 +55,8 @@
import javax.annotation.Resource;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
@@ -93,6 +99,17 @@
private SysUserClient sysUserClient;
@Autowired
private TokenService tokenService;
+ private static final String certificateUrl = "https://buy.itunes.apple.com/verifyReceipt";
+ @ResponseBody
+ @PostMapping("/queryPayment")
+ @ApiOperation(value = "查询订单支付状态", tags = "查询订单支付状态")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", required = true),
+ })
+ public R<String> queryPayment(@RequestParam(value = "orderId") String orderId) throws Exception {
+ JSONObject jsonObject = JuHeFuUtil.queryPayment(orderId);
+ return R.ok(jsonObject.getString("status"));
+ }
@GetMapping("/getMeditationIsBuy/{id}/{meditationId}")
public R<Integer> getMeditationIsBuy(@PathVariable("id")Long id,@PathVariable("meditationId")Long meditationId) {
List<Order> list = orderService.lambdaQuery().eq(Order::getBusinessId, meditationId)
@@ -101,7 +118,7 @@
.eq(Order::getPaymentStatus, 2)
.ne(Order::getRefundStatus, 3).list();
if (list.isEmpty()){
- return R.ok(0);
+ return R.ok(2);
}else{
return R.ok(1);
}
@@ -122,7 +139,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);
@@ -162,6 +178,7 @@
payOrderVO.setAmount(payOrderVO.getAmount().add(byId.getChangePrice()));
}
}
+ payOrderVO.setAmount(byId.getRealPayAmount());
return R.ok(payOrderVO);
}
@@ -183,24 +200,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) {
@@ -211,8 +225,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());
@@ -225,11 +240,16 @@
Course data4 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
List<CourseChapter> data2 = remoteCourseService.getChapterByCourseId(orderCourseVO.getBusinessId() + "").getData();
int temp = 0 ;
+ int b = 0 ;
for (CourseChapter courseChapter : data2) {
temp+=courseChapter.getVirtualLearnedNum();
+ Long data9 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data9;
}
- Integer data3 = remoteCourseService.getCountByCourseId(orderCourseVO.getBusinessId() + "").getData();
- orderCourseVO.setCount(data3+temp);
+ 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());
orderCourseVO.setCoverUrl(data4.getCoverUrl());
@@ -302,10 +322,13 @@
* @return 下单返回数据视图对象
* @see com.xinquan.order.domain.vo.ClientPlaceOrderVO
*/
+
@PostMapping("/placeOrder")
@ApiOperation(value = "创建支付订单", notes = "微信|支付宝")
@ApiImplicitParams({
@ApiImplicitParam(name = "targetId", value = "目标id 订单类型为会员和充值时不传", dataType = "Long", required = false),
+ @ApiImplicitParam(name = "type", value = "类型 用于判断苹果支付还是安卓支付", 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),
@@ -315,18 +338,113 @@
})
public R<ClientPlaceOrderVO> placeOrder(
@RequestParam(value = "targetId", required = false) Long targetId,
+ @RequestParam(value = "type", required = false) Integer type,
+ @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,
@RequestParam(value = "payType") Integer payType,
@RequestParam(value = "amount", required = false) BigDecimal amount,
@RequestParam(value = "vipType", required = false) Integer vipType)
- {
- try {
+ {
+ 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());
+
+ break;
+ case 2:
+ order.setTotalAmount(data1.getIosPrice());
+ break;
+ }
+ break;
+ case 2:
+ Course data = remoteCourseService.getCourseById(targetId).getData();
+
+ order.setBuyContent("购买课程【"+data.getCourseTitle()+"】");
+ switch (payType){
+ case 1:
+ order.setTotalAmount(data.getGeneralPrice());
+
+ break;
+ case 2:
+ order.setTotalAmount(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 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());
+ orderPaymentRecord.setPaymentType(4);
+ orderPaymentRecord.setPayAmount(new BigDecimal("0"));
+ 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);
return R.ok(
- orderService.placeOrder(targetId, orderFrom, receiverId,
- balanceFlag, payType,amount,vipType));
+ clientPlaceOrderVO);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -341,13 +459,128 @@
public R refund(@RequestParam(value = "uid") String uid,
@RequestParam(value = "remark") String remark) throws Exception {
Order byId = orderService.getById(uid);
- byId.setRefundStatus(2);
+ String refund = orderService.refund(Long.valueOf(uid));
+ if (refund!=null && (!refund.equals("success"))){
+ return R.fail(refund);
+ }
+ byId.setRefundStatus(3);
byId.setRefundRemark(remark);
byId.setPaymentStatus(3);
+ byId.setRefundTime(LocalDateTime.now());
orderService.updateById(byId);
- orderService.refund(Long.valueOf(uid));
+
return R.ok();
}
+ /**
+ * 处理苹果退款 回调通知
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/refundApple")
+ public void refundApple(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ System.err.println("请求"+request);
+ BufferedReader reader = request.getReader();
+ String string1 = reader.toString();
+ System.err.println("请求reader"+string1);
+ StringBuilder requestBody = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ requestBody.append(line);
+ }
+ System.err.println("全部请求体"+requestBody);
+ org.json.JSONObject jsonObject1 = new org.json.JSONObject(requestBody.toString());
+ System.err.println("json串"+jsonObject1);
+ String o = jsonObject1.getString("signedPayload");
+ com.alibaba.fastjson.JSONObject payload = verifyAndGet(o);
+ String notificationType = payload.get("notificationType").toString();
+
+ com.alibaba.fastjson.JSONObject data = payload.getJSONObject("data");
+ String signedTransactionInfo = data.get("signedTransactionInfo").toString();
+ com.alibaba.fastjson.JSONObject transactionInfo = verifyAndGet(signedTransactionInfo);
+ System.err.println("解签后的json串"+transactionInfo);
+ System.err.println("data"+data);
+ // 苹果流水号
+ String string = transactionInfo.getString("originalTransactionId");
+ OrderPaymentRecord one = orderPaymentRecordService.getOne(new QueryWrapper<OrderPaymentRecord>()
+ .eq("pay_order_no", string)
+ .eq("payment_type", 3));
+ Order order = orderService.getById(one.getOrderId());
+
+ if (one!=null && one.getPaymentStatus() == 2){
+ one.setPaymentStatus(3);
+
+ switch (order.getOrderFrom()){
+ case 1:
+ // 冥想订单 删除
+ break;
+ case 2:
+ // 删除用户与课程的关系表
+ remoteAppUserService.deleteAppUserCourse(order.getBusinessId(),order.getAppUserId());
+ break;
+ case 3:
+ // 会员订单 将用户会员到期时间回退
+ if (order.getBuyContent().contains("月")){
+ remoteAppUserService.subVipExpireTime(order.getAppUserId(),1);
+ }else if (order.getBuyContent().contains("季")){
+ remoteAppUserService.subVipExpireTime(order.getAppUserId(),2);
+ }else if (order.getBuyContent().contains("年")){
+ remoteAppUserService.subVipExpireTime(order.getAppUserId(),3);
+ }
+ break;
+ }
+ // 内购+余额支付 需要退回余额 并删除余额支付记录
+ if (order.getPayType() == 7){
+ // 查询余额支付
+ OrderPaymentRecord two = orderPaymentRecordService.getOne(new QueryWrapper<OrderPaymentRecord>()
+ .eq("order_id", order.getId())
+ .eq("payment_type", 4)
+ .eq("payment_status", 2)
+ );
+ two.setPaymentStatus(3);
+ orderPaymentRecordService.updateById(two);
+ AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
+ appUserWalletRecord.setAppUserId(order.getAppUserId());
+ appUserWalletRecord.setChangeType(1);
+ appUserWalletRecord.setReason("后台退款");
+ appUserWalletRecord.setOrderId(order.getId());
+ appUserWalletRecord.setAmount(two.getPayAmount());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord);
+ remoteAppUserService.addBalance(order.getAppUserId(),two.getPayAmount());
+ }
+ order.setRefundStatus(3);
+ order.setRefundRemark("后台退款");
+ order.setRefundTime(LocalDateTime.now());
+ order.setPaymentStatus(3);
+ order.setCancelTime(LocalDateTime.now());
+ orderPaymentRecordService.updateById(one);
+ orderService.updateById(order);
+ }
+ System.err.println("苹果流水号"+string);
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ private static final TrustManager myX509TrustManager = new X509TrustManager() {
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ }
+
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ }
+ };
+
@ResponseBody
@PostMapping("/placeOrderApple")
@ApiOperation(value = "苹果支付", notes = "苹果支付")
@@ -358,6 +591,7 @@
@ApiImplicitParam(name = "balanceFlag", value = "是否使用余额抵扣 1=是 2=否", dataType = "Integer", required = false),
@ApiImplicitParam(name = "amount", value = "购买会员的金额/充值金额", dataType = "BigDecimal", required = false),
@ApiImplicitParam(name = "transactionIdentifier", value = "苹果订单id"),
+ @ApiImplicitParam(name = "originTransactionIdentifier", value = "原苹果订单id"),
@ApiImplicitParam(name = "vipType", value = "订单类型为会员时 必传 会员类型 1月度 2季度 3年度", dataType = "Integer", required = false),
})
public R placeOrderApple(
@@ -367,12 +601,213 @@
@RequestParam(value = "balanceFlag", required = false) Integer balanceFlag,
@RequestParam(value = "amount", required = false) BigDecimal amount,
@RequestParam(value = "vipType", required = false) Integer vipType,
- @RequestParam(value = "transactionIdentifier")String transactionIdentifier)
+ @RequestParam(value = "transactionIdentifier")String transactionIdentifier,
+ @RequestParam(value = "originTransactionIdentifier", required = false)String originTransactionIdentifier,
+ @RequestParam(value = "receipt", required = false)String receipt
+ )
throws Exception {
-
+ System.err.println("普通:"+transactionIdentifier);
+ System.err.println("原:"+originTransactionIdentifier);
+ System.err.println("receipt:"+receipt);
return R.ok(orderService.placeOrderApple(targetId, orderFrom, receiverId,
- balanceFlag,amount,vipType,transactionIdentifier));
+ balanceFlag,amount,vipType,transactionIdentifier,originTransactionIdentifier,receipt));
+ }
+ @ResponseBody
+ @PostMapping("/queryPlaceOrderApple")
+ @ApiOperation(value = "查询苹果支付结果", notes = "查询苹果支付结果")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "transactionId", value = "苹果流水号", dataType = "Long", required = false),
+ @ApiImplicitParam(name = "receipt", value = "支付凭证", dataType = "Integer", required = true),
+ })
+ public R queryPlaceOrderApple(
+ @RequestParam(value = "transactionId") String transactionId,
+ @RequestParam(value = "receipt") String receipt) {
+ System.err.println("手动查询苹果流水号"+transactionId);
+ String verifyResult = IosVerifyUtil.buyAppVerify(receipt, 1);
+ //苹果服务器没有返回验证结果
+ if (verifyResult == null) {
+ return R.fail("未查询到订单信息");
+ }
+ // 苹果验证有返回结果
+ System.err.println("线上，苹果平台返回JSON:" + verifyResult);
+ JSON job = JSONUtil.parse(verifyResult);
+ String states = job.getByPath("status").toString();
+ //0 正常
+ //21000 App Store不能读取你提供的JSON对象
+ //21002 receipt-data域的数据有问题
+ //21003 receipt无法通过验证
+ //21004 提供的shared secret不匹配你账号中的shared secret
+ //21005 receipt服务器当前不可用
+ //21006 receipt合法，但是订阅已过期。服务器接收到这个状态码时，receipt数据仍然会解码并一起发送
+ //21007 receipt是Sandbox receipt，但却发送至生产系统的验证服务
+ //21008 receipt是生产receipt，但却发送至Sandbox环境的验证服务
+ if ("21007".equals(states)) { //是沙盒环境，应沙盒测试，否则执行下面
+ //2.再沙盒测试 发送平台验证
+ verifyResult = IosVerifyUtil.buyAppVerify(receipt, 0);
+ System.err.println("沙盒环境，苹果平台返回JSON:" + verifyResult);
+
+ job = JSONUtil.parse(verifyResult);
+ states = job.getByPath("status").toString();
+ }
+ System.err.println("苹果平台返回值：job" + job);
+ if (states.equals("0")) { // 前端所提供的收据是有效的 验证成功
+ JSON inAppJson = JSONUtil.parse(JSONUtil.getByPath(job, "receipt.in_app"));
+ List<JSON> jsons = JSONUtil.toList(inAppJson.toString(), JSON.class);
+ System.err.println("支付订单列表"+jsons);
+ //所有支付成功的订单号
+ List<String> transaction_id =
+ jsons.stream().map(t -> t.getByPath("transaction_id").toString())
+ .distinct().collect(Collectors.toList());
+ if(transaction_id.contains(transactionId)){
+ OrderPaymentRecord two = orderPaymentRecordService.lambdaQuery()
+ .eq(OrderPaymentRecord::getPayOrderNo, transactionId).ne(OrderPaymentRecord::getPaymentStatus, 2).one();
+ if (two != null) {
+ Order one = orderService.getById(two.getOrderId());
+ if (one.getPaymentStatus() == 2) {
+ return R.ok("当前订单已完成支付");
+ }
+ 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) {
+ one2.setPaymentStatus(2);
+ orderPaymentRecordService.updateById(one2);
+ }
+ // 实际支付金额
+ BigDecimal realPayAmount = one.getRealPayAmount();
+ // 判断订单所属用户是否有上级 是否需要做分佣处理
+ AppUser data9 = remoteAppUserService.getAppUserById(one.getAppUserId() + "").getData();
+ if (one.getGiveUserId() != null) {
+ remoteAppUserService.addNotice(one.getGiveUserId() + "", one.getBusinessId() + "",
+ one.getAppUserId() + "", one.getTotalAmount() + "");
+ }
+
+ if (data9.getInviteUserId() != null) {
+
+ if (one.getOrderFrom() == 1 || one.getOrderFrom() == 2 || one.getOrderFrom() == 3) {
+ // 查询实际支付价格 不包含余额抵扣价格
+ OrderPaymentRecord one1 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
+ .ne(OrderPaymentRecord::getPaymentType, 4).one();
+ // 分佣给上级 先远程查询分佣比例
+ CommissionRule data1 = sysUserClient.getCommission().getData();
+ if (data1 != null) {
+ if (data1.getProportion() != null) {
+
+ BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
+ .setScale(2, BigDecimal.ROUND_DOWN);
+ // 上级获取的分佣金额
+ AppUser appUserById = remoteAppUserService.getAppUserById(data9.getInviteUserId() + "").getData();
+ // 更新用户余额
+// remoteAppUserService.updateAppUser(
+// AppUserDTO.builder().balance(
+// appUserById.getBalance().add(bigDecimal))
+// .build(), SecurityConstants.INNER);
+ // 新增分佣流水明细
+ AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
+ appUserWalletRecord.setAppUserId(data9.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(data9.getInviteUserId());
+ orderService.updateById(one);
+ }
+ }
+ }
+ }
+ if (one.getPayType() == 4 || one.getPayType() == 5 || one.getPayType() == 6 || one.getPayType() == 7) {
+ // 涉及到余额支付 新增一条余额支付记录
+ OrderPaymentRecord one1 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
+ .eq(OrderPaymentRecord::getPaymentType, 4).one();
+ AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
+ appUserWalletRecord.setAppUserId(data9.getInviteUserId());
+ String reason = null;
+ switch (one.getOrderFrom()) {
+ case 1:
+ Meditation data1 = remoteMeditationService.getMeditationById(one.getBusinessId()).getData();
+ appUserWalletRecord.setChangeType(2);
+ reason = "购买疗愈【" + data1.getMeditationTitle() + "】";
+
+ break;
+ case 2:
+ Course data2 = remoteCourseService.getCourseById(one.getBusinessId()).getData();
+ reason = "购买课程【" + data2.getCourseTitle() + "】";
+ appUserWalletRecord.setChangeType(2);
+ // 增加用户与课程的关系表
+ if (one.getGiveUserId() != null) {
+ remoteAppUserService.addAppUserCourse(one.getBusinessId(), one.getGiveUserId(), one.getId(), 1);
+ } else {
+ // 自己购买
+ remoteAppUserService.addAppUserCourse(one.getBusinessId(), one.getAppUserId(), one.getId(), 2);
+ }
+ break;
+ case 3:
+ // 会员
+ reason = "购买会员【" + one.getBuyContent() + "】";
+ appUserWalletRecord.setChangeType(2);
+ break;
+ case 4:
+ // 充值
+ reason = "充值";
+ appUserWalletRecord.setChangeType(1);
+ break;
+ }
+ appUserWalletRecord.setReason(reason);
+ appUserWalletRecord.setAmount(one1.getPayAmount());
+ appUserWalletRecord.setChildAppUserId(one.getAppUserId());
+ appUserWalletRecord.setOrderId(one.getId());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord);
+ } else {
+ switch (one.getOrderFrom()) {
+ case 2:
+ Course data2 = remoteCourseService.getCourseById(one.getBusinessId()).getData();
+ // 增加用户与课程的关系表
+ if (one.getGiveUserId() != null) {
+ remoteAppUserService.addAppUserCourse(one.getBusinessId(), one.getGiveUserId(), one.getId(), 1);
+ } else {
+ // 自己购买
+ remoteAppUserService.addAppUserCourse(one.getBusinessId(), one.getAppUserId(), one.getId(), 2);
+ }
+ break;
+ case 3:
+ // 会员
+ if (one.getBuyContent().contains("月")) {
+
+ remoteAppUserService.addVipExpireTime(one.getAppUserId(), 1);
+ } else if (one.getBuyContent().contains("季")) {
+ remoteAppUserService.addVipExpireTime(one.getAppUserId(), 2);
+ } else if (one.getBuyContent().contains("年")) {
+ remoteAppUserService.addVipExpireTime(one.getAppUserId(), 3);
+ }
+ break;
+ case 4:
+ 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.getTotalAmount());
+ appUserWalletRecord.setChildAppUserId(one.getAppUserId());
+ appUserWalletRecord.setOrderId(one.getId());
+ remoteAppUserService.addBalanceRecord(appUserWalletRecord);
+ break;
+ }
+ }
+ }
+ return R.ok("支付成功");
+ }else{
+ return R.fail("未查询到订单信息");
+ }
+ } else {
+ return R.fail("支付凭证receipt无效");
+ }
}
@ResponseBody
@PostMapping("/gvieCourse")
@@ -446,37 +881,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) {
// // 查询实际支付价格 不包含余额抵扣价格
@@ -488,7 +979,7 @@
// if (data1.getProportion() != null) {
//
// BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
-// .setScale(2, BigDecimal.ROUND_HALF_DOWN);
+// .setScale(2, BigDecimal.ROUND_DOWN);
// // 上级获取的分佣金额
// AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
// // 更新用户余额
@@ -549,17 +1040,17 @@
// 支付金额
String string3 = jsonObject1.getString("pay_fee");
Order one = orderService.lambdaQuery().eq(Order::getBizOrderNo, string).one();
- if (one.getPaymentStatus()==2){
+ if (one.getPaymentStatus()!=1){
return;
}
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);
- // 扣除用户余额
- Object data = remoteAppUserService.deleteBalance(one.getAppUserId() + "", one2.getPayAmount() + "").getData();
+ one2.setPayOrderNo(string2);
orderPaymentRecordService.updateById(one2);
}
// 实际支付金额
@@ -568,11 +1059,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())
@@ -581,9 +1070,8 @@
CommissionRule data1 = sysUserClient.getCommission().getData();
if (data1 != null) {
if (data1.getProportion() != null) {
-
- BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
- .setScale(2, BigDecimal.ROUND_HALF_DOWN);
+ 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();
// 更新用户余额
@@ -592,16 +1080,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);
}
}
@@ -612,18 +1102,17 @@
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){
@@ -635,7 +1124,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -646,7 +1135,6 @@
}
appUserWalletRecord.setReason(reason);
appUserWalletRecord.setAmount(one1.getPayAmount());
- appUserWalletRecord.setChildAppUserId(one.getAppUserId());
appUserWalletRecord.setOrderId(one.getId());
remoteAppUserService.addBalanceRecord(appUserWalletRecord);
}else{
@@ -695,7 +1183,7 @@
e.printStackTrace();
}
}
- private static final String AES_KEY = "cb0a181ac97395c6942be19315fc0727";
+ private static final String AES_KEY = "6d548eb01bad44bbbb4a23743e733103";
public static String decrypt(String strToDecrypt) {
try {
SecretKeySpec secretKey = new SecretKeySpec(AES_KEY.getBytes(), "AES");
@@ -753,6 +1241,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){
@@ -780,7 +1269,7 @@
if (data1.getProportion() != null) {
BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
- .setScale(2, BigDecimal.ROUND_HALF_DOWN);
+ .setScale(2, BigDecimal.ROUND_DOWN);
// 上级获取的分佣金额
AppUser appUserById = remoteAppUserService.getAppUserById(data9.getInviteUserId() + "").getData();
// 更新用户余额
@@ -815,12 +1304,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){
@@ -832,7 +1321,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -870,12 +1359,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);
@@ -995,22 +1485,29 @@
OrderPaymentRecord two = orderPaymentRecordService.lambdaQuery()
.eq(OrderPaymentRecord::getOrderId, orderId)
.ne(OrderPaymentRecord::getPaymentType, 4)
- .eq(OrderPaymentRecord::getPaymentStatus, 2).one();
+ .ne(OrderPaymentRecord::getPaymentStatus, 1).one();
+ OrderPaymentRecord three = orderPaymentRecordService.lambdaQuery()
+ .eq(OrderPaymentRecord::getOrderId, orderId)
+ .eq(OrderPaymentRecord::getPaymentType, 4)
+ .ne(OrderPaymentRecord::getPaymentStatus, 1).one();
if (two==null){
one.setRemark("余额支付");
one.setBalance(one.getTotalAmount());
}else{
- switch (two.getPaymentType()){
- case 1:
- one.setRemark("微信支付");
+ switch (one.getPayType()){
+ case 5:
+ one.setRemark("微信支付+余额");
break;
- case 2:
- one.setRemark("支付宝支付");
+ case 6:
+ one.setRemark("支付宝支付+余额");
break;
- case 3:
- one.setRemark("苹果内购");
+ case 7:
+ one.setRemark("苹果内购+余额");
}
one.setPayOrderNo(two.getPayOrderNo());
+ if (three!=null){
+ one.setBalance(three.getPayAmount());
+ }
}
if (one.getCommissionId()!=null){
switch (one.getOrderFrom()){
--
Gitblit v1.7.1