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

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

@@ -86,7 +86,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if(Objects.nonNull(queryInfo.getStartDate())){
 			startDate = LocalDateTime.ofInstant(queryInfo.getStartDate().toInstant(), DateUtil.zoneId).toLocalDate();
 		}
-
+		startDate = startDate.plusDays(-180);
 		LocalDate endDate = nowDate.plusDays(-1);
 		if(Objects.nonNull(queryInfo.getEndDate())){
 			endDate = LocalDateTime.ofInstant(queryInfo.getEndDate().toInstant(), DateUtil.zoneId).toLocalDate();
@@ -277,6 +277,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 			IndexBaseDto indexBaseData = new IndexBaseDto(typeDateMapEntry.getKey(),typeDateMapEntry.getKey().getMsg());
 			indexBaseData.setIndexMonthData(value, currentMonth);
+			indexBaseData.setPercent(value.stream().map(IndexBaseMonthData::getPercent).reduce(BigDecimal.ZERO, BigDecimal::add));
 			if(OTHER_AMOUNT.equals(typeDateMapEntry.getKey())){
 				List<IndexBaseMonthData> otherAmountDetails = new ArrayList<>();
 				if(value != null && value.size() > 0){
@@ -310,6 +311,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 					}
 				}
 			}
+
 			result.add(indexBaseData);
 		}
 		return result;

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

@@ -156,6 +156,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 				MusicGroupSchoolTermStudentCourseDetail studentCourseDetail = new MusicGroupSchoolTermStudentCourseDetail();
 				studentCourseDetail.setMusicGroupSchoolTermCourseDetailId(courseDetail.getId());
 				studentCourseDetail.setMemberCourseMinutes(courseDetail.getTotalCourseTime());
+				studentCourseDetail.setTenantId(musicGroup.getTenantId());
 				//获取乐团所有在读学员
 				List<Integer> studentIds = studentRegistrationDao.queryNormalUserList(musicGroupId);
 				if(studentIds == null || studentIds.size() == 0){

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

@@ -86,6 +86,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
             //如果以上操作都没有 则应该是这一个，因为老代码就是这样写的。
             if (Objects.isNull(function)) {
                 StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findOrderByOrderNo(payParam.getOrderNo());
+                payParam.setTenantId(studentPaymentOrder.getTenantId());
                 payment = checkOrderAndGetParam(payParam,
                         studentPaymentOrder,
                         StudentPaymentOrder::getStatus,
@@ -121,10 +122,8 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
     // 机构充值
     private Map<String, Object> tenantRecharge(PaymentParam payParam) {
-        Map<String, Object> payment;
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
-        payParam.setTenantId(tenantOrderRecord.getTenantId());
-        payment = checkOrderGetPayment(payParam, tenantOrderRecord);
+        Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         //主动延迟检查订单
         log.info("executePayment delayCheckTenantRecharge >>>>> ");
         delayCheckTenantRecharge(tenantOrderRecord);
@@ -134,7 +133,6 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     // 云教练支付
     private Map<String, Object> cloudTeacherOrder(PaymentParam payParam) {
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
-        payParam.setTenantId(tenantOrderRecord.getTenantId());
         Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         // 云教练支付 主动延迟检查订单
         log.info("executePayment delayCheckCloudTeacherOrder >>>>> ");
@@ -145,7 +143,6 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     //机构开通、续费付款
     private Map<String, Object> openOrRenew(PaymentParam payParam) {
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
-        payParam.setTenantId(tenantOrderRecord.getTenantId());
         Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         //主动延迟检查订单
         delayCheckTenant();
@@ -161,6 +158,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     //获取支付数据
     private Map<String, Object> checkOrderGetPayment(PaymentParam payParam, TenantOrderRecord tenantOrderRecord) {
         Map<String, Object> payment;
+        payParam.setTenantId(tenantOrderRecord.getTenantId());
         try {
             payment = checkOrderAndGetParam(payParam,
                     tenantOrderRecord,

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

@@ -41,7 +41,7 @@
 		(music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="studentIds" item="userId" separator=",">
-			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW(),#{tenantId})
+			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW(),#{studentCourseDetail.tenantId})
 		</foreach>
 	</insert>