Merge branch 'saas_2022_05_17_activity' of http://git.dayaedu.com/yonge/mec into zouxuan-2022-05-27

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

@@ -132,6 +132,9 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_PUSH_VIP_COURSE_APPLY_RESULT("TEACHER_PUSH_VIP_COURSE_APPLY_RESULT", "VIP课申请结果"),
     TEACHER_PUSH_VIP_COURSE_ADD("TEACHER_PUSH_VIP_COURSE_ADD", "VIP课新增"),
 
+    GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_PUSH("GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_PUSH", "好习惯养成训练营体验资格"),
+    GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_SMS("GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_SMS", "好习惯养成训练营体验资格"),
+
 
     //    EDUCATION_PUSH_MUSIC_GROUP_FOUND("EDUCATION_PUSH_MUSIC_GROUP_FOUND", "乐团成立"),
 //    EDUCATION_PUSH_MUSIC_GROUP_CLOSE("EDUCATION_PUSH_MUSIC_GROUP_CLOSE", "乐团关闭"),

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

@@ -108,8 +108,7 @@ public class ImLiveRoomReservationServiceImpl extends ServiceImpl<ImLiveRoomRese
             return;
         }
         SysUser user = getUser(room.getSpeakerId());
-        String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-        String memo = "10?" + baseUrl + "/#/live?roomUid=" + room.getRoomUid();
+        String memo = "10?roomUid=" + room.getRoomUid();
         Map<Integer, String> pushStudentList = new HashMap<>();
         for (ImLiveRoomReservation obj : list) {
             pushStudentList.put(obj.getUserId(), obj.getUserId().toString());

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

@@ -18,7 +18,9 @@ import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import com.ym.mec.util.http.HttpUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.LocalDate;
@@ -658,6 +660,17 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 //                    sysCouponCodeService.exchangeCoupon(userId,giveCouponId,
 //                            studentPaymentOrder.getId(),giveCouponNum,2,null);
 //                }
+                Map<Integer, String> phoneMaps = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(userId.toString()));
+                String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+                StringBuffer pushUrl = new StringBuffer(baseApiUrl).append("/#/artistRegistration");
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_CLOUD_PAYMENT,phoneMaps,
+                        null,0,"",null, HttpUtil.getSortUrl(pushUrl.toString()));
+
+                StringBuffer notifyUrl = new StringBuffer("8?").append(baseApiUrl).append("/#/artistRegistration");
+                Map<Integer, String> userIdMaps = new HashMap<>(1);
+                userIdMaps.put(userId, userId.toString());
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_PUSH,userIdMaps,
+                        null,0,notifyUrl.toString(),"STUDENT");
             }else {
                 //齐齐哈尔购买成功默认激活
                 // 活动时间:

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

@@ -103,7 +103,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         int count = tempLittleArtistTrainingCampUserRelationService.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getActivityId, entity.getId()));
         if (count > 0) {
-            throw new BizException("训练营已有学生报名，无法删除");
+            throw new BizException("训练营已有学生报名，无法修改");
         }
         entity.setName(dto.getName());
         entity.setApplyStartDate(dto.getApplyStartDate());

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageUtil.java

@@ -40,12 +40,12 @@ public class PageUtil {
         int limit = Integer.parseInt(String.valueOf(source.getSize()));
         PageInfo<T> resultPage = new PageInfo<>();
         resultPage.setRows(source.getRecords());
+        resultPage.setPageNo(Long.valueOf(source.getCurrent()).intValue());
         resultPage.setLimit(limit);
         resultPage.setTotal(total);
         return resultPage;
     }
 
-
     /**
      * 获取Map中的关键字获取分页数据
      *

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -92,6 +92,10 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		android_extras.put("url", url);
 		android_extras.put("memo", url);
 		android.put("extras", android_extras);
+        //2022年5月27日 增加以下参数，是因为安卓无法跳转到APP中
+        JSONObject intentParam = new JSONObject();
+        intentParam.put("url", "intent:#Intent;action=android.intent.action.MAIN;end");
+        android.put("intent", intentParam);
 
 		JSONObject ios = new JSONObject();// ios通知内容
 		ios.put("alert", alert);