学员活动购买

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

@@ -25,6 +25,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 //    SMS_WITHDRAW_SUCCESS("SMS_WITHDRAW_SUCCESS", "提现成功"),
 //    SMS_MUSIC_GROUP_CLOSE("SMS_MUSIC_GROUP_CLOSE", "乐团关闭(关闭后)"),
 
+    PUSH_STUDENT_BUY_MEMBER_ACTIVITY("PUSH_STUDENT_BUY_MEMBER_ACTIVITY", "活动购买成功"),
+    PUSH_SYSTEM_ACTIVITY_MEMBER("PUSH_SYSTEM_ACTIVITY_MEMBER", "待激活通知"),
     PUSH_STUDENT_BUY_ACTIVITY("PUSH_STUDENT_BUY_ACTIVITY", "活动购买成功"),
     PUSH_SYSTEM_ACTIVITY_COURSE("PUSH_SYSTEM_ACTIVITY_COURSE", "待排课通知"),
     PUSH_TEACHER_ACTIVITY_COURSE("PUSH_TEACHER_ACTIVITY_COURSE", "待排课通知"),

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

@@ -77,6 +77,8 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	private SysMessageService sysMessageService;
 	@Autowired
 	private StudentDao studentDao;
+	@Autowired
+	private TenantConfigService tenantConfigService;
 
 	@Override
 	public BaseDAO<Integer, VipGroupActivity> getDAO() {
@@ -641,33 +643,59 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		Integer userId = studentPaymentOrder.getUserId();
 		VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(Integer.parseInt(studentPaymentOrder.getActivityId()));
 		String activityName = vipGroupActivity.getName();
-		SysUser user = teacherDao.getUser(userId);
-		String username = StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername();
-		Map<Integer, String> map = new HashMap<>(1);
-		map.put(userId, userId.toString());
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_STUDENT_BUY_ACTIVITY, map, null, 0,null, "STUDENT",
-				activityName);
-		//获取乐团主管
-		Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
-		if(CollectionUtils.isEmpty(eduMap)){
-			Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, studentPaymentOrder.getOrganId());
-			eduMap = new HashMap<>(integers.size());
-			if(!CollectionUtils.isEmpty(integers)){
-				for (Integer integer : integers) {
-					eduMap.put(integer,integer.toString());
+		if(vipGroupActivity.getActivityType().equals(0)) {
+			SysUser user = teacherDao.getUser(userId);
+			String username = StringUtils.isEmpty(user.getUsername()) ? user.getRealName() : user.getUsername();
+			Map<Integer, String> map = new HashMap<>(1);
+			map.put(userId, userId.toString());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_STUDENT_BUY_ACTIVITY, map, null, 0, null, "STUDENT",
+					activityName);
+			//获取乐团主管
+			Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
+			if (CollectionUtils.isEmpty(eduMap)) {
+				Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, studentPaymentOrder.getOrganId());
+				eduMap = new HashMap<>(integers.size());
+				if (!CollectionUtils.isEmpty(integers)) {
+					for (Integer integer : integers) {
+						eduMap.put(integer, integer.toString());
+					}
+				}
+			}
+			if (!CollectionUtils.isEmpty(eduMap)) {
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_COURSE,
+						eduMap, null, 0, null, "SYSTEM", username, activityName);
+			}
+			Student student = studentDao.get(userId);
+			if (Objects.nonNull(student) && student.getTeacherId() != null) {
+				Map<Integer, String> teacherMap = new HashMap<>(1);
+				teacherMap.put(student.getTeacherId(), student.getTeacherId().toString());
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
+						teacherMap, null, 0, null, "TEACHER", username, activityName);
+			}
+		}else {
+			SysUser user = teacherDao.getUser(userId);
+			String username = StringUtils.isEmpty(user.getUsername()) ? user.getRealName() : user.getUsername();
+			Map<Integer, String> map = new HashMap<>(1);
+			map.put(userId, userId.toString());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_STUDENT_BUY_MEMBER_ACTIVITY, map, null, 0, null, "STUDENT",
+					activityName);
+			if(!tenantConfigService.autoActivationFlag(user.getTenantId())){
+				//获取乐团主管
+				Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
+				if (CollectionUtils.isEmpty(eduMap)) {
+					Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, studentPaymentOrder.getOrganId());
+					eduMap = new HashMap<>(integers.size());
+					if (!CollectionUtils.isEmpty(integers)) {
+						for (Integer integer : integers) {
+							eduMap.put(integer, integer.toString());
+						}
+					}
+				}
+				if (!CollectionUtils.isEmpty(eduMap)) {
+					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_MEMBER,
+							eduMap, null, 0, null, "SYSTEM", username, activityName);
 				}
 			}
-		}
-		if(!CollectionUtils.isEmpty(eduMap)){
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_COURSE,
-					eduMap,null,0,null,"SYSTEM",username,activityName);
-		}
-		Student student = studentDao.get(userId);
-		if(Objects.nonNull(student) && student.getTeacherId() != null){
-			Map<Integer, String> teacherMap = new HashMap<>(1);
-			teacherMap.put(student.getTeacherId(), student.getTeacherId().toString());
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
-					teacherMap,null,0,null,"TEACHER",username,activityName);
 		}
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/CloudTeacherOrderController.java

@@ -93,11 +93,4 @@ public class CloudTeacherOrderController extends BaseController {
     public HttpResponseResult<Boolean> payCheck(@RequestParam String orderNo) {
         return succeed(cloudTeacherOrderService.payCheck(orderNo));
     }
-
-    @ApiOperation(value = "测试短信")
-    @GetMapping("/testsms")
-    public HttpResponseResult<Integer> testsms(@RequestParam String orderNo) throws Exception {
-        TenantOrderRecord tor = tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>().hasEq("order_no_", orderNo).queryWrapper());
-        return succeed(cloudTeacherOrderService.sendSms(tor));
-    }
 }