Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/student/controller/MemberRankController.java

@@ -5,6 +5,8 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.MemberRankOrganizationFeeMapperDao;
 import com.ym.mec.biz.dal.dao.SysMusicScoreDao;
 import com.ym.mec.biz.dal.dto.MemberPayParamDto;
+import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
+import com.ym.mec.biz.dal.entity.LessonCourseware;
 import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
 import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
@@ -12,6 +14,7 @@ import com.ym.mec.biz.dal.page.CloudTeacherOrderQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
@@ -44,6 +47,9 @@ public class MemberRankController extends BaseController {
     @Autowired
     private SysMusicScoreDao sysMusicScoreDao;
 
+    @Autowired
+    private LessonCoursewareService lessonCoursewareService;
+
     @ApiOperation(value = "获取所有的收费标准")
     @GetMapping("/queryList")
     public Object getMemberDefaultFee(String  type,Integer  typeId) {
@@ -57,6 +63,12 @@ public class MemberRankController extends BaseController {
             if (sysMusicScore != null) {
                 typeId = sysMusicScore.getCbsMusicCategoriesId();
             }
+        } else if (StringUtils.isNotBlank(type)&& "LESSON".equals(type) && typeId !=null) {
+            // 远程ID 换课件ID
+            LessonCourseware courseware = lessonCoursewareService.getByLessonCoursewareId(typeId.longValue());
+            if (courseware != null) {
+                typeId = courseware.getId();
+            }
         }
         List<Integer> memberIds = feeMappers.stream()
                 .map(MemberRankOrganizationFeeMapper::getMemberRankSettingId).distinct().collect(Collectors.toList());
@@ -137,8 +149,9 @@ public class MemberRankController extends BaseController {
 
     @ApiOperation(value = "查询订单列表")
     @GetMapping("/queryOrderPage")
-    public Object queryOrderPage(CloudTeacherOrderQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<CloudTeacherOrder>> queryOrderPage(CloudTeacherOrderQueryInfo queryInfo) {
         queryInfo.setStudentId(sysUserService.getUserId());
+        queryInfo.setStatus("1,2");
         return succeed(cloudTeacherOrderService.queryPage(queryInfo));
     }
 

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

@@ -378,14 +378,17 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         Date endTime = startTime;
         if (cloudTeacherOrder.getType() == DAY) { // 日
             endTime = DateUtil.addDays(startTime, cloudTeacherOrder.getTime());
-        } else if (cloudTeacherOrder.getType() == MONTH) { // 月
-            endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime());
-        } else if (cloudTeacherOrder.getType() == QUARTERLY) { // 季
-            endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 3);
-        } else if (cloudTeacherOrder.getType() == YEAR_HALF) { // 半年
-            endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 6);
-        } else if (cloudTeacherOrder.getType() == YEAR) { // 年
-            endTime = DateUtil.addYears(startTime, cloudTeacherOrder.getTime());
+        } else {
+            if (cloudTeacherOrder.getType() == MONTH) { // 月
+                endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime());
+            } else if (cloudTeacherOrder.getType() == QUARTERLY) { // 季
+                endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 3);
+            } else if (cloudTeacherOrder.getType() == YEAR_HALF) { // 半年
+                endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 6);
+            } else if (cloudTeacherOrder.getType() == YEAR) { // 年
+                endTime = DateUtil.addYears(startTime, cloudTeacherOrder.getTime());
+            }
+            endTime = DateUtil.addDays(endTime, +1);
         }
         return endTime;
     }

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

@@ -355,7 +355,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(), actualAmount, true, checkCoupon);
         studentPaymentOrder.setUserId(sysUser.getId());
         studentPaymentOrder.setOrganId(sysUser.getOrganId());
-        studentPaymentOrder.setMemo("学员云教练购买");
+        studentPaymentOrder.setMemo("学员学练宝购买");
         studentPaymentOrder.setGroupType(GroupType.MEMBER);
         this.getMap(memberPayParamDto.getAmount(), memberPayParamDto.getUseBalancePayment(),studentPaymentOrder);
         //生成团练宝订单

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

@@ -72,7 +72,6 @@ public class StudentMemberTimeServiceImpl extends ServiceImpl<StudentMemberTimeD
                 throw new RuntimeException("学练宝已过期");
             }
         }else {
-
             if (one == null) {
                 one = new StudentMemberTime();
                 one.setMemberRankId(studentMemberUpdateLog.getLevel());

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

@@ -1602,14 +1602,31 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             //您获得/扣减了XXXX{数量+周期}的XXXX{学练宝版本}，原因：XXXXX{添加/扣减原因}
             Map<Integer, String> userMap = new HashMap<>(1);
             userMap.put(userId, userId.toString());
+            String msg = "";
+            switch (param.getPeriodType()) {
+                case YEAR:
+                    msg = param.getNumber() * 12 + "个月";
+                    break;
+                case YEAR_HALF:
+                    msg = param.getNumber() * 6 + "个月";
+                    break;
+                case QUARTERLY:
+                    msg = param.getNumber() * 3 + "个月";
+                    break;
+                case MONTH:
+                    msg = param.getNumber() + "个月";
+                    break;
+                case DAY:
+                    msg = param.getNumber() + "天";
+                    break;
+            }
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
                     MessageTypeEnum.PUSH_STUDENT_MEMBER_UPDATE_MESSAGE,
                     userMap,
                     null,
                     0,
                     null,
-                    "STUDENT",param.getType()==3?"扣减":"获得",param.getNumber()+
-                    param.getPeriodType().getMsg(),studentMemberUpdateLog.getName(),param.getMemo());
+                    "STUDENT",param.getType()==3?"扣减":"获得",msg,studentMemberUpdateLog.getName(),param.getMemo());
         }
     }
 

mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

@@ -171,8 +171,8 @@
         left join student_payment_order spo on cto.order_id_ = spo.id_
         left join member_rank_setting mrs on mrs.id_ = cto.level_
         where spo.type_ = 'MEMBER'
-        <if test="status != null">
-        	and cto.status_ = #{status}
+        <if test="status != null and status != ''">
+        	and FIND_IN_SET(#{status},cto.status_)
         </if>
         <if test="studentId != null">
         	and cto.student_id_ = #{studentId}