update

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/IndexDataType.java

@@ -74,15 +74,15 @@ public enum IndexDataType implements BaseEnum<String, IndexDataType> {
     //活跃用户统计
     ORGAN_TOTAL_STUDENT_NUM("ORGAN_TOTAL_STUDENT_NUM", "分部学员总数", false, false),
     CLOUD_STUDY_LIVELY_STUDENT_NUM("CLOUD_STUDY_LIVELY_STUDENT_NUM", "活跃用户", false, false),
-    CLOUD_STUDY_DAY_USE_STUDENT_NUM("CLOUD_STUDY_DAY_USE_STUDENT_NUM", "云教练使用用户", false, false),
-    CLOUD_STUDY_NEW_STUDENT_NUM("CLOUD_STUDY_NEW_STUDENT_NUM", "云教练新增用户", false, false),
-    CLOUD_NEW_STUDENT_NUM("CLOUD_NEW_STUDENT_NUM", "云教练新用户人数", false, false),
+    CLOUD_STUDY_DAY_USE_STUDENT_NUM("CLOUD_STUDY_DAY_USE_STUDENT_NUM", "团练宝使用用户", false, false),
+    CLOUD_STUDY_NEW_STUDENT_NUM("CLOUD_STUDY_NEW_STUDENT_NUM", "团练宝新增用户", false, false),
+    CLOUD_NEW_STUDENT_NUM("CLOUD_NEW_STUDENT_NUM", "团练宝新用户人数", false, false),
     MEMBER_STUDENT_NUM("MEMBER_STUDENT_NUM", "会员数量", false, false),
     EXPERIENCE_MEMBER_STUDENT_NUM("EXPERIENCE_MEMBER_STUDENT_NUM", "试用会员数量", false, false),
     NEW_MEMBER_STUDENT_NUM("NEW_MEMBER_STUDENT_NUM", "新增会员数量", false, false),
 
-    CLOUD_STUDY_TRAIN_NUM("CLOUD_STUDY_TRAIN_NUM", "云教练训练次数", false, false),
-    CLOUD_STUDY_TRAIN_TIME("CLOUD_STUDY_TRAIN_TIME", "云教练训练时长", false, false),
+    CLOUD_STUDY_TRAIN_NUM("CLOUD_STUDY_TRAIN_NUM", "团练宝训练次数", false, false),
+    CLOUD_STUDY_TRAIN_TIME("CLOUD_STUDY_TRAIN_TIME", "团练宝训练时长", false, false),
     ;
 
     private String code;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -185,19 +185,19 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     BACKSTAGE_STUDENT_APPLY_WITHDRAW("BACKSTAGE_STUDENT_APPLY_WITHDRAW", "学员申请提现"),
     CHILDREN_DAY_NOTICE_PUSH("CHILDREN_DAY_NOTICE_PUSH", "技能评测考级报名推送"),
     CHILDREN_DAY_NOTICE_MSG("CHILDREN_DAY_NOTICE_MSG", "技能评测考级报名短信"),
-    NO_BUY_CLOUD_TEACHER_MSG("NO_BUY_CLOUD_TEACHER_MSG", "未购买买云教练短信"),
+    NO_BUY_CLOUD_TEACHER_MSG("NO_BUY_CLOUD_TEACHER_MSG", "未购买买团练宝短信"),
     OA_NOTICE_PUSH("OA_NOTICE_PUSH", "待审批提醒"),
     OA_CC_NOTICE_PUSH("OA_CC_NOTICE_PUSH", "审批抄送提醒"),
 
-    //云教练
-    TRAIN_NO_RANK_STUDENT_PUSH("TRAIN_NO_RANK_STUDENT_PUSH", "云教练训练提醒"),
-    TRAIN_RANK_STUDENT_PUSH("TRAIN_RANK_STUDENT_PUSH", "云教练训练提醒"),
-    NO_TRAIN_STUDENT_PUSH("NO_TRAIN_STUDENT_PUSH", "云教练训练提醒"),
+    //团练宝
+    TRAIN_NO_RANK_STUDENT_PUSH("TRAIN_NO_RANK_STUDENT_PUSH", "团练宝训练提醒"),
+    TRAIN_RANK_STUDENT_PUSH("TRAIN_RANK_STUDENT_PUSH", "团练宝训练提醒"),
+    NO_TRAIN_STUDENT_PUSH("NO_TRAIN_STUDENT_PUSH", "团练宝训练提醒"),
 
     COUPON_STOCK_WARNING("COUPON_STOCK_WARNING", "优惠券库存预警"),
 
     APP_REDEMPTION_CODE("APP_REDEMPTION_CODE", "兑换码分配量预警"),
-    CLOUD_TEACHER_ORDER_SUCCESS("CLOUD_TEACHER_ORDER_SUCCESS", "云教练激活成功"),
+    CLOUD_TEACHER_ORDER_SUCCESS("CLOUD_TEACHER_ORDER_SUCCESS", "团练宝激活成功"),
 
     EMAIL_TENANT_ACTIVATION_SUCCESSFUL("EMAIL_TENANT_ACTIVATION_SUCCESSFUL",   "开通成功"),
     EMAIL_TENANT_RENEWAL_SUCCESSFUL("EMAIL_TENANT_RENEWAL_SUCCESSFUL", "续费成功"),

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

@@ -288,7 +288,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             }
         }
         bucket.delete();
-        log.info(" 云教练 支付 失败 >>>>> {} ", i);
+        log.info(" 团练宝 支付 失败 >>>>> {} ", i);
         return false;
     }
 
@@ -422,14 +422,14 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacher.setEndTime(endTime);
             cloudTeacher.setUpdateTime(nowDate);
             if (cloudTeacherDao.update(cloudTeacher) <= 0) {
-                throw new BizException("云教练有效期更新失败");
+                throw new BizException("团练宝有效期更新失败");
             }
         }
         cloudTeacherOrder.setStartTime(endBaseTime);
         cloudTeacherOrder.setEndTime(endTime);
         cloudTeacherOrder.setStatus(1);
         if (cloudTeacherOrderDao.update(cloudTeacherOrder) <= 0) {
-            throw new BizException("云教练生效处理失败");
+            throw new BizException("团练宝生效处理失败");
         }
         return cloudTeacher;
     }
@@ -466,11 +466,11 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         for (int i = 0; i < cloudTeacherOrders.size(); i++) {
             CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrders.get(i);
             if (cloudTeacherOrder.getStatus().equals(3)) {
-                throw new BizException("云教练已退，请勿重复退");
+                throw new BizException("团练宝已退，请勿重复退");
             }
             if (cloudTeacherOrder.getStatus().equals(2) && DateUtil.stringToDate(DateUtil.format(cloudTeacherOrder.getEndTime(),DateUtil.ISO_EXPANDED_DATE_FORMAT),DateUtil.ISO_EXPANDED_DATE_FORMAT).compareTo(
                     DateUtil.stringToDate(DateUtil.format(nowDate,DateUtil.ISO_EXPANDED_DATE_FORMAT),DateUtil.ISO_EXPANDED_DATE_FORMAT)) < 0) {
-                throw new BizException("云教练已过服务期，不可退费");
+                throw new BizException("团练宝已过服务期，不可退费");
             }
             Integer oldStatus = cloudTeacherOrder.getStatus();
             cloudTeacherOrder.setStatus(3);
@@ -481,7 +481,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             }
             cloudTeacherOrder.setUpdateTime(nowDate);
             if (cloudTeacherOrderDao.update(cloudTeacherOrder) <= 0) {
-                throw new BizException("云教练退费处理失败，请重试");
+                throw new BizException("团练宝退费处理失败，请重试");
             }
 
             if (oldStatus.equals(1)) {
@@ -494,7 +494,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
                 cloudTeacher.setEndTime(endDate);
                 cloudTeacher.setUpdateTime(nowDate);
                 if (cloudTeacherDao.update(cloudTeacher) <= 0) {
-                    throw new BizException("云教练服务有效期更新失败，请重试");
+                    throw new BizException("团练宝服务有效期更新失败，请重试");
                 }
             }
         }
@@ -505,18 +505,18 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     public Boolean quitCloudTeacherOrder(CloudTeacherOrder cloudOrder, BigDecimal refundAmount) {
         Date nowDate = new Date();
         if (cloudOrder.getStatus().equals(3)) {
-            throw new BizException("云教练已退，请勿重复退");
+            throw new BizException("团练宝已退，请勿重复退");
         }
         if (cloudOrder.getStatus().equals(2) && DateUtil.stringToDate(DateUtil.format(cloudOrder.getEndTime(),DateUtil.ISO_EXPANDED_DATE_FORMAT),DateUtil.ISO_EXPANDED_DATE_FORMAT).compareTo(
                 DateUtil.stringToDate(DateUtil.format(nowDate,DateUtil.ISO_EXPANDED_DATE_FORMAT),DateUtil.ISO_EXPANDED_DATE_FORMAT)) < 0) {
-            throw new BizException("云教练已过服务期，不可退费");
+            throw new BizException("团练宝已过服务期，不可退费");
         }
         Integer oldStatus = cloudOrder.getStatus();
         cloudOrder.setStatus(3);
         cloudOrder.setRefundAmount(refundAmount);
         cloudOrder.setUpdateTime(nowDate);
         if (cloudTeacherOrderDao.update(cloudOrder) <= 0) {
-            throw new BizException("云教练退费处理失败，请重试");
+            throw new BizException("团练宝退费处理失败，请重试");
         }
 
         if (oldStatus.equals(1)) {
@@ -528,7 +528,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         cloudTeacher.setEndTime(endDate);
         cloudTeacher.setUpdateTime(nowDate);
         if (cloudTeacherDao.update(cloudTeacher) <= 0) {
-            throw new BizException("云教练服务有效期更新失败，请重试");
+            throw new BizException("团练宝服务有效期更新失败，请重试");
         }
         return true;
     }

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

@@ -364,7 +364,7 @@ public class ExportServiceImpl implements ExportService {
         try {
             if(isPlatformUser){
                 String[] header = {"序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额",
-                        "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费",
+                        "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "团练宝", "押金", "乐器", "教辅费用", "上门费",
                         "账户充值", "其它", "汇付手续费","平台手续费", "到账时间",
                         "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
                 
@@ -375,7 +375,7 @@ public class ExportServiceImpl implements ExportService {
                 workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
             }else{
                 String[] header = {"序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额",
-                        "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费",
+                        "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "团练宝", "押金", "乐器", "教辅费用", "上门费",
                         "账户充值", "其它","平台手续费", "到账时间",
                         "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
                 
@@ -874,7 +874,7 @@ public class ExportServiceImpl implements ExportService {
         	if(isPlatformUser){
                 String[] header = {"序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额",
                         "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "乐团课", "VIP课", "网管课", "乐理课",
-                        "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "汇付手续费", "平台手续费", "到账时间",
+                        "考级", "维修费用", "乐保费用", "团练宝", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "汇付手续费", "平台手续费", "到账时间",
                         "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
                 String[] body = {"id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount"
                         , "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",
@@ -885,7 +885,7 @@ public class ExportServiceImpl implements ExportService {
         	}else{
                 String[] header = {"序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额",
                         "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "乐团课", "VIP课", "网管课", "乐理课",
-                        "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "平台手续费", "到账时间",
+                        "考级", "维修费用", "乐保费用", "团练宝", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "平台手续费", "到账时间",
                         "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
                 String[] body = {"id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount"
                         , "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",

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

@@ -109,7 +109,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public HttpResponseResult buy(MemberPayParamDto memberPayParamDto) throws Exception {
-		logger.info("云教练购买:memberPayParamDto:{} ",memberPayParamDto);
+		logger.info("团练宝购买:memberPayParamDto:{} ",memberPayParamDto);
 		Long paymentId = memberPayParamDto.getPaymentId();
 		CloudCoachPaymentProgram cloudCoachPaymentProgram = cloudCoachPaymentProgramService.get(paymentId);
 		if(cloudCoachPaymentProgram == null){
@@ -241,7 +241,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 		if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
 			CloudCoachPaymentProgram cloudCoachPaymentProgram = cloudCoachPaymentProgramService.get(Long.parseLong(studentPaymentOrder.getMusicGroupId()));
 			StudentCloudCoachPaymentDetails coachPaymentDetails = studentCloudCoachPaymentDetailsService.findByUserId(cloudCoachPaymentProgram.getId(),studentPaymentOrder.getUserId());
-			//保存云教练数据
+			//保存团练宝数据
 			CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
 			cloudTeacherOrder.setOrderId(studentPaymentOrder.getId());
 			cloudTeacherOrder.setLevel(cloudCoachPaymentProgram.getMemberRankSettingId());
@@ -321,10 +321,10 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			if(repay){
 				//处理关闭订单
 				applyOrder.setStatus(DealStatusEnum.CLOSE);
-				applyOrder.setMemo("关闭云教练活动订单");
+				applyOrder.setMemo("关闭团练宝活动订单");
 				if (applyOrder.getBalancePaymentAmount() != null && applyOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
 					sysUserCashAccountService.updateBalance(applyOrder.getUserId(), applyOrder.getBalancePaymentAmount(),
-							PlatformCashAccountDetailTypeEnum.REFUNDS, "购买云教练活动支付失败");
+							PlatformCashAccountDetailTypeEnum.REFUNDS, "购买团练宝活动支付失败");
 				}
 				studentPaymentOrderService.update(applyOrder);
 			}else {
@@ -348,7 +348,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 		return this.buy(memberPayParamDto);
 	}
 
-	//云教练活动赠送优惠券
+	//团练宝活动赠送优惠券
 	public void cloudTeacherActiveGiveCoupon(CloudTeacherOrder cloudTeacherOrder){
 		Integer activeRemark = cloudTeacherOrder.getActiveRemark();
 		String remark = cloudTeacherOrder.getRemark();

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

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(tags = "云教练缴费项目")
+@Api(tags = "团练宝缴费项目")
 @RequestMapping("cloudCoachPaymentProgram")
 @RestController
 public class CloudCoachPaymentProgramController extends BaseController {
@@ -36,12 +36,12 @@ public class CloudCoachPaymentProgramController extends BaseController {
     public Object get(Long id){
         CloudCoachPaymentProgram cloudCoachPaymentProgram = cloudCoachPaymentProgramService.get(id);
         if(cloudCoachPaymentProgram == null){
-            throw new BizException("云教练缴费项目不存在，请联系指导老师");
+            throw new BizException("团练宝缴费项目不存在，请联系指导老师");
         }
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         StudentCloudCoachPaymentDetails studentCloudCoachPaymentDetails = studentCloudCoachPaymentDetailsService.findByUserId(id, sysUser.getId());
         if(studentCloudCoachPaymentDetails == null){
-            throw new BizException("您不在当前云教练缴费项目中，请联系指导老师");
+            throw new BizException("您不在当前团练宝缴费项目中，请联系指导老师");
         }
         MemberRankSetting memberRankSetting = memberRankSettingService.get(cloudCoachPaymentProgram.getMemberRankSettingId());
         cloudCoachPaymentProgram.setMemberIntro(memberRankSetting.getIntro());