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/controller/client/ClientOrderController.java | 127 +++++++++++++++++++++++++++---------------
1 files changed, 82 insertions(+), 45 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 24dbb73..5a5e1d1 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
@@ -11,6 +11,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;
@@ -62,7 +63,7 @@
import java.security.interfaces.ECPublicKey;
import java.time.LocalDateTime;
import java.util.*;
-
+import java.util.stream.Collectors;
/**
@@ -93,6 +94,17 @@
private SysUserClient sysUserClient;
@Autowired
private TokenService tokenService;
+
+ @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)
@@ -118,6 +130,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();
@@ -218,11 +237,13 @@
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);
+ orderCourseVO.setCount(b+temp);
if (data4!=null){
orderCourseVO.setCourseTitle(data4.getCourseTitle());
orderCourseVO.setCoverUrl(data4.getCoverUrl());
@@ -232,7 +253,15 @@
break;
}
}
- List<OrderCourseVO> testing = testing(res1.size(), pageCurr, pageSize, res1);
+ List<OrderCourseVO> orderCourseVOS = new ArrayList<>();
+ List<Long> longs1 = new ArrayList<>();
+ for (OrderCourseVO orderCourseVO : res1) {
+ if (!longs1.contains(orderCourseVO.getBusinessId())){
+ longs1.add(orderCourseVO.getBusinessId());
+ orderCourseVOS.add(orderCourseVO);
+ }
+ }
+ List<OrderCourseVO> testing = testing(orderCourseVOS.size(), pageCurr, pageSize, orderCourseVOS);
return R.ok(testing);
}
public static List<OrderCourseVO> testing(long total, long current, long size, List<OrderCourseVO> str){
@@ -287,10 +316,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),
@@ -300,18 +332,22 @@
})
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 {
-
+ 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);
}
@@ -326,11 +362,16 @@
public R refund(@RequestParam(value = "uid") String uid,
@RequestParam(value = "remark") String remark) throws Exception {
Order byId = orderService.getById(uid);
+ String refund = orderService.refund(Long.valueOf(uid));
+ if (refund!=null && (!refund.equals("success"))){
+ return R.fail(refund);
+ }
byId.setRefundStatus(2);
byId.setRefundRemark(remark);
byId.setPaymentStatus(3);
+ byId.setRefundTime(LocalDateTime.now());
orderService.updateById(byId);
- orderService.refund(Long.valueOf(uid));
+
return R.ok();
}
@ResponseBody
@@ -437,6 +478,7 @@
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);
@@ -458,20 +500,6 @@
appUserWalletRecord1.setChildAppUserId(order.getAppUserId());
appUserWalletRecord1.setOrderId(order.getId());
remoteAppUserService.addBalanceRecord(appUserWalletRecord1);
- switch (orderFrom){
- case 1:
-
- break;
- case 2:
-
- if (receiverId!=null){
- remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getGiveUserId(),order.getId(),1);
- }else{
- remoteAppUserService.addAppUserCourse(order.getBusinessId(),userId,order.getId(),1);
- }
- break;
- }
-
// 判断订单所属用户是否有上级 是否需要做分佣处理
AppUser data = remoteAppUserService.getAppUserById(order.getAppUserId() + "").getData();
BigDecimal realPayAmount = order.getRealPayAmount();
@@ -486,7 +514,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();
// // 更新用户余额
@@ -547,7 +575,7 @@
// 支付金额
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);
@@ -556,6 +584,7 @@
.ne(OrderPaymentRecord::getPaymentType, 4).one();
if (one2!=null){
one2.setPaymentStatus(2);
+ one2.setPayOrderNo(string2);
orderPaymentRecordService.updateById(one2);
}
// 实际支付金额
@@ -579,7 +608,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();
// 更新用户余额
@@ -608,18 +637,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){
@@ -631,7 +660,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -642,7 +671,6 @@
}
appUserWalletRecord.setReason(reason);
appUserWalletRecord.setAmount(one1.getPayAmount());
- appUserWalletRecord.setChildAppUserId(one.getAppUserId());
appUserWalletRecord.setOrderId(one.getId());
remoteAppUserService.addBalanceRecord(appUserWalletRecord);
}else{
@@ -691,7 +719,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");
@@ -749,6 +777,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){
@@ -776,7 +805,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();
// 更新用户余额
@@ -811,12 +840,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){
@@ -828,7 +857,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -866,12 +895,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);
@@ -991,22 +1021,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