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

mec-biz/src/main/java/com/ym/mec/biz/service/CloudTeacherOrderService.java

@@ -33,7 +33,7 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
      * @param order
      * @return
      */
-    void addOrderDetail2CloudTeacher(StudentPaymentOrder order, BigDecimal cloudTeacherFee,List<MusicGroupPaymentCalenderMember> calenderMembers);
+    void addOrderDetail2CloudTeacher(StudentPaymentOrder order, Map<Integer,BigDecimal> cloudTeacherFee,List<MusicGroupPaymentCalenderMember> calenderMembers);
 
     /**
     * @description: 激活团练宝

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

@@ -328,7 +328,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void addOrderDetail2CloudTeacher(StudentPaymentOrder order, BigDecimal cloudTeacherFee,List<MusicGroupPaymentCalenderMember> calenderMembers) {
+    public void addOrderDetail2CloudTeacher(StudentPaymentOrder order, Map<Integer,BigDecimal> cloudTeacherFee,List<MusicGroupPaymentCalenderMember> calenderMembers) {
         for (MusicGroupPaymentCalenderMember calenderMember : calenderMembers) {
             CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
             cloudTeacherOrder.setTenantId(order.getTenantId());
@@ -337,11 +337,12 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacherOrder.setLevel(calenderMember.getMemberRankSettingId());
             cloudTeacherOrder.setTime(calenderMember.getNum().intValue());
             cloudTeacherOrder.setType(calenderMember.getPeriod());
-            cloudTeacherOrder.setAmount(cloudTeacherFee);
+            BigDecimal decimal = cloudTeacherFee.get(calenderMember.getMemberRankSettingId());
+            cloudTeacherOrder.setAmount(decimal);
             cloudTeacherOrder.setStudentId(order.getUserId());
             cloudTeacherOrder.setStatus(1);
             cloudTeacherOrder.setMusicGroupId(order.getMusicGroupId());
-            cloudTeacherOrder.setOperatingAmount(calenderMember.getIncome().compareTo(BigDecimal.ZERO) == 0?cloudTeacherFee:calenderMember.getIncome());
+            cloudTeacherOrder.setOperatingAmount(calenderMember.getIncome().compareTo(BigDecimal.ZERO) == 0?decimal:calenderMember.getIncome());
             //保存云教练订单
             this.save(cloudTeacherOrder,calenderMember.getAutoActivationFlag());
         }

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

@@ -761,9 +761,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     }
                 }
             }
-            BigDecimal cloudTeacherFee = memberDetailList.stream()
-                    .map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            Map<Integer,BigDecimal> cloudTeacherFee = memberDetailList.stream()
+                    .collect(Collectors.toMap(e->e.getStudentInstrumentId().intValue(),
+                            o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee())));
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee,calenderMembers);
         }
     }
@@ -864,9 +864,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     }
                 }
             }
-            BigDecimal cloudTeacherFee = memberDetailList.stream()
-                    .map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            Map<Integer,BigDecimal> cloudTeacherFee = memberDetailList.stream()
+                    .collect(Collectors.toMap(e->e.getStudentInstrumentId().intValue(),
+                            o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee())));
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee,calenderMembers);
         }
     }

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

@@ -580,7 +580,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 
 				if (!(type == OrderDetailTypeEnum.ACCESSORIES && (isGiveAccessories && buyCloudTeacher))) {
 
-	                if (studentRegistration.getOrganId() == 55 && (CollectionUtils.isEmpty(newCourses)) && !buyCloudTeacher) {
+	                if (studentRegistration.getOrganId() == 55 && musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE && !buyCloudTeacher) {
 	                    //取商品零售价
 	                    if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
 	                        List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());