From 01bbe60254a0c68224b3d79118ee50421310dfde Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 11 Jun 2025 09:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=87=91=E9=A2=9D=E7=B1=BB=E5=9E=8B=E4=B8=BABigDecima?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayPaymentOrderServiceImpl.java | 4 ++-- .../modules/common/entity/BookBuyConfigEntity.java | 7 ++++--- .../modules/pay/IOSPay/controller/AppController.java | 8 ++++---- .../pay/IOSPay/service/impl/OrderServiceImpl.java | 2 +- .../pay/alipay/service/impl/AliPayServiceImpl.java | 12 ++++++------ .../pay/weChatPay/service/impl/WxpayServiceImpl.java | 12 ++++++------ 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java index 991bb62d..31fbabbb 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java @@ -46,8 +46,8 @@ public class PayPaymentOrderServiceImpl extends ServiceImpl().eq("order_sn", order.getOrderid())); if (null != orderEntity) { 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 8578122c..d051d248 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 @@ -219,22 +219,22 @@ public class AliPayServiceImpl implements AliPayService { BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(Integer.valueOf(body)); MyUserEntity userEntity = userService.getById(order.getUserId()); //充值送积分 - if (bookBuyConfigEntity != null && !"0".equals(bookBuyConfigEntity.getGivejf())) { - userEntity.setJf(userEntity.getJf().add(new BigDecimal(bookBuyConfigEntity.getGivejf()))); + if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) { + userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf())); userService.updateById(userEntity); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); jfTransactionDetails.setUserId(userEntity.getId()); - jfTransactionDetails.setChangeAmount(new BigDecimal(bookBuyConfigEntity.getGivejf())); + jfTransactionDetails.setChangeAmount(bookBuyConfigEntity.getGivejf()); jfTransactionDetails.setActType(0); jfTransactionDetails.setUserBalance(userEntity.getJf()); jfTransactionDetails.setRelationId(order.getOrderId()); jfTransactionDetails.setRemark("充币送积分："+bookBuyConfigEntity.getDescription()+",订单号:"+order.getOrderSn()); jfTransactionDetailsDao.insert(jfTransactionDetails); } - String realMoney = bookBuyConfigEntity.getRealMoney(); - userService.rechargeHSPoint(userEntity,Integer.valueOf(realMoney)); + BigDecimal realMoney = bookBuyConfigEntity.getRealMoney(); + userService.rechargeHSPoint(userEntity,realMoney.intValue()); //插入虚拟币消费记录 - transactionDetailsService.rechargeRecord(userEntity,realMoney,oldPayZfbOrderEntity.getId().intValue(),"支付宝",order.getOrderSn()); + transactionDetailsService.rechargeRecord(userEntity,realMoney.toString(),oldPayZfbOrderEntity.getId().intValue(),"支付宝",order.getOrderSn()); //插入花生币充值记录 payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,oldPayZfbOrderEntity.getId().toString()); buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); 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 15ecb3be..0f9ef98b 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 @@ -300,22 +300,22 @@ public class WxpayServiceImpl extends ServiceImpl0) { + userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf())); userService.updateById(userEntity); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); jfTransactionDetails.setUserId(userEntity.getId()); - jfTransactionDetails.setChangeAmount(new BigDecimal(bookBuyConfigEntity.getGivejf())); + jfTransactionDetails.setChangeAmount(bookBuyConfigEntity.getGivejf()); jfTransactionDetails.setActType(0); jfTransactionDetails.setUserBalance(userEntity.getJf()); jfTransactionDetails.setRelationId(order.getOrderId()); jfTransactionDetails.setRemark("充币送积分："+bookBuyConfigEntity.getDescription()+",订单号:"+order.getOrderSn()); jfTransactionDetailsDao.insert(jfTransactionDetails); } - String realMoney = bookBuyConfigEntity.getRealMoney(); - userService.rechargeHSPoint(userEntity, Integer.parseInt(realMoney)); + BigDecimal realMoney = bookBuyConfigEntity.getRealMoney(); + userService.rechargeHSPoint(userEntity, realMoney.intValue()); //插入虚拟币消费记录 - transactionDetailsService.rechargeRecord(userEntity,realMoney,buy_order_id.getId().intValue(),"微信",order.getOrderSn()); + transactionDetailsService.rechargeRecord(userEntity,realMoney.toString(),buy_order_id.getId().intValue(),"微信",order.getOrderSn()); //插入花生币充值记录 payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,buy_order_id.getId().toString()); buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "2");