From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 351 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 264 insertions(+), 87 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 ecfabb9..458a72c 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;
@@ -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)
@@ -101,7 +113,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 +134,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 +173,7 @@
payOrderVO.setAmount(payOrderVO.getAmount().add(byId.getChangePrice()));
}
}
+ payOrderVO.setAmount(byId.getRealPayAmount());
return R.ok(payOrderVO);
}
@@ -183,24 +195,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 +220,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 +235,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 +317,12 @@
* @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),
@@ -316,6 +333,7 @@
})
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,
@@ -323,12 +341,105 @@
@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,orderId,
- balanceFlag, payType,amount,vipType));
+ clientPlaceOrderVO);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -343,11 +454,16 @@
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();
}
@ResponseBody
@@ -448,37 +564,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) {
// // 查询实际支付价格 不包含余额抵扣价格
@@ -490,7 +662,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();
// // 更新用户余额
@@ -551,17 +723,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);
}
// 实际支付金额
@@ -570,11 +742,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())
@@ -583,9 +753,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();
// 更新用户余额
@@ -594,16 +763,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);
}
}
@@ -614,18 +785,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){
@@ -637,7 +807,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -648,7 +818,6 @@
}
appUserWalletRecord.setReason(reason);
appUserWalletRecord.setAmount(one1.getPayAmount());
- appUserWalletRecord.setChildAppUserId(one.getAppUserId());
appUserWalletRecord.setOrderId(one.getId());
remoteAppUserService.addBalanceRecord(appUserWalletRecord);
}else{
@@ -697,7 +866,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");
@@ -783,7 +952,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();
// 更新用户余额
@@ -818,12 +987,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){
@@ -835,7 +1004,7 @@
break;
case 3:
// 会员
- reason = "购买【"+one.getBuyContent()+"】";
+ reason = "购买会员【"+one.getBuyContent()+"】";
appUserWalletRecord.setChangeType(2);
break;
case 4:
@@ -873,12 +1042,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);
@@ -998,22 +1168,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