|
@@ -107,6 +107,7 @@ public class CardAppController extends BaseController {
|
|
|
vipCardLog.setCreateTime(DateUtils.getNowDate());
|
|
vipCardLog.setCreateTime(DateUtils.getNowDate());
|
|
|
//设置支付方式
|
|
//设置支付方式
|
|
|
vipCardLog.setPaymentType("weChart");
|
|
vipCardLog.setPaymentType("weChart");
|
|
|
|
|
+ //设置原价信息为实际支付价格
|
|
|
vipCardLog.setOriginalPrice(vipCardLog.getPracticalMoney());
|
|
vipCardLog.setOriginalPrice(vipCardLog.getPracticalMoney());
|
|
|
//开启订单定时任务
|
|
//开启订单定时任务
|
|
|
createOrderTaskQueue(uuid, "chongzhi", "");
|
|
createOrderTaskQueue(uuid, "chongzhi", "");
|
|
@@ -115,6 +116,7 @@ public class CardAppController extends BaseController {
|
|
|
if(StringUtils.isNotEmpty(vipCardLog.getVoucherId())){
|
|
if(StringUtils.isNotEmpty(vipCardLog.getVoucherId())){
|
|
|
//修改代金券状态为已使用
|
|
//修改代金券状态为已使用
|
|
|
voucherMemberService.updateBeilvVoucherMember(new BeilvVoucherMember(Long.parseLong(vipCardLog.getVoucherId()), "2"));
|
|
voucherMemberService.updateBeilvVoucherMember(new BeilvVoucherMember(Long.parseLong(vipCardLog.getVoucherId()), "2"));
|
|
|
|
|
+ //当使用了代金券, 原价为, 实际支付金额+代金券金额
|
|
|
vipCardLog.setOriginalPrice(vipCardLog.getOriginalPrice().add(vipCardLog.getVoucherPrice()));
|
|
vipCardLog.setOriginalPrice(vipCardLog.getOriginalPrice().add(vipCardLog.getVoucherPrice()));
|
|
|
}
|
|
}
|
|
|
|
|
|