|
@@ -368,49 +368,49 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
|
|
|
cloudTeacherOrderService.update(cloudTeacherOrder);
|
|
|
// 添加会员有效时长
|
|
|
-// studentService.updateMemberRank(cloudTeacherOrder, periodEnum);
|
|
|
+ studentService.updateMemberRank(cloudTeacherOrder, periodEnum);
|
|
|
//云教练活动赠送优惠券
|
|
|
-// cloudTeacherActiveGiveCoupon(cloudTeacherOrder);
|
|
|
+ cloudTeacherActiveGiveCoupon(cloudTeacherOrder);
|
|
|
// // 插入交易明细
|
|
|
-// BigDecimal amount = studentPaymentOrder.getActualAmount();
|
|
|
-// if (amount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
-// SysUserCashAccount cashAccount = sysUserCashAccountService.get(userId);
|
|
|
-// // 充值
|
|
|
-// SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
|
|
|
-// rechargeDetail.setAmount(amount);
|
|
|
-// rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
|
|
|
-// rechargeDetail.setComment("缴费前充值");
|
|
|
-// rechargeDetail.setCreateTime(nowDate);
|
|
|
-// rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
-// rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
|
|
|
-// rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
|
|
|
-// rechargeDetail.setUpdateTime(nowDate);
|
|
|
-// rechargeDetail.setUserId(userId);
|
|
|
-// rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
|
|
|
-// rechargeDetail.setComAmount(studentPaymentOrder.getComAmount());
|
|
|
-// rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount());
|
|
|
-// sysUserCashAccountDetailService.insert(rechargeDetail);
|
|
|
-//
|
|
|
-// // 缴费
|
|
|
-// SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
|
|
|
-// paymentDetail.setAmount(amount.negate());
|
|
|
-// paymentDetail.setBalance(cashAccount.getBalance());
|
|
|
-// paymentDetail.setComment("购买会员");
|
|
|
-// paymentDetail.setCreateTime(nowDate);
|
|
|
-// paymentDetail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
-// paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
|
|
|
-// paymentDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
|
|
|
-// paymentDetail.setUpdateTime(nowDate);
|
|
|
-// paymentDetail.setUserId(userId);
|
|
|
-// rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
|
|
|
-// sysUserCashAccountDetailService.insert(paymentDetail);
|
|
|
-// }
|
|
|
+ BigDecimal amount = studentPaymentOrder.getActualAmount();
|
|
|
+ if (amount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ SysUserCashAccount cashAccount = sysUserCashAccountService.get(userId);
|
|
|
+ // 充值
|
|
|
+ SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
|
|
|
+ rechargeDetail.setAmount(amount);
|
|
|
+ rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
|
|
|
+ rechargeDetail.setComment("缴费前充值");
|
|
|
+ rechargeDetail.setCreateTime(nowDate);
|
|
|
+ rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
+ rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
|
|
|
+ rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
|
|
|
+ rechargeDetail.setUpdateTime(nowDate);
|
|
|
+ rechargeDetail.setUserId(userId);
|
|
|
+ rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
|
|
|
+ rechargeDetail.setComAmount(studentPaymentOrder.getComAmount());
|
|
|
+ rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount());
|
|
|
+ sysUserCashAccountDetailService.insert(rechargeDetail);
|
|
|
+
|
|
|
+ // 缴费
|
|
|
+ SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
|
|
|
+ paymentDetail.setAmount(amount.negate());
|
|
|
+ paymentDetail.setBalance(cashAccount.getBalance());
|
|
|
+ paymentDetail.setComment("购买会员");
|
|
|
+ paymentDetail.setCreateTime(nowDate);
|
|
|
+ paymentDetail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
+ paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
|
|
|
+ paymentDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
|
|
|
+ paymentDetail.setUpdateTime(nowDate);
|
|
|
+ paymentDetail.setUserId(userId);
|
|
|
+ rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
|
|
|
+ sysUserCashAccountDetailService.insert(paymentDetail);
|
|
|
+ }
|
|
|
//
|
|
|
-// try {
|
|
|
-// contractService.transferProduceContract(userId, null, CourseViewTypeEnum.MEMBER_FEE);
|
|
|
-// } catch (Exception e) {
|
|
|
-// logger.error("产品协议生成失败", e);
|
|
|
-// }
|
|
|
+ try {
|
|
|
+ contractService.transferProduceContract(userId, null, CourseViewTypeEnum.MEMBER_FEE);
|
|
|
+ } catch (Exception e) {
|
|
|
+ logger.error("产品协议生成失败", e);
|
|
|
+ }
|
|
|
}
|
|
|
return true;
|
|
|
}
|