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

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

@@ -2,8 +2,6 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
 import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.common.exception.BizException;

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

@@ -5,15 +5,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
-import com.ym.mec.biz.dal.dto.NoClassMusicStudentDto;
-import com.ym.mec.biz.dal.dto.PageInfoReg;
-import com.ym.mec.biz.dal.dto.RegisterDto;
-import com.ym.mec.biz.dal.dto.StudentAddDto;
-import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
-import com.ym.mec.biz.dal.dto.StudentInfo;
-import com.ym.mec.biz.dal.dto.StudentMusicDetailDto;
-import com.ym.mec.biz.dal.dto.StudentMusicGroupDto;
-import com.ym.mec.biz.dal.dto.StudentRegisterInstrumentsDetailDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.page.*;
@@ -123,10 +115,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
                                  List<MusicGroupSubjectGoodsGroup> goodsGroups,
                                  BigDecimal remitFee,
                                  BigDecimal courseRemitFee,
-                                 List<MusicGroupPaymentCalenderCourseSettings> newCourses,
-                                 Boolean buyMaintenance,
-                                 Boolean buyCloudTeacher,
-                                 Boolean buyCloudTeacherPlus,List<Integer> couponIdList) throws Exception;
+                                 List<MusicGroupPaymentCalenderCourseSettings> newCourses,RegisterPayDto registerPayDto, Long calenderId) throws Exception;
 
     /**
      * 查询用户指定乐团的报名信息

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

@@ -248,6 +248,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		List<ActivityUserMapper> activityUserMapperList = new ArrayList<>();
 		for (StudentPaymentOrderDetail orderDetail : activity) {
 			ActivityUserMapper activityUserMapper = new ActivityUserMapper();
+			activityUserMapper.setTenantId(studentPaymentOrder.getTenantId());
 			activityUserMapper.setActualPrice(orderDetail.getPrice());
 			//这里的studentInstrumentId存的是活动编号
 			activityUserMapper.setActivityId(orderDetail.getStudentInstrumentId().intValue());

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

@@ -300,6 +300,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     @Transactional(rollbackFor = Exception.class)
 	public void addOrderDetail2CloudTeacher(StudentPaymentOrder order,BigDecimal cloudTeacherFee) {
         CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
+        cloudTeacherOrder.setTenantId(order.getTenantId());
         cloudTeacherOrder.setOrganId(order.getOrganId());
         cloudTeacherOrder.setOrderId(order.getId());
         MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberService.findByCalenderId(order.getCalenderId());

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

@@ -728,14 +728,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 remitFee = groupType.get(kitGroupPurchaseType) == null ? BigDecimal.ZERO : groupType.get(kitGroupPurchaseType);
             }
             goodsGroup.setGoodsList(goodsService.findGoodsByIds(goodsGroup.getGoodsIdList()));
-            
-            if(goodsGroup.getType().equals(GoodsType.ACCESSORIES)){
-            	if((registerPayDto.getBuyCloudTeacher() || registerPayDto.getBuyCloudTeacherPlus()) && musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
-            		goodsGroup.setPrice(BigDecimal.ZERO);
-            		continue;
-            	}
-            }
-            
+
             if(musicGroup.getOrganId() == 55 && (registerPayDto.getNewCourse() == null || registerPayDto.getNewCourse().size() == 0) && !(registerPayDto.getBuyCloudTeacher() || registerPayDto.getBuyCloudTeacherPlus())){
             	//取商品零售价
                 if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
@@ -806,10 +799,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 remitFee,
                 courseRemitFee,
                 newCourses,
-                registerPayDto.getBuyMaintenance(),
-                registerPayDto.getBuyCloudTeacher(),
-                registerPayDto.getBuyCloudTeacherPlus(),registerPayDto.getCouponIdList());
-        studentPaymentOrder.setCalenderId(calenderId);
+                registerPayDto,calenderId);
         orderAmount = studentPaymentOrder.getActualAmount();
         if (amount.compareTo(orderAmount) != 0) {
             throw new BizException("商品价格不符");
@@ -1091,9 +1081,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 remitFee,
                 courseRemitFee,
                 newCourses,
-                registerPayDto.getBuyMaintenance(),
-                registerPayDto.getBuyCloudTeacher(),
-                registerPayDto.getBuyCloudTeacherPlus(),registerPayDto.getCouponIdList());
+                registerPayDto,musicGroupRegCalender.getId());
         studentPaymentOrder = studentPaymentOrderService.get(studentPaymentOrder.getId());
         orderAmount = studentPaymentOrder.getActualAmount();
         if (amount.compareTo(orderAmount) != 0) {

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

@@ -236,6 +236,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public List<SellOrder> addOrderDetail2SellOrder(List<StudentPaymentOrderDetail> orderDetails,
                                                     StudentPaymentOrder studentPaymentOrder, MusicGroup musicGroup,BigDecimal musicRemitFee) {
+        Integer tenantId = studentPaymentOrder.getTenantId();
         List<SellOrder> sellOrders = new ArrayList<>();
         //总余额支付
         BigDecimal totalBalance = studentPaymentOrder.getBalancePaymentAmount() != null ? studentPaymentOrder.getBalancePaymentAmount() : BigDecimal.ZERO;
@@ -302,6 +303,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                     if (sellOrder.getHasRoute()) {
                         continue;
                     }
+                    sellOrder.setTenantId(tenantId);
                     BigDecimal sellOrderExpectAmount = BigDecimal.ZERO;
                     BigDecimal sellOrderBalance = BigDecimal.ZERO;
                     if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {

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

@@ -18,6 +18,7 @@ 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.tenant.TenantContextHolder;
 import com.ym.mec.util.excel.POIUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -372,7 +373,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             order.setTransNo(rpMap.get("orderNo"));
         }
         order.setPaymentBusinessChannel(rpMap.get("channelType"));
-
+        order.setTenantId(this.get(order.getId()).getTenantId());
         callOrderCallBack(order);
 
         if (status.equals(DealStatusEnum.SUCCESS)

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

@@ -23,6 +23,7 @@ import javax.annotation.Resource;
 
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
@@ -43,34 +44,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.auth.api.enums.CertificateTypeEnum;
-import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
-import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentStudentCourseDetail;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.Organization;
-import com.ym.mec.biz.dal.entity.OrganizationCloudTeacherFee;
-import com.ym.mec.biz.dal.entity.Student;
-import com.ym.mec.biz.dal.entity.StudentCourseFeeDetail;
-import com.ym.mec.biz.dal.entity.StudentInstrument;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
-import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.dal.entity.SubjectChange;
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
-import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
@@ -198,6 +171,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private SysUserCashAccountLogService sysUserCashAccountLogService;
     @Autowired
     private ActivityUserMapperService activityUserMapperService;
+    @Autowired
+    private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
+    @Autowired
+    private MusicGroupPaymentCalenderMemberService musicGroupPaymentCalenderMemberService;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -585,9 +562,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Transactional(rollbackFor = Exception.class)
     public StudentPaymentOrder addOrder(StudentRegistration studentRegistration, BigDecimal amount, String orderNo, String paymentChannel,
                                         List<MusicGroupSubjectGoodsGroup> goodsGroups, BigDecimal remitFee, BigDecimal courseRemitFee,
-                                        List<MusicGroupPaymentCalenderCourseSettings> newCourses, Boolean buyMaintenance, Boolean buyCloudTeacher, Boolean buyCloudTeacherPlus,List<Integer> couponIdList) throws Exception {
+                                        List<MusicGroupPaymentCalenderCourseSettings> newCourses, RegisterPayDto registerPayDto,Long calenderId) throws Exception {
         Date date = new Date();
-        StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(couponIdList,amount,true);
+        StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(registerPayDto.getCouponIdList(),amount,true);
         studentPaymentOrder.setUserId(studentRegistration.getUserId());
         studentPaymentOrder.setGroupType(GroupType.MUSIC);
         studentPaymentOrder.setOrderNo(orderNo);
@@ -595,6 +572,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setPaymentChannel(paymentChannel);
         studentPaymentOrder.setMusicGroupId(studentRegistration.getMusicGroupId());
+        studentPaymentOrder.setCalenderId(calenderId);
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         ArrayList<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<>();
@@ -619,7 +597,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 
                 BigDecimal goodsPrice = new BigDecimal(0);
                 
-                if(studentRegistration.getOrganId() == 55 && (newCourses == null || newCourses.size() == 0) && !(buyCloudTeacher || buyCloudTeacherPlus)){
+                if(studentRegistration.getOrganId() == 55 && (newCourses == null || newCourses.size() == 0) && !registerPayDto.getBuyCloudTeacher()){
                 	//取商品零售价
                     if (StringUtils.isNotBlank(goodsGroup.getGoodsIdList())) {
                     	List<Goods> goodsList = goodsDao.findGoodsByIds(goodsGroup.getGoodsIdList());
@@ -631,7 +609,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 	goodsPrice = goodsGroup.getPrice();
                 }
                 studentPaymentOrderDetail4goodsGroup.setPrice(goodsPrice);
-                
                 studentPaymentOrderDetail4goodsGroup.setGoodsIdList(goodsGroup.getGoodsIdList());
                 studentPaymentOrderDetail4goodsGroup.setCreateTime(date);
                 studentPaymentOrderDetail4goodsGroup.setUpdateTime(date);
@@ -662,7 +639,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderDetailList.add(studentPaymentOrderDetailCourse);
             }
         }
-        if (buyMaintenance) {
+        //乐保
+        if (registerPayDto.getBuyMaintenance()) {
             if ("".equals(maintenanceGoodsId)) {
                 throw new BizException("有乐器才能购买乐保，请核查");
             }
@@ -681,30 +659,33 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             maintenanceOrderDetail.setIsRenew(0);
             studentPaymentOrderDetailList.add(maintenanceOrderDetail);
         }
-
+        //活动
+        List<Long> buyCalenderActivityId = registerPayDto.getBuyCalenderActivityId();
+        if (buyCalenderActivityId != null && buyCalenderActivityId.size() > 0) {
+            List<MusicGroupPaymentCalenderActivity> calenderActivities = musicGroupPaymentCalenderActivityService.findByIds(buyCalenderActivityId);
+            for (MusicGroupPaymentCalenderActivity calenderActivity : calenderActivities) {
+                StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
+                maintenanceOrderDetail.setType("网管课".equals(calenderActivity.getCategoryName())?PRACTICE:VIP);
+                maintenanceOrderDetail.setPrice(calenderActivity.getActualAmount());
+                maintenanceOrderDetail.setRemitFee(BigDecimal.ZERO);
+                maintenanceOrderDetail.setCreateTime(date);
+                maintenanceOrderDetail.setUpdateTime(date);
+                maintenanceOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
+                maintenanceOrderDetail.setIsRenew(0);
+                //保存的是活动编号
+                maintenanceOrderDetail.setStudentInstrumentId(calenderActivity.getId());
+                studentPaymentOrderDetailList.add(maintenanceOrderDetail);
+            }
+        }
         MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
         
         //云教练/云教练+
-        if (buyCloudTeacher || buyCloudTeacherPlus) {
-        	
-        	BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
-        	
-        	if(musicGroup.getCloudTeacherType() != null){
-        		OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-                cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
-        	}else {
-        		MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(studentRegistration.getMusicGroupId());
-                if(musicGroupRegCalender == null){
-                	throw new BizException("缴费信息不存在");
-                }
-                
-                cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
-        	}
-            
+        if (registerPayDto.getBuyCloudTeacher()) {
+            MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberService.findByCalenderId(studentPaymentOrder.getCalenderId());
             OrderDetailTypeEnum orderDetailTypeEnum = OrderDetailTypeEnum.CLOUD_TEACHER;
             StudentPaymentOrderDetail cloudTeacherOrderDetail = new StudentPaymentOrderDetail();
             cloudTeacherOrderDetail.setType(orderDetailTypeEnum);
-            cloudTeacherOrderDetail.setPrice(cloudTeacherPrice);
+            cloudTeacherOrderDetail.setPrice(calenderMember.getActualAmount());
             cloudTeacherOrderDetail.setRemitFee(BigDecimal.ZERO);
             cloudTeacherOrderDetail.setCreateTime(date);
             cloudTeacherOrderDetail.setUpdateTime(date);
@@ -726,7 +707,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
 			int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
 			int paidZeroNum = musicOneSubjectClassPlan.getPaidZeroNum() == null ? 0 : musicOneSubjectClassPlan.getPaidZeroNum();
-			if ((musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) && !buyCloudTeacher && StringUtils.isBlank(maintenanceGoodsId))) {
+			if ((musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) && !registerPayDto.getBuyCloudTeacher() && StringUtils.isBlank(maintenanceGoodsId))) {
 				if (studentRegistration.getPaymentStatus() != YES) {
 					paidZeroFlag = true;
 				}
@@ -1102,6 +1083,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (updateCount <= 0) {
             throw new BizException("订单更新失败");
         }
+        Integer tenantId = studentPaymentOrder.getTenantId();
         Date nowDate = new Date();
 
         //成功报名状态变更
@@ -1160,6 +1142,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
             //添加日志
             StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
+            studentCourseFeeDetail.setTenantId(tenantId);
             studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
             studentCourseFeeDetail.setAmount(courseFee);
             studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
@@ -1184,6 +1167,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
             rechargeDetail.setComAmount(studentPaymentOrder.getComAmount());
             rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount());
+            rechargeDetail.setTenantId(tenantId);
             sysUserCashAccountDetailService.insert(rechargeDetail);
 
             //缴费
@@ -1202,6 +1186,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 rechargeDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
                 rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
             }
+            paymentDetail.setTenantId(tenantId);
             sysUserCashAccountDetailService.insert(paymentDetail);
 
             //销售订单详情
@@ -1333,6 +1318,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (musicGroupRegCalender == null) {
             throw new BizException("报名缴费信息查询失败");
         }
+        Integer tenantId = studentPaymentOrder.getTenantId();
 
         String batchNo = musicGroupRegCalender.getBatchNo();
         Long currentPaymentCalenderId = musicGroupRegCalender.getId();
@@ -1368,6 +1354,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
         for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenderList) {
             MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
+            musicGroupPaymentCalenderDetail.setTenantId(tenantId);
             musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
             musicGroupPaymentCalenderDetail.setUserId(studentPaymentOrder.getUserId());
             musicGroupPaymentCalenderDetail.setResponsibleUserId(musicGroupPaymentCalender.getOperator());
@@ -1422,6 +1409,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
                 musicGroupPaymentStudentCourseDetail.setCreateTime(nowDate);
                 musicGroupPaymentStudentCourseDetail.setUpdateTime(nowDate);
+                musicGroupPaymentStudentCourseDetail.setTenantId(tenantId);
 
                 musicGroupPaymentStudentCourseDetails.add(musicGroupPaymentStudentCourseDetail);
             }

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

@@ -69,11 +69,12 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ChargeType" parameterType="map">
         SELECT ct.*,s.id_ subject_id_,s.name_ subject_name_
-        FROM (SELECT * FROM charge_type WHERE del_flag_ = 0 <include refid="global.limit"/>) ct
+        FROM charge_type ct
         LEFT JOIN charge_type_subject_mapper ctsm ON ct.id_ = ctsm.charge_type_id_
         LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
-        where ct.tenant_id_ = #{tenantId}
+        where ct.tenant_id_ = #{tenantId} and ct.del_flag_ = 0
         ORDER BY ct.update_time_
+        <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->

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

@@ -50,20 +50,17 @@
     </resultMap>
 
     <select id="get" resultMap="CloudTeacherOrder">
-        <!--@mbg.generated-->
         select * from cloud_teacher_order where id_ = #{id}
     </select>
     <delete id="delete">
-        <!--@mbg.generated-->
         delete from cloud_teacher_order
         where id_ = #{id}
     </delete>
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.CloudTeacherOrder"
             useGeneratedKeys="true">
-        <!--@mbg.generated-->
-        insert into cloud_teacher_order (organ_id_,student_id_, type_, level_, time_, amount_, refund_amount_, status_,
+        INSERT INTO cloud_teacher_order (organ_id_,student_id_, type_, level_, time_, amount_, refund_amount_, status_,
         order_id_,platform_order_id_,start_time_,end_time_,remark_, create_time_, update_time_,music_group_id_,active_remark_,tenant_id_)
-        values (#{organId},#{studentId}, #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{level}, #{time}, #{amount}, #{refundAmount},
+        VALUES (#{organId},#{studentId}, #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{level}, #{time}, #{amount}, #{refundAmount},
         #{status},#{orderId},#{platformOrderId},#{startTime},#{endTime}, #{remark}, NOW(), NOW(),#{musicGroupId},#{activeRemark},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.CloudTeacherOrder">

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

@@ -37,7 +37,7 @@
 		(course_schedule_id_,operator_id_,previous_course_schedule_,current_course_schedule_,create_time_,tenant_id_)
 		VALUES
 		<foreach collection="scheduleModifyLogs" item="item" separator=",">
-			(#{item.courseScheduleId},#{item.operatorId},#{item.previousCourseSchedule},#{item.currentCourseSchedule},#{item.createTime},#{tenantId})
+			(#{item.courseScheduleId},#{item.operatorId},#{item.previousCourseSchedule},#{item.currentCourseSchedule},#{item.createTime},#{item.tenantId})
 		</foreach>
 	</insert>
 	<sql id="queryPageSql">

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

@@ -713,6 +713,12 @@
             <if test="status != null">
                 AND mgpc.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
+            <if test="organId != null and organId != ''">
+                AND FIND_IN_SET(mgpc.organ_id_,#{organId})
+            </if>
+            <if test="tenantId != null">
+                AND mgpc.tenant_id_ = #{tenantId}
+            </if>
         </where>
     </sql>
     <select id="countCalender" resultType="java.lang.Integer">

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

@@ -59,15 +59,12 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO student_payment_order_detail
-        (id_,type_,goods_id_list_,price_,create_time_,update_time_,payment_order_id_,kit_group_purchase_type_,student_instrument_id_,is_renew_,tenant_id_)
-        VALUES(#{id},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goodsIdList},#{price},now(),now(),
-        #{paymentOrderId},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentInstrumentId},#{isRenew},#{tenantId})
+        (type_,goods_id_list_,price_,create_time_,update_time_,payment_order_id_,kit_group_purchase_type_,
+         student_instrument_id_,is_renew_,tenant_id_)
+        VALUES(#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goodsIdList},#{price},now(),now(),
+        #{paymentOrderId},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+               #{studentInstrumentId},#{isRenew},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -121,12 +118,14 @@
 
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         INSERT INTO student_payment_order_detail
-        (id_,type_,goods_id_list_,price_,remit_fee_,create_time_,update_time_,payment_order_id_,kit_group_purchase_type_,student_instrument_id_,is_renew_,tenant_id_)
+        (type_,goods_id_list_,price_,remit_fee_,create_time_,update_time_,payment_order_id_,
+         kit_group_purchase_type_,student_instrument_id_,is_renew_,tenant_id_)
         VALUE
         <foreach collection="studentPaymentOrderDetailList" item="orderDetail" separator=",">
-            (#{orderDetail.id},#{orderDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            (#{orderDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{orderDetail.goodsIdList},#{orderDetail.price},#{orderDetail.remitFee},now(),now(),#{orderDetail.paymentOrderId},
-            #{orderDetail.kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{orderDetail.studentInstrumentId},#{orderDetail.isRenew},#{orderDetail.tenantId})
+            #{orderDetail.kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{orderDetail.studentInstrumentId},#{orderDetail.isRenew},#{orderDetail.tenantId})
         </foreach>
     </insert>
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -228,6 +228,54 @@ public class MusicGroupController extends BaseController {
         return succeed(studentRegistration);
     }
 
+    @ApiOperation(value = "申请退团")
+    @PostMapping("/quitMusicGroup")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "reason", value = "原因", required = true, dataType = "String")})
+    public HttpResponseResult quitMusicGroup(String musicGroupId, String reason) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		MusicGroupQuit musicGroupQuit = new MusicGroupQuit();
+		musicGroupQuit.setUserId(sysUser.getId());
+		musicGroupQuit.setMusicGroupId(musicGroupId);
+		musicGroupQuit.setUserComment(reason);
+		musicGroupQuit.setStatus(ApprovalStatus.PROCESSING);
+        return succeed(musicGroupService.applyQuitMusicGroup(null, musicGroupQuit, sysUser.getId()));
+    }
+
+    @ApiOperation(value = "取消退团申请")
+    @PostMapping("/cancelQuitMusicGroup")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "reason", value = "取消原因", required = true, dataType = "String")})
+    public HttpResponseResult cancelQuitMusicGroup(String musicGroupId, String reason) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Integer userId = sysUser.getId();
+
+        return succeed(musicGroupService.cancelQuitMusicGroup(userId, musicGroupId, reason));
+    }
+
+    @ApiOperation(value = "查询是否有待支付的报名订单")
+    @GetMapping("/checkWaitPayApplyOrder")
+    @ApiImplicitParams({@ApiImplicitParam(name = "registerId", value = "注册id", required = true, dataType = "int")})
+    public HttpResponseResult<StudentPaymentOrder> checkWaitPayApplyOrder(Long registerId) throws Exception {
+
+        StudentRegistration studentRegistration = studentRegistrationService.get(registerId);
+        if (studentRegistration == null) {
+            return failed("报名信息有误，请核查");
+        }
+        Integer userId = studentRegistration.getUserId();
+
+        //判断用户是否已存在订单
+        List<StudentPaymentOrder> applyOrderList = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId(), DealStatusEnum.ING);
+        
+        if(applyOrderList != null && applyOrderList.size() > 0){
+        	return succeed(applyOrderList.get(0));
+        }
+        return succeed(null);
+    }
+
     @ApiOperation(value = "续费")
     @PostMapping("/renew")
     public HttpResponseResult renew(@RequestBody RenewParamDto renewParamDto) throws Exception {
@@ -280,54 +328,6 @@ public class MusicGroupController extends BaseController {
         return succeed(renew);
     }
 
-    @ApiOperation(value = "申请退团")
-    @PostMapping("/quitMusicGroup")
-    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "reason", value = "原因", required = true, dataType = "String")})
-    public HttpResponseResult quitMusicGroup(String musicGroupId, String reason) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		MusicGroupQuit musicGroupQuit = new MusicGroupQuit();
-		musicGroupQuit.setUserId(sysUser.getId());
-		musicGroupQuit.setMusicGroupId(musicGroupId);
-		musicGroupQuit.setUserComment(reason);
-		musicGroupQuit.setStatus(ApprovalStatus.PROCESSING);
-        return succeed(musicGroupService.applyQuitMusicGroup(null, musicGroupQuit, sysUser.getId()));
-    }
-
-    @ApiOperation(value = "取消退团申请")
-    @PostMapping("/cancelQuitMusicGroup")
-    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "reason", value = "取消原因", required = true, dataType = "String")})
-    public HttpResponseResult cancelQuitMusicGroup(String musicGroupId, String reason) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer userId = sysUser.getId();
-
-        return succeed(musicGroupService.cancelQuitMusicGroup(userId, musicGroupId, reason));
-    }
-
-    @ApiOperation(value = "查询是否有待支付的报名订单")
-    @GetMapping("/checkWaitPayApplyOrder")
-    @ApiImplicitParams({@ApiImplicitParam(name = "registerId", value = "注册id", required = true, dataType = "int")})
-    public HttpResponseResult<StudentPaymentOrder> checkWaitPayApplyOrder(Long registerId) throws Exception {
-
-        StudentRegistration studentRegistration = studentRegistrationService.get(registerId);
-        if (studentRegistration == null) {
-            return failed("报名信息有误，请核查");
-        }
-        Integer userId = studentRegistration.getUserId();
-
-        //判断用户是否已存在订单
-        List<StudentPaymentOrder> applyOrderList = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId(), DealStatusEnum.ING);
-        
-        if(applyOrderList != null && applyOrderList.size() > 0){
-        	return succeed(applyOrderList.get(0));
-        }
-        return succeed(null);
-    }
-
     @ApiOperation(value = "乐团报名支付")
     @PostMapping("/pay")
     public HttpResponseResult pay(@RequestBody RegisterPayDto registerPayDto) throws Exception {
@@ -341,7 +341,7 @@ public class MusicGroupController extends BaseController {
         }
         registerPayDto.setUserId(studentRegistration.getUserId());
         registerPayDto.setMusicGroupId(studentRegistration.getMusicGroupId());
-        return succeed(musicGroupService.pay(registerPayDto));
+        return musicGroupService.pay(registerPayDto);
     }
 
     @ApiOperation(value = "乐团报名重新支付")