diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 2c91d989..c34c7487 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -246,12 +246,14 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal v = new BigDecimal(value); if (courseDetailsId != null) { CourseDetails courseDetails = courseDetailsService.getById(courseDetailsId); - orders.setPayMoney(courseDetails.getPrice().multiply(v)); + orders.setPayMoney(courseDetails.getPrice()); + orders.setPayDiamond(courseDetails.getPrice().multiply(v)); } else { - orders.setPayMoney(course.getPrice().multiply(v)); + orders.setPayMoney(course.getPrice()); + orders.setPayDiamond(course.getPrice().multiply(v)); } - BigDecimal payDiamond = orders.getPayMoney().multiply(new BigDecimal(commonInfoService.findOne(892).getValue())); - orders.setPayDiamond(payDiamond); +// BigDecimal payDiamond = orders.getPayMoney().multiply(new BigDecimal(commonInfoService.findOne(892).getValue())); +// orders.setPayDiamond(payDiamond); //设置支付状态 orders.setStatus(0); //设置订单创建时间 @@ -339,13 +341,13 @@ public class OrdersServiceImpl extends ServiceImpl implements } } UserMoney userMoney = userMoneyService.selectUserMoneyByUserId(orders.getUserId()); - if (userMoney.getMoney().doubleValue() < orders.getPayMoney().doubleValue()) { + if (userMoney.getMoney().doubleValue() < orders.getPayDiamond().doubleValue()) { return Result.error("账户不足,请充值!"); } UserEntity userEntity = userService.selectUserById(orders.getUserId()); - userMoneyService.updateMoney(2, orders.getUserId(), orders.getPayMoney().doubleValue()); + userMoneyService.updateMoney(2, orders.getUserId(), orders.getPayDiamond().doubleValue()); UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); - userMoneyDetails.setMoney(orders.getPayMoney()); + userMoneyDetails.setMoney(orders.getPayDiamond()); userMoneyDetails.setUserId(orders.getUserId()); userMoneyDetails.setContent("金豆支付订单"); userMoneyDetails.setTitle("下单成功,订单号:" + orders.getOrdersNo()); @@ -355,6 +357,7 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); userMoneyDetailsService.save(userMoneyDetails); orders.setPayWay(6); + orders.setDiamond(1); orders.setStatus(1); orders.setPayTime(DateUtils.format(new Date()));