zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改扣除积分时为负数

Browse Source
This commit is contained in:
wuchunlei
2025-04-14 13:06:34 +08:00
parent b9c277f2f3
commit b2eb0b902d
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java
View File

@@ -221,7 +221,7 @@ public class CourseRelearnController {
JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
jfTransactionDetails.setUserId(userEntity.getId()); jfTransactionDetails.setUserId(userEntity.getId());
jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate()); jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate());
jfTransactionDetails.setActType(0); jfTransactionDetails.setActType(1);
jfTransactionDetails.setUserBalance(userEntity.getJf()); jfTransactionDetails.setUserBalance(userEntity.getJf());
jfTransactionDetails.setRelationId(order.getOrderId()); jfTransactionDetails.setRelationId(order.getOrderId());
jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn()); jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn());

2
src/main/java/com/peanut/modules/common/service/impl/JfTransactionDetailsServiceImpl.java
View File

@@ -16,7 +16,7 @@ public class JfTransactionDetailsServiceImpl extends ServiceImpl<JfTransactionDe
JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
jfTransactionDetails.setUserId(user.getId()); jfTransactionDetails.setUserId(user.getId());
jfTransactionDetails.setChangeAmount(jf.negate()); jfTransactionDetails.setChangeAmount(jf.negate());
jfTransactionDetails.setActType(0); jfTransactionDetails.setActType(1);
jfTransactionDetails.setUserBalance(user.getJf()); jfTransactionDetails.setUserBalance(user.getJf());
jfTransactionDetails.setRelationId(buyOrder.getOrderId()); jfTransactionDetails.setRelationId(buyOrder.getOrderId());
jfTransactionDetails.setRemark("消费积分抵扣："+jf.toString()+",订单号:"+buyOrder.getOrderSn()); jfTransactionDetails.setRemark("消费积分抵扣："+jf.toString()+",订单号:"+buyOrder.getOrderSn());

3
src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java
View File

@@ -82,13 +82,14 @@ public class JfTransactionDetailsController {
if (actType.equals("0")) { if (actType.equals("0")) {
jf.setActType(0); jf.setActType(0);
user.setJf(user.getJf().add(changeAmount)); user.setJf(user.getJf().add(changeAmount));
jf.setChangeAmount(changeAmount);
}else { }else {
jf.setActType(1); jf.setActType(1);
user.setJf(user.getJf().subtract(changeAmount)); user.setJf(user.getJf().subtract(changeAmount));
jf.setChangeAmount(changeAmount.negate());
} }
userService.updateById(user); userService.updateById(user);
jf.setUserId(user.getId()); jf.setUserId(user.getId());
jf.setChangeAmount(changeAmount);
jf.setRemark(params.get("remark").toString()); jf.setRemark(params.get("remark").toString());
jf.setUserBalance(user.getJf()); jf.setUserBalance(user.getJf());
jfService.save(jf); jfService.save(jf);

2
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -383,7 +383,7 @@ public class AliPayServiceImpl implements AliPayService {
JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
jfTransactionDetails.setUserId(userEntity.getId()); jfTransactionDetails.setUserId(userEntity.getId());
jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate()); jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate());
jfTransactionDetails.setActType(0); jfTransactionDetails.setActType(1);
jfTransactionDetails.setUserBalance(userEntity.getJf()); jfTransactionDetails.setUserBalance(userEntity.getJf());
jfTransactionDetails.setRelationId(order.getOrderId()); jfTransactionDetails.setRelationId(order.getOrderId());
jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn()); jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn());

2
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -355,7 +355,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
jfTransactionDetails.setUserId(userEntity.getId()); jfTransactionDetails.setUserId(userEntity.getId());
jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate()); jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate());
jfTransactionDetails.setActType(0); jfTransactionDetails.setActType(1);
jfTransactionDetails.setUserBalance(userEntity.getJf()); jfTransactionDetails.setUserBalance(userEntity.getJf());
jfTransactionDetails.setRelationId(order.getOrderId()); jfTransactionDetails.setRelationId(order.getOrderId());
jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn()); jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn());