|
@@ -281,22 +281,22 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public HttpResponseResult buy(MemberPayParamDto memberPayParamDto) throws Exception {
|
|
public HttpResponseResult buy(MemberPayParamDto memberPayParamDto) throws Exception {
|
|
- logger.info("云教练购买:memberPayParamDto:{} ", memberPayParamDto);
|
|
|
|
|
|
+ logger.info("学练宝购买:memberPayParamDto:{} ", memberPayParamDto);
|
|
Long paymentId = memberPayParamDto.getPaymentId();
|
|
Long paymentId = memberPayParamDto.getPaymentId();
|
|
CloudCoachPaymentProgram cloudCoachPaymentProgram = cloudCoachPaymentProgramService.get(paymentId);
|
|
CloudCoachPaymentProgram cloudCoachPaymentProgram = cloudCoachPaymentProgramService.get(paymentId);
|
|
if (cloudCoachPaymentProgram == null) {
|
|
if (cloudCoachPaymentProgram == null) {
|
|
- throw new BizException("云教练缴费订单不存在,请联系指导老师");
|
|
|
|
|
|
+ throw new BizException("学练宝缴费订单不存在,请联系指导老师");
|
|
}
|
|
}
|
|
if (cloudCoachPaymentProgram.getStatus() != CloudCoachPaymentProgram.StatusEnum.OPEN) {
|
|
if (cloudCoachPaymentProgram.getStatus() != CloudCoachPaymentProgram.StatusEnum.OPEN) {
|
|
- throw new BizException("当前云教练缴费订单状态不允许缴费");
|
|
|
|
|
|
+ throw new BizException("当前学练宝缴费订单状态不允许缴费");
|
|
}
|
|
}
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
StudentCloudCoachPaymentDetails cloudCoachPaymentDetails = studentCloudCoachPaymentDetailsService.findByUserId(paymentId, sysUser.getId());
|
|
StudentCloudCoachPaymentDetails cloudCoachPaymentDetails = studentCloudCoachPaymentDetailsService.findByUserId(paymentId, sysUser.getId());
|
|
if (cloudCoachPaymentDetails == null) {
|
|
if (cloudCoachPaymentDetails == null) {
|
|
- throw new BizException("您不在当前云教练缴费项目中,请联系指导老师");
|
|
|
|
|
|
+ throw new BizException("您不在当前学练宝缴费项目中,请联系指导老师");
|
|
}
|
|
}
|
|
if (cloudCoachPaymentDetails.getPaymentStatus() == 1) {
|
|
if (cloudCoachPaymentDetails.getPaymentStatus() == 1) {
|
|
- throw new BizException("当前云教练订单已支付,感谢您的支持");
|
|
|
|
|
|
+ throw new BizException("当前学练宝订单已支付,感谢您的支持");
|
|
}
|
|
}
|
|
//判断用户是否已存在订单
|
|
//判断用户是否已存在订单
|
|
List<StudentPaymentOrder> applyOrderList = studentPaymentOrderService.queryByDealStatus(paymentId.toString(), OrderTypeEnum.MEMBER, DealStatusEnum.ING);
|
|
List<StudentPaymentOrder> applyOrderList = studentPaymentOrderService.queryByDealStatus(paymentId.toString(), OrderTypeEnum.MEMBER, DealStatusEnum.ING);
|
|
@@ -456,7 +456,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(),amount, true, checkCoupon);
|
|
StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(),amount, true, checkCoupon);
|
|
studentPaymentOrder.setUserId(sysUser.getId());
|
|
studentPaymentOrder.setUserId(sysUser.getId());
|
|
studentPaymentOrder.setOrganId(sysUser.getOrganId());
|
|
studentPaymentOrder.setOrganId(sysUser.getOrganId());
|
|
- studentPaymentOrder.setMemo("小小训练营云教练购买");
|
|
|
|
|
|
+ studentPaymentOrder.setMemo("小小训练营学练宝购买");
|
|
studentPaymentOrder.setGroupType(GroupType.LIVE_BUY);
|
|
studentPaymentOrder.setGroupType(GroupType.LIVE_BUY);
|
|
studentPaymentOrder.setType(OrderTypeEnum.LIVE_BUY);
|
|
studentPaymentOrder.setType(OrderTypeEnum.LIVE_BUY);
|
|
studentPaymentOrder.setActivityId(activityId.toString());
|
|
studentPaymentOrder.setActivityId(activityId.toString());
|
|
@@ -842,7 +842,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
}
|
|
}
|
|
if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
|
|
if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
|
|
//退还优惠券和余额
|
|
//退还优惠券和余额
|
|
- studentPaymentOrderService.returnBalanceAndCoupon(studentPaymentOrder, "直播购买云教练支付失败");
|
|
|
|
|
|
+ studentPaymentOrderService.returnBalanceAndCoupon(studentPaymentOrder, "直播购买学练宝支付失败");
|
|
if(Objects.nonNull(studentPaymentOrder.getActivityId())){
|
|
if(Objects.nonNull(studentPaymentOrder.getActivityId())){
|
|
//还原库存
|
|
//还原库存
|
|
liveGoodsService.addGoodsStock(1,null);
|
|
liveGoodsService.addGoodsStock(1,null);
|
|
@@ -913,7 +913,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 插入交易明细
|
|
// 插入交易明细
|
|
- sysUserCashAccountDetailService.saveSysUserCashAccountDetail(studentPaymentOrder, "直播购买云教练");
|
|
|
|
|
|
+ sysUserCashAccountDetailService.saveSysUserCashAccountDetail(studentPaymentOrder, "直播购买学练宝");
|
|
try {
|
|
try {
|
|
contractService.transferProduceContract(userId, null, studentPaymentOrder.getType());
|
|
contractService.transferProduceContract(userId, null, studentPaymentOrder.getType());
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1021,13 +1021,13 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
}else {
|
|
}else {
|
|
CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrderService.queryByOrderId(studentPaymentOrder.getId());
|
|
CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrderService.queryByOrderId(studentPaymentOrder.getId());
|
|
if (cloudTeacherOrder == null) {
|
|
if (cloudTeacherOrder == null) {
|
|
- throw new BizException("该云教练订单不存在");
|
|
|
|
|
|
+ throw new BizException("该学练宝订单不存在");
|
|
}
|
|
}
|
|
if(cloudTeacherOrder.getStatus() == 2){
|
|
if(cloudTeacherOrder.getStatus() == 2){
|
|
- throw new BizException("该云教练订单已经生效");
|
|
|
|
|
|
+ throw new BizException("该学练宝订单已经生效");
|
|
}
|
|
}
|
|
if(cloudTeacherOrder.getStatus() == 1){
|
|
if(cloudTeacherOrder.getStatus() == 1){
|
|
- throw new BizException("该云教练订单已经支付");
|
|
|
|
|
|
+ throw new BizException("该学练宝订单已经支付");
|
|
}
|
|
}
|
|
cloudTeacherOrderService.save(cloudTeacherOrder,true);
|
|
cloudTeacherOrderService.save(cloudTeacherOrder,true);
|
|
}
|
|
}
|