diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java index 52b3f3f7..b2cf9abf 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java @@ -228,12 +228,13 @@ public class AliPayServiceImpl implements AliPayService { BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(Integer.valueOf(body)); MyUserEntity userEntity = userService.getById(order.getUserId()); if (Integer.valueOf(body)==0){//自定义充值 + bookBuyConfigEntity = new BookBuyConfigEntity(); bookBuyConfigEntity.setRealMoney(order.getRealMoney()); bookBuyConfigEntity.setMoney(order.getRealMoney()); bookBuyConfigEntity.setQudao("Android"); } //充值送积分 - if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) { + if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf() != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) { userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf())); userService.updateById(userEntity); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index c023d251..80b4f77d 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -320,13 +320,14 @@ public class WxpayServiceImpl extends ServiceImpl0) { + if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf() != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) { userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf())); userService.updateById(userEntity); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();