小小训练营

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -650,6 +650,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             studentPaymentOrderDetail.setType(OrderDetailTypeEnum.CLOUD_TEACHER);
             studentPaymentOrderDetail.setGoodsIdList("1");
             studentPaymentOrderDetail.setPrice(studentPaymentOrder.getExpectAmount());
+            studentPaymentOrderDetail.setRemitFee(studentPaymentOrder.getCouponRemitFee());
             studentPaymentOrderDetail.setTenantId(studentPaymentOrder.getTenantId());
             studentPaymentOrderDetail.setCreateTime(nowDate);
             studentPaymentOrderDetail.setUpdateTime(nowDate);
@@ -708,7 +709,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             //是否通过活动购买的团练宝
             if(Objects.nonNull(studentPaymentOrder.getActivityId())){
-                Student student = studentService.get(userId);
+//                Student student = studentService.get(userId);
                 VipGroupActivity activity = vipGroupActivityDao.get(Integer.parseInt(studentPaymentOrder.getActivityId()));
                 //保存团练宝数据
                 CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
@@ -722,31 +723,31 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
                 cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
                 //赠送陪练课
-                ActivityUserMapper activityUserMapper = new ActivityUserMapper();
-                activityUserMapper.setTeacherId(student.getTeacherId());
-                activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
-                activityUserMapper.setUserId(studentPaymentOrder.getUserId());
-                activityUserMapper.setActivityId(activity.getId());
-                activityUserMapper.setActualPrice(BigDecimal.ZERO);
-                activityUserMapper.setGivePracticeFlag(1);
-                activityUserMapper.setReturnFee(false);
-                activityUserMapperDao.insert(activityUserMapper);
+//                ActivityUserMapper activityUserMapper = new ActivityUserMapper();
+//                activityUserMapper.setTeacherId(student.getTeacherId());
+//                activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
+//                activityUserMapper.setUserId(studentPaymentOrder.getUserId());
+//                activityUserMapper.setActivityId(activity.getId());
+//                activityUserMapper.setActualPrice(BigDecimal.ZERO);
+//                activityUserMapper.setGivePracticeFlag(1);
+//                activityUserMapper.setReturnFee(false);
+//                activityUserMapperDao.insert(activityUserMapper);
                 //赠送训练营
-                TempLittleArtistTrainingCampUserRelation tempLittleArtistTrainingCamp = new TempLittleArtistTrainingCampUserRelation();
-                tempLittleArtistTrainingCamp.setUserId(studentPaymentOrder.getUserId());
-                tempLittleArtistTrainingCamp.setState("NOT_APPLY");
-                tempLittleArtistTrainingCamp.setCreateTime(nowDate);
-                tempLittleArtistTrainingCampUserRelationDao.insert(tempLittleArtistTrainingCamp);
+//                TempLittleArtistTrainingCampUserRelation tempLittleArtistTrainingCamp = new TempLittleArtistTrainingCampUserRelation();
+//                tempLittleArtistTrainingCamp.setUserId(studentPaymentOrder.getUserId());
+//                tempLittleArtistTrainingCamp.setState("NOT_APPLY");
+//                tempLittleArtistTrainingCamp.setCreateTime(nowDate);
+//                tempLittleArtistTrainingCampUserRelationDao.insert(tempLittleArtistTrainingCamp);
                 //生成订单详情
-                StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
-                studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
-                studentPaymentOrderDetail.setType(OrderDetailTypeEnum.CLOUD_TEACHER);
-                studentPaymentOrderDetail.setGoodsIdList("1");
-                studentPaymentOrderDetail.setPrice(studentPaymentOrder.getExpectAmount());
-                studentPaymentOrderDetail.setTenantId(studentPaymentOrder.getTenantId());
-                studentPaymentOrderDetail.setCreateTime(nowDate);
-                studentPaymentOrderDetail.setUpdateTime(nowDate);
-                studentPaymentOrderDetailDao.insert(studentPaymentOrderDetail);
+//                StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
+//                studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
+//                studentPaymentOrderDetail.setType(OrderDetailTypeEnum.CLOUD_TEACHER);
+//                studentPaymentOrderDetail.setGoodsIdList("1");
+//                studentPaymentOrderDetail.setPrice(studentPaymentOrder.getExpectAmount());
+//                studentPaymentOrderDetail.setTenantId(studentPaymentOrder.getTenantId());
+//                studentPaymentOrderDetail.setCreateTime(nowDate);
+//                studentPaymentOrderDetail.setUpdateTime(nowDate);
+//                studentPaymentOrderDetailDao.insert(studentPaymentOrderDetail);
                 //赠送优惠券
 //                Integer giveCouponId = activity.getGiveCouponId();
 //                Integer giveCouponNum = activity.getGiveCouponNum();