Merge remote-tracking branch 'origin/saas_2022_05_17_activity' into saas_2022_05_17_activity

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

@@ -292,7 +292,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         Date startTime = DateUtil.trunc(now);
         Date endTime = this.calcCloudTeacherOrderTime(cloudTeacherOrder, startTime, now);
         cloudTeacherOrder.setStartTime(startTime);
-        cloudTeacherOrder.setEndTime(endTime);
+        cloudTeacherOrder.setEndTime(DateUtil.addDays(endTime,1));
         cloudTeacherOrder.setStatus(2);
         if(Objects.isNull(cloudTeacherOrder.getId())){
             cloudTeacherOrderDao.insert(cloudTeacherOrder);

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

@@ -602,12 +602,12 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             }
             return true;
         }
-        SysUser sysUser = teacherDao.getUser(userId);
 
         // 支付成功
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             //是否通过活动购买的团练宝
             if(Objects.nonNull(studentPaymentOrder.getActivityId())){
+                Student student = studentService.get(userId);
                 VipGroupActivity activity = vipGroupActivityDao.get(Integer.parseInt(studentPaymentOrder.getActivityId()));
                 //保存团练宝数据
                 CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
@@ -622,6 +622,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 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());
@@ -654,6 +655,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 String activityDateStr = sysConfigDao.findConfigValue("qqhe_2022_buy_member_activity");
                 //获取活动时间
                 Date activityDate = DateUtil.stringToDate(activityDateStr, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+                SysUser sysUser = teacherDao.getUser(userId);
                 logger.info("orderCallback >>> member param organId {}   orderTime {} activityDate {}  cache {}", sysUser.getOrganId(), studentPaymentOrder.getCreateTime(), activityDate, cache.isExists());
                 //分部编号59 并且下单时间大于等于activityDateStr  todo 并且redis能查询到的就算齐齐哈尔活动购买的
                 if (sysUser.getOrganId() == 59 && studentPaymentOrder.getCreateTime().after(activityDate) && cache.isExists()) {
@@ -726,7 +728,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         cto.setTime(totalMonth.intValue());
         cto.setAmount(studentPaymentOrder.getActualAmount().add(studentPaymentOrder.getBalancePaymentAmount()));
         cto.setStartTime(now.toDate());
-        cto.setEndTime(now.plusMonths(totalMonth.intValue()).toDate());
+        cto.setEndTime(DateUtil.addDays(now.plusMonths(totalMonth.intValue()).toDate(),1));
         cto.setOrderId(studentPaymentOrder.getId());
         cto.setCreateTime(new Date());
         cloudTeacherOrderService.insert(cto);