会员拆分

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

@@ -1259,7 +1259,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 goodsGroup.setGoodsList(goodsService.findGoodsByIds(goodsGroup.getGoodsIdList()));
 
                 //齐齐哈尔走特殊规则
-                if (calender.getOrganId() == 55 && (CollectionUtils.isEmpty(registerPayDto.getNewCourse())) && !buyCloudTeacher) {
+                if (calender.getOrganId() == 55 && CollectionUtils.isEmpty(registerPayDto.getNewCourse()) && !buyCloudTeacher) {
                     //取商品零售价
                     if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
                         List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());

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

@@ -624,6 +624,14 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 if (CollectionUtils.isNotEmpty(goods)) {
                     spod.setName(goods.stream().map(Goods::getName).collect(Collectors.joining(",")));
                 }
+            }else if (spod.getType() == CLOUD_TEACHER || spod.getType() == CLOUD_TEACHER_PLUS) {
+                Long studentInstrumentId = spod.getStudentInstrumentId();
+                if (studentInstrumentId != null) {
+                    MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberDao.get(studentInstrumentId);
+                    if (calenderMember != null) {
+                        spod.setName(calenderMember.getName());
+                    }
+                }
             }
         }
 

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

@@ -268,10 +268,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         List<StudentPaymentOrder> studentPaymentOrderList = studentPaymentOrderService.queryByCondition(null, musicGroupId, studentId,
                 DealStatusEnum.SUCCESS, OrderTypeEnum.APPLY);
 
-        List<Long> orderIdList = studentPaymentOrderList.stream().map(t -> t.getId()).collect(Collectors.toList());
+        List<Long> orderIdList = studentPaymentOrderList.stream().map(StudentPaymentOrder::getId).collect(Collectors.toList());
 
         List<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<StudentPaymentOrderDetail>();
-        if (orderIdList != null && orderIdList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(orderIdList)) {
             studentPaymentOrderDetailList = studentPaymentOrderDetailService.getOrderDetail(orderIdList);
         }
 
@@ -291,8 +291,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
                 detail.setGoodsIdList(studentLastChange.getChangeAccessories());
                 List<Goods> goods = goodsDao.findGoodsByIds(detail.getGoodsIdList());
-                if (goods != null && goods.size() > 0) {
-                    detail.setName(goods.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
+                if (CollectionUtils.isNotEmpty(goods)) {
+                    detail.setName(goods.stream().map(Goods::getName).collect(Collectors.joining(",")));
                 }
                 if (studentLastChange.getOriginalOrderId() != null) {
                     detail.setPaymentOrderId((long) studentLastChange.getOriginalOrderId());
@@ -307,8 +307,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
                 detail.setGoodsIdList(studentLastChange.getChangeMusical() + "");
                 List<Goods> goods = goodsDao.findGoodsByIds(detail.getGoodsIdList());
-                if (goods != null && goods.size() > 0) {
-                    detail.setName(goods.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
+                if (CollectionUtils.isNotEmpty(goods)) {
+                    detail.setName(goods.stream().map(Goods::getName).collect(Collectors.joining(",")));
                 }
                 if (studentLastChange.getOriginalOrderId() != null) {
                     detail.setPaymentOrderId((long) studentLastChange.getOriginalOrderId());

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

@@ -498,7 +498,7 @@
         sr.remark_,
         sr.actual_subject_id_,
         IFNULL(sv.num, 0) visit_num_,
-        CASE WHEN st.member_rank_setting_id_ = 1 THEN 1 ELSE 0 END has_cloud_teacher_,
+        CASE WHEN st.membership_end_time_ >= NOW() THEN 1 ELSE 0 END has_cloud_teacher_,
         sr.paying_status_,
         sr.none_need_cloud_teacher_
         FROM student_registration sr