会员拆分

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RegisterPayDto.java

@@ -34,6 +34,9 @@ public class RegisterPayDto extends PayParamBasicDto{
     @ApiModelProperty(value = "购买乐器保养",required = false)
     private Boolean buyMaintenance = false;
 
+    @ApiModelProperty(value = "缴费项目关联会员Id",required = false)
+    private List<Long> buyCalenderMemberId;
+
     @ApiModelProperty(value = "购买云教练",required = false)
     private Boolean buyCloudTeacher= false;
 
@@ -120,6 +123,14 @@ public class RegisterPayDto extends PayParamBasicDto{
         this.buyMaintenance = buyMaintenance;
     }
 
+    public List<Long> getBuyCalenderMemberId() {
+        return buyCalenderMemberId;
+    }
+
+    public void setBuyCalenderMemberId(List<Long> buyCalenderMemberId) {
+        this.buyCalenderMemberId = buyCalenderMemberId;
+    }
+
     public Boolean getBuyCloudTeacher() {
         return buyCloudTeacher;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MemberRankSettingWrapper.java

@@ -28,7 +28,6 @@ public class MemberRankSettingWrapper {
     @ApiModel(" MemberRankSettingQuery-会员等级设置")
     public static class MemberRankSettingQuery implements QueryInfo {
 
-
         @ApiModelProperty("名称")
         private String name;
 
@@ -44,6 +43,9 @@ public class MemberRankSettingWrapper {
         @ApiModelProperty("会员编号")
         private List<Integer> memberIds;
 
+        @ApiModelProperty("查询有子节点的数据")
+        private Boolean hasChildren;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

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

@@ -1179,6 +1179,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         List<Integer> rankIds = feeMappers.stream().map(MemberRankOrganizationFeeMapper::getMemberRankSettingId).collect(Collectors.toList());
         MemberRankSettingWrapper.MemberRankSettingQuery queryInfo = new MemberRankSettingWrapper.MemberRankSettingQuery();
         queryInfo.setMemberIds(rankIds);
+        queryInfo.setHasChildren(true);
         return this.queryPage2(queryInfo);
     }
 }

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

@@ -817,7 +817,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             if (order.getOrderDetailList() == null) {
                 continue;
             }
-            
+
             BigDecimal organShareProfit = BigDecimal.ZERO;
             for (StudentPaymentOrderDetail studentPaymentOrderDetail : order.getOrderDetailList()) {
                 if (studentPaymentOrderDetail.getGoodsList() == null) {

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

@@ -547,7 +547,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(studentPaymentOrder.getCalenderId());
 
-        boolean isGiveAccessories = musicGroup.getIsGiveAccessories() == null ? false : musicGroup.getIsGiveAccessories();
+        boolean isGiveAccessories = musicGroup.getIsGiveAccessories() != null && musicGroup.getIsGiveAccessories();
         
         Date date = new Date();
         List<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<>();
@@ -556,6 +556,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         List<MusicGroupSubjectGoodsGroup> goodsGroups = goodsDto.getGoodsGroups();
         List<MusicGroupPaymentCalenderCourseSettings> newCourses = goodsDto.getNewCourses();
         BigDecimal remitFee = goodsDto.getRemitFee();
+        Boolean buyCloudTeacher = CollectionUtils.isNotEmpty(registerPayDto.getBuyCalenderMemberId());
         if (CollectionUtils.isNotEmpty(goodsGroups)) {
         	
         	BigDecimal organShareProfit = BigDecimal.ZERO;
@@ -577,9 +578,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
                 BigDecimal goodsPrice = new BigDecimal(0);
                 
-				if (!(type == OrderDetailTypeEnum.ACCESSORIES && (isGiveAccessories && registerPayDto.getBuyCloudTeacher()))) {
+				if (!(type == OrderDetailTypeEnum.ACCESSORIES && (isGiveAccessories && buyCloudTeacher))) {
 
-	                if (studentRegistration.getOrganId() == 55 && (newCourses == null || newCourses.size() == 0) && !registerPayDto.getBuyCloudTeacher()) {
+	                if (studentRegistration.getOrganId() == 55 && (CollectionUtils.isEmpty(newCourses)) && !buyCloudTeacher) {
 	                    //取商品零售价
 	                    if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
 	                        List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());
@@ -700,7 +701,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
 
         //云教练/云教练+  todo  团练宝
-        if (registerPayDto.getBuyCloudTeacher() || (Objects.nonNull(calender) && calender.getPayUserType() == MusicGroupPaymentCalender.PayUserType.SCHOOL)) {
+        if (buyCloudTeacher || (Objects.nonNull(calender) && calender.getPayUserType() == MusicGroupPaymentCalender.PayUserType.SCHOOL)) {
             List<MusicGroupPaymentCalenderMember> calenderMembers = musicGroupPaymentCalenderMemberService.findByCalenderId(studentPaymentOrder.getCalenderId());
             if(CollectionUtils.isNotEmpty(calenderMembers)){
                 for (MusicGroupPaymentCalenderMember calenderMember : calenderMembers) {

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

@@ -85,6 +85,11 @@
             <if test="updateEndTime !=null">
                 AND mrs.update_time_ &lt;= #{updateEndTime}
             </if>
+            <if test="hasChildren !=null">
+            	<if test="hasChildren == true">
+					AND mrs.parent_id_ != 0
+				</if>
+            </if>
             <if test="memberIds !=null and memberIds.size > 0">
             	AND mrs.id_ IN
 				<foreach collection="memberIds" item="id" open="(" close=")" separator=",">

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -41,7 +41,7 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
-        syncSaveLog(request, handler);
+//        syncSaveLog(request, handler);
     }
 
     public void syncSaveLog(HttpServletRequest request, Object handler) {