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

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-05-13 16:05:40 +08:00
parent a455324bff 81e2df077d
commit 4f6f3f7779
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -289,7 +289,9 @@ public class BuyOrderController {
buyOrderService.updateOrderStatus(user.getId(), buyOrder.getOrderSn(), "2");
}
//记录用户虚拟币消费
recordTransaction(buyOrder, user, totalPrice);
if(totalPrice.compareTo(BigDecimal.ZERO)>0){
recordTransaction(buyOrder, user, totalPrice);
}
//记录用户积分消费情况
if(buyOrder.getJfDeduction().compareTo(BigDecimal.ZERO) > 0){
recordJfTransaction(buyOrder, user, buyOrder.getJfDeduction());
@@ -848,6 +850,9 @@ public class BuyOrderController {
*/
private boolean usePeanutCoin(MyUserEntity user, BigDecimal totalPrice, boolean sj_check, boolean scqq_check, boolean wylq_check, boolean prescript_b_check) {
if (user.getPeanutCoin().compareTo(totalPrice) >= 0) {
if(totalPrice.compareTo(BigDecimal.ZERO)==0){//纯积分支付，虚拟币不用支付
return true;
}
user.setPeanutCoin(user.getPeanutCoin().subtract(totalPrice));
if (sj_check){
user.setPointPower(1);