|
@@ -836,6 +836,20 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
activityUserMapper.setSubNoCoursePrice(BigDecimal.ZERO);
|
|
|
activityUserMapper.setSubCourseNum(0);
|
|
|
}
|
|
|
+ }else {
|
|
|
+ CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
|
|
|
+ cloudTeacherOrder.setStatus(1);
|
|
|
+ cloudTeacherOrder.setAmount(activityUserMapper.getActualPrice());
|
|
|
+ cloudTeacherOrder.setOrderId(studentPaymentOrder.getId());
|
|
|
+ cloudTeacherOrder.setRemark(studentPaymentOrder.getMemo());
|
|
|
+ cloudTeacherOrder.setLevel(activity.getMemberRankId());
|
|
|
+ cloudTeacherOrder.setStudentId(studentPaymentOrder.getUserId());
|
|
|
+ cloudTeacherOrder.setType(activity.getPeriodEnum());
|
|
|
+ cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
|
|
|
+ cloudTeacherOrder.setTime(activity.getMemberTime());
|
|
|
+ cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
|
|
|
+ activityUserMapper.setMemberFlag(1);
|
|
|
+ activityUserMapper.setMemberOrderId(cloudTeacherOrder.getId());
|
|
|
}
|
|
|
// activityUserMapperService.copyProperty(activityUserMapper,activity,false,true);
|
|
|
|
|
@@ -862,11 +876,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
}
|
|
|
//是否赠送会员(会员立即生效)
|
|
|
if (activity.getGiveMemberTime() > 0) {
|
|
|
- Date now = new Date();
|
|
|
// 查询会员订单信息
|
|
|
CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
|
|
|
cloudTeacherOrder.setStatus(1);
|
|
|
- cloudTeacherOrder.setUpdateTime(now);
|
|
|
cloudTeacherOrder.setAmount(BigDecimal.ZERO);
|
|
|
cloudTeacherOrder.setOrderId(studentPaymentOrder.getId());
|
|
|
cloudTeacherOrder.setRemark(studentPaymentOrder.getMemo() + "赠送会员");
|