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-06-13 15:17:58 +08:00
parent 220a3bb557 c7872cb965
commit 1a7844e89d
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/peanut/modules/common/controller/UserVipController.java
View File

@@ -110,7 +110,7 @@ public class UserVipController {
BuyOrder buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new LambdaQueryWrapper<BuyOrder>().eq(BuyOrder::getOrderSn, timeId));
WechatPaymentInfo paymentInfo = new WechatPaymentInfo();
paymentInfo.setOrderSn(buyOrderEntity.getOrderSn());
paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId()));
paymentInfo.setBuyOrderId(buyOrderEntity.getOrderId());
paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney());
paymentInfo.setAppName(buyOrder.getAppName());
wxpayService.prepay(paymentInfo);
@@ -121,7 +121,7 @@ public class UserVipController {
buyOrder.getOrderId(),
messagePostProcessor()
);
return R.ok().put("orderSn", timeId);
return R.ok().put("orderSn", timeId).put("money",buyOrder.getRealMoney());
}
private boolean usePeanutCoin(MyUserEntity user, BigDecimal totalPrice) {

2
src/main/java/com/peanut/modules/common/entity/CourseEntity.java
View File

@@ -46,4 +46,6 @@ public class CourseEntity {
private Integer level;
@TableField(exist = false)
private Integer selective;
@TableField(exist = false)
private boolean isBuy;
}