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

修改充值配置金额类型为BigDecimal

Browse Source
This commit is contained in:
wuchunlei
2025-06-11 09:43:19 +08:00
parent 15b3732d36
commit 01bbe60254
6 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java
View File

@@ -46,8 +46,8 @@ public class PayPaymentOrderServiceImpl extends ServiceImpl<PayPaymentOrderDao,
PayPaymentOrderEntity payPaymentOrderEntity = new PayPaymentOrderEntity(); PayPaymentOrderEntity payPaymentOrderEntity = new PayPaymentOrderEntity();
payPaymentOrderEntity.setUserId(user.getId()); payPaymentOrderEntity.setUserId(user.getId());
payPaymentOrderEntity.setOrderId(payXxxOrderId); payPaymentOrderEntity.setOrderId(payXxxOrderId);
payPaymentOrderEntity.setRealAmount(new BigDecimal(bookBuyConfigEntity.getRealMoney())); payPaymentOrderEntity.setRealAmount(bookBuyConfigEntity.getRealMoney());
payPaymentOrderEntity.setRechargeAmount(new BigDecimal(bookBuyConfigEntity.getMoney())); payPaymentOrderEntity.setRechargeAmount(bookBuyConfigEntity.getMoney());
payPaymentOrderEntity.setRechargeChannel(bookBuyConfigEntity.getQudao()); payPaymentOrderEntity.setRechargeChannel(bookBuyConfigEntity.getQudao());
payPaymentOrderEntity.setRechargeStatus("success"); payPaymentOrderEntity.setRechargeStatus("success");
payPaymentOrderEntity.setSuccessTime(new Date()); payPaymentOrderEntity.setSuccessTime(new Date());

7
src/main/java/com/peanut/modules/common/entity/BookBuyConfigEntity.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
@@ -36,15 +37,15 @@ public class BookBuyConfigEntity implements Serializable {
/** /**
* 真实价格 * 真实价格
*/ */
private String realMoney; private BigDecimal realMoney;
/** /**
* 金额 * 金额
*/ */
private String money; private BigDecimal money;
/** /**
* 赠送积分 * 赠送积分
*/ */
private String givejf; private BigDecimal givejf;
/** /**
* vip开通月份 * vip开通月份
*/ */

8
src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java
View File

@@ -132,14 +132,14 @@ public class AppController {
// 插入花生币 变动记录 // 插入花生币 变动记录
BookBuyConfigEntity bookBuyConfigEntity = this.bookBuyConfigService.getById(Integer.valueOf(body)); BookBuyConfigEntity bookBuyConfigEntity = this.bookBuyConfigService.getById(Integer.valueOf(body));
MyUserEntity userEntity = userService.getById(Integer.valueOf(customerid)); MyUserEntity userEntity = userService.getById(Integer.valueOf(customerid));
String realMoney = bookBuyConfigEntity.getMoney(); BigDecimal realMoney = bookBuyConfigEntity.getMoney();
userService.rechargeHSPoint(userEntity, Integer.valueOf(realMoney)); userService.rechargeHSPoint(userEntity, realMoney.intValue());
//插入虚拟币消费记录 //插入虚拟币消费记录
transactionDetailsService.rechargeRecord(userEntity,realMoney,order.getId(),"苹果",order.getOrderid()); transactionDetailsService.rechargeRecord(userEntity,realMoney.toString(),order.getId(),"苹果",order.getOrderid());
//插入花生币充值记录 //插入花生币充值记录
payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,order.getTransactionId()); payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,order.getTransactionId());
buyOrderService.updateOrderStatus(Integer.valueOf(customerid), dto.getOrderId(), "2"); buyOrderService.updateOrderStatus(Integer.valueOf(customerid), dto.getOrderId(), "2");
order.setMoney(Integer.valueOf(bookBuyConfigEntity.getRealMoney())); order.setMoney(bookBuyConfigEntity.getRealMoney().intValue());
order.setUsername(userEntity.getName()); order.setUsername(userEntity.getName());
orderService.saveOrUpdate(order); orderService.saveOrUpdate(order);
return Result.ok0(); return Result.ok0();

2
src/main/java/com/peanut/modules/pay/IOSPay/service/impl/OrderServiceImpl.java
View File

@@ -126,7 +126,7 @@ public class OrderServiceImpl extends ServiceImpl<PayIOSOrderMapper,IosPayOrderE
vo.setUsername(user.getName()); vo.setUsername(user.getName());
} }
BookBuyConfigEntity bookBuyConfigEntity = this.bookBuyConfigService.getById(Integer.valueOf(null == order.getProductID() ? "0" : order.getProductID())); BookBuyConfigEntity bookBuyConfigEntity = this.bookBuyConfigService.getById(Integer.valueOf(null == order.getProductID() ? "0" : order.getProductID()));
vo.setRealMoney(null == bookBuyConfigEntity ? "0" : bookBuyConfigEntity.getRealMoney()); vo.setRealMoney(null == bookBuyConfigEntity ? "0" : bookBuyConfigEntity.getRealMoney().toString());
BuyOrder orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrder>().eq("order_sn", order.getOrderid())); BuyOrder orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrder>().eq("order_sn", order.getOrderid()));
if (null != orderEntity) { if (null != orderEntity) {

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

@@ -219,22 +219,22 @@ public class AliPayServiceImpl implements AliPayService {
BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(Integer.valueOf(body)); BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(Integer.valueOf(body));
MyUserEntity userEntity = userService.getById(order.getUserId()); MyUserEntity userEntity = userService.getById(order.getUserId());
//充值送积分 //充值送积分
if (bookBuyConfigEntity != null && !"0".equals(bookBuyConfigEntity.getGivejf())) { if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) {
userEntity.setJf(userEntity.getJf().add(new BigDecimal(bookBuyConfigEntity.getGivejf()))); userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf()));
userService.updateById(userEntity); userService.updateById(userEntity);
JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
jfTransactionDetails.setUserId(userEntity.getId()); jfTransactionDetails.setUserId(userEntity.getId());
jfTransactionDetails.setChangeAmount(new BigDecimal(bookBuyConfigEntity.getGivejf())); jfTransactionDetails.setChangeAmount(bookBuyConfigEntity.getGivejf());
jfTransactionDetails.setActType(0); jfTransactionDetails.setActType(0);
jfTransactionDetails.setUserBalance(userEntity.getJf()); jfTransactionDetails.setUserBalance(userEntity.getJf());
jfTransactionDetails.setRelationId(order.getOrderId()); jfTransactionDetails.setRelationId(order.getOrderId());
jfTransactionDetails.setRemark("充币送积分："+bookBuyConfigEntity.getDescription()+",订单号:"+order.getOrderSn()); jfTransactionDetails.setRemark("充币送积分："+bookBuyConfigEntity.getDescription()+",订单号:"+order.getOrderSn());
jfTransactionDetailsDao.insert(jfTransactionDetails); jfTransactionDetailsDao.insert(jfTransactionDetails);
} }
String realMoney = bookBuyConfigEntity.getRealMoney(); BigDecimal realMoney = bookBuyConfigEntity.getRealMoney();
userService.rechargeHSPoint(userEntity,Integer.valueOf(realMoney)); 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()); payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,oldPayZfbOrderEntity.getId().toString());
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2");

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

@@ -300,22 +300,22 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(buyorder); BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(buyorder);
MyUserEntity userEntity = userService.getById(order.getUserId()); MyUserEntity userEntity = userService.getById(order.getUserId());
//充值送积分 //充值送积分
if (bookBuyConfigEntity != null && !"0".equals(bookBuyConfigEntity.getGivejf())) { if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) {
userEntity.setJf(userEntity.getJf().add(new BigDecimal(bookBuyConfigEntity.getGivejf()))); userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf()));
userService.updateById(userEntity); userService.updateById(userEntity);
JfTransactionDetails jfTransactionDetails = new JfTransactionDetails(); JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
jfTransactionDetails.setUserId(userEntity.getId()); jfTransactionDetails.setUserId(userEntity.getId());
jfTransactionDetails.setChangeAmount(new BigDecimal(bookBuyConfigEntity.getGivejf())); jfTransactionDetails.setChangeAmount(bookBuyConfigEntity.getGivejf());
jfTransactionDetails.setActType(0); jfTransactionDetails.setActType(0);
jfTransactionDetails.setUserBalance(userEntity.getJf()); jfTransactionDetails.setUserBalance(userEntity.getJf());
jfTransactionDetails.setRelationId(order.getOrderId()); jfTransactionDetails.setRelationId(order.getOrderId());
jfTransactionDetails.setRemark("充币送积分："+bookBuyConfigEntity.getDescription()+",订单号:"+order.getOrderSn()); jfTransactionDetails.setRemark("充币送积分："+bookBuyConfigEntity.getDescription()+",订单号:"+order.getOrderSn());
jfTransactionDetailsDao.insert(jfTransactionDetails); jfTransactionDetailsDao.insert(jfTransactionDetails);
} }
String realMoney = bookBuyConfigEntity.getRealMoney(); BigDecimal realMoney = bookBuyConfigEntity.getRealMoney();
userService.rechargeHSPoint(userEntity, Integer.parseInt(realMoney)); 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()); payPaymentOrderService.insertDetail(userEntity,bookBuyConfigEntity,buy_order_id.getId().toString());
buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "2"); buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "2");