From 863b2ab1804ff02fc4459306dd0d10039b5999e0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 17:46:31 +0800
Subject: [PATCH] 11.3
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index b1a0865..620daac 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1193,6 +1193,8 @@
public ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
System.out.println("exchangeType:--->");
+ ReturnModel returnModel = new ReturnModel();
+ Long returnId = null;
//如果是兑换优惠卷
if (exchangeType.getGoodsType()==4){
//查询优惠卷
@@ -1211,10 +1213,6 @@
if (usercounts == coupon.getPickUpQuantity()){
return new ResultUtil<>(0,"限领数量已达最大");
}
-
-
-
-
// userConponClient.queryCouponById(exchangeType.getGoodId());
UserCoupon userCoupon = new UserCoupon();
userCoupon.setCouponId(exchangeType.getGoodId());
@@ -1222,19 +1220,33 @@
userCoupon.setStatus(1);
userCoupon.setInsertTime(new Date());
userConponClient.insertToAppuserCoupon(userCoupon);
-
-
//扣积分
TAppUser user = appUserService.getById(userIdFormRedis);
if (user.getIntegral()<coupon.getIntegral().intValue()){
return new ResultUtil<>(0,"当前用户积分不足");
}
-
user.setIntegral(user.getIntegral()-coupon.getIntegral().intValue());
-
appUserService.updateById(user);
- return ResultUtil.success();
+ //记录
+// UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
+// pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
+// pointsMerchandise.setUserId(userIdFormRedis);
+// pointsMerchandise.setStatus(1);
+// pointsMerchandise.setState(1);
+// pointsMerchandise.setPayStatus(1);
+//// if (merchandise.getUseScope() == 3){
+//// if (exchangeType.getGoodsType() == 2){
+//// CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
+//// pointsMerchandise.setStoreId(coursePackage.getStoreId());
+//// }else {
+//// pointsMerchandise.setStoreId(exchangeType.getStoreId());
+//// }
+//// }
+//// pointsMerchandise.setCode(code);
+// returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+
+ return ResultUtil.success(returnId);
}
@@ -1245,6 +1257,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
+
if (ToolUtil.isEmpty(merchandise)){
return ResultUtil.error("商品不存在");
}
@@ -1302,7 +1315,7 @@
}
}
pointsMerchandise.setCode(code);
- mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+ returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
}
switch (exchangeType.getExchangeType()){
@@ -1376,9 +1389,9 @@
}
case 2:
if (merchandise.getType() == 2) {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,returnId);
} else {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,returnId);
}
default:
break;
@@ -1398,9 +1411,9 @@
}
case 2:
if (merchandise.getType() == 2) {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,returnId);
} else {
- return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
+ return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,returnId);
}
default:
break;
@@ -1410,8 +1423,8 @@
break;
}
-
- return ResultUtil.success();
+ returnModel.setReturnId(returnId);
+ return ResultUtil.success(returnModel);
}catch (Exception e){
e.printStackTrace();
return null;
@@ -1442,9 +1455,9 @@
}
}
- private ResultUtil AlipayPayment(BigDecimal cash, String code) {
+ private ResultUtil AlipayPayment(BigDecimal cash, String code,Long returnId) {
System.out.println("金额："+cash);
- ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, cash.toString(),
+ ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", String.valueOf(returnId), code, cash.toString(),
"/base/pointMer/exchangeGoodPaymentAliCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
--
Gitblit v1.7.1