From 185f5dc7c3c49f565da51cd9c2f7750f30990d4a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 13:28:29 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 147 +++++++++++++++++++++++++++++++++---------------
1 files changed, 101 insertions(+), 46 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 850c99f..1a32c50 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
@@ -96,6 +96,7 @@
@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)
+ .eq(Order::getAppUserId, id)
.eq(Order::getOrderFrom, 1)
.eq(Order::getPaymentStatus, 2)
.ne(Order::getRefundStatus, 3).list();
@@ -168,16 +169,25 @@
if (loginUser==null){
return R.tokenError("登录失效");
}
- Page<Order> page = orderService.lambdaQuery()
- .eq(Order::getAppUserId, userId)
+ List<OrderCourseVO> res = new ArrayList<>();
+ List<Order> page = orderService.lambdaQuery()
.eq(Order::getOrderFrom, state)
.ne(Order::getPaymentStatus, 3)
- .orderByDesc(BaseModel::getCreateTime).page(new Page<>(pageCurr, pageSize));
-
- PageDTO<OrderCourseVO> res = PageDTO.of(page, OrderCourseVO.class);
- List<OrderCourseVO> list = res.getList();
- ArrayList<OrderCourseVO> orderCourseVOS = new ArrayList<>();
- for (OrderCourseVO orderCourseVO : res.getList()) {
+ .orderByDesc(BaseModel::getCreateTime).list();
+ List<Order> list = orderService.lambdaQuery().eq(Order::getGiveUserId, userId).list();
+ for (Order order : page) {
+ if (order.getAppUserId().equals(userId) && order.getGiveUserId() == null){
+ OrderCourseVO orderCourseVO = new OrderCourseVO();
+ BeanUtils.copyProperties(order, orderCourseVO);
+ res.add(orderCourseVO);
+ }
+ if (order.getGiveUserId()!=null&&order.getGiveUserId().equals(userId)){
+ OrderCourseVO orderCourseVO = new OrderCourseVO();
+ BeanUtils.copyProperties(order, orderCourseVO);
+ res.add(orderCourseVO);
+ }
+ }
+ for (OrderCourseVO orderCourseVO : res) {
switch (orderCourseVO.getOrderFrom()){
case 1:
Meditation data1 = remoteMeditationService.getMeditationById(orderCourseVO.getBusinessId()).getData();
@@ -189,6 +199,7 @@
orderCourseVO.setIosPrice(data1.getIosPrice());
orderCourseVO.setCount(data1.getRealLearnedNum()+data1.getVirtualLearnedNum());
orderCourseVO.setChargeType(data1.getChargeType());
+ orderCourseVO.setCoverDescription(data1.getCoverDescription());
break;
case 2:
OrderCourseVO data = remoteCourseService.getCourseByIdAny(orderCourseVO).getData();
@@ -203,9 +214,30 @@
orderCourseVO.setCount(data3+temp);
break;
}
-
}
- return R.ok(res.getList());
+ List<OrderCourseVO> testing = testing(res.size(), pageCurr, pageSize, res);
+ return R.ok(testing);
+ }
+ public static List<OrderCourseVO> testing(long total, long current, long size, List<OrderCourseVO> str){
+ List<OrderCourseVO> result = new ArrayList<>();
+ //获取初始化分页结构
+ Page<OrderCourseVO> page = new Page<>(current - 1, size, total);
+ //获取集合下标初始值
+ long startIndex = (current - 1) * size;
+ //获取集合下标结束值
+ long endInddex = 0;
+ if(startIndex + page.getCurrent() >= total || size > total){
+ endInddex = total;
+ }else {
+ endInddex = Math.min(startIndex + page.getSize(), total);
+ }
+ //如果输入的开始查询下标大于集合大小，则查询为空值
+ if(startIndex > total){
+ result = Collections.emptyList();
+ }else{
+ result = str.subList((int)startIndex,(int)endInddex);
+ }
+ return result;
}
/**
* 根据邀请用户ids 查询对应佣金
@@ -374,6 +406,11 @@
order.setRealPayAmount(data.getIosPrice());
break;
}
+ if (receiverId!=null){
+ remoteAppUserService.addNotice(receiverId + "", data.getId() + "",
+ userId + "", order.getTotalAmount() + "");
+ }
+
break;
}
@@ -421,34 +458,38 @@
AppUser data = remoteAppUserService.getAppUserById(order.getAppUserId() + "").getData();
BigDecimal realPayAmount = order.getRealPayAmount();
if (data.getInviteUserId()!=null) {
- if (order.getOrderFrom() == 1 || order.getOrderFrom() == 2) {
- // 分佣给上级 先远程查询分佣比例
- CommissionRule data1 = sysUserClient.getCommission().getData();
- if (data1 != null) {
- if (data1.getProportion() != null) {
- BigDecimal bigDecimal = realPayAmount.multiply(data1.getProportion())
- .setScale(2, BigDecimal.ROUND_HALF_DOWN);
- // 上级获取的分佣金额
- AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
- // 更新用户余额
- remoteAppUserService.updateAppUser(
- AppUserDTO.builder().balance(
- 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(order.getAppUserId());
- appUserWalletRecord.setOrderId(order.getId());
- remoteAppUserService.addBalanceRecord(appUserWalletRecord);
- order.setCommissionAmount(bigDecimal);
- order.setCommissionId(data.getInviteUserId());
- orderService.updateById(order);
- }
- }
+ if (order.getOrderFrom() == 1 || order.getOrderFrom() == 2 || order.getOrderFrom() == 3) {
+// // 查询实际支付价格 不包含余额抵扣价格
+// OrderPaymentRecord one1 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, order.getId())
+// .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_HALF_DOWN);
+// // 上级获取的分佣金额
+// AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
+// // 更新用户余额
+// remoteAppUserService.updateAppUser(
+// AppUserDTO.builder().balance(
+// 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(order.getAppUserId());
+// appUserWalletRecord.setOrderId(order.getId());
+// remoteAppUserService.addBalanceRecord(appUserWalletRecord);
+// order.setCommissionAmount(bigDecimal);
+// order.setCommissionId(data.getInviteUserId());
+// orderService.updateById(order);
+// }
+// }
}
}
return R.ok();
@@ -488,6 +529,9 @@
// 支付金额
String string3 = jsonObject1.getString("pay_fee");
Order one = orderService.lambdaQuery().eq(Order::getBizOrderNo, string).one();
+ if (one.getPaymentStatus()==2){
+ return;
+ }
one.setPaymentStatus(2);
one.setPaymentTime(LocalDateTime.now());
OrderPaymentRecord one2 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
@@ -500,21 +544,31 @@
BigDecimal realPayAmount = one.getRealPayAmount();
// 判断订单所属用户是否有上级 是否需要做分佣处理
AppUser data = remoteAppUserService.getAppUserById(one.getAppUserId() + "").getData();
+ if (one.getGiveUserId()!=null){
+ remoteAppUserService.addNotice(one.getGiveUserId() + "", one.getBusinessId() + "",
+ one.getAppUserId() + "", one.getTotalAmount() + "");
+ }
+
if (data.getInviteUserId()!=null) {
- if (one.getOrderFrom() == 1 || one.getOrderFrom() == 2) {
- // 分佣给上级 先远程查询分佣比例
+
+ 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 = realPayAmount.multiply(data1.getProportion())
+
+ BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
.setScale(2, BigDecimal.ROUND_HALF_DOWN);
// 上级获取的分佣金额
AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
// 更新用户余额
- remoteAppUserService.updateAppUser(
- AppUserDTO.builder().balance(
- appUserById.getBalance().add(bigDecimal))
- .build(), SecurityConstants.INNER);
+// remoteAppUserService.updateAppUser(
+// AppUserDTO.builder().balance(
+// appUserById.getBalance().add(bigDecimal))
+// .build(), SecurityConstants.INNER);
// 新增分佣流水明细
AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
appUserWalletRecord.setAppUserId(data.getInviteUserId());
@@ -749,7 +803,7 @@
if (data4!=null){
if (data4.getProportion()!=null){
BigDecimal bigDecimal = realPayAmount.multiply(data4.getProportion())
- .setScale(2, BigDecimal.ROUND_HALF_DOWN);
+ .divide(new BigDecimal(100),2, BigDecimal.ROUND_DOWN);
// 上级获取的分佣金额
AppUser appUserById = remoteAppUserService.getAppUserById(data3.getInviteUserId() + "").getData();
// 更新用户余额
@@ -901,6 +955,7 @@
.eq(OrderPaymentRecord::getPaymentStatus, 2).one();
if (two==null){
one.setRemark("余额支付");
+ one.setBalance(one.getTotalAmount());
}else{
switch (two.getPaymentType()){
case 1:
--
Gitblit v1.7.1