Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec into system_fee

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

@@ -3053,9 +3053,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             HashMap<Integer, String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findMapByMusicGroupId(musicGroupId, 0))), HashMap.class);
             if (map != null && map.size() > 0) {
                 String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
-                String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
+//                String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
                 sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.SMS_PAYMENT_MESSAGE,
-                        map, null, 0, "", "", musicGroup.getName(), studentApplyUrl, DateUtil.format(musicGroup.getPaymentExpireDate(), DateUtil.DATE_FORMAT_MIN), serverPhone);
+                        map, null, 0, "", "", musicGroup.getName(), studentApplyUrl);
             }
         }
         Set<Integer> roleIds = new HashSet<>(1);

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

@@ -1472,7 +1472,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     receivers.put(e.getUserId(), e.getParentsPhone());
                 });
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
-                        MessageTypeEnum.STUDENT_SMS_OPEN_PAYMENT, receivers, null, 0, null, "",
+                        MessageTypeEnum.SMS_PAYMENT_MESSAGE, receivers, null, 0, null, "",
                         musicGroup.getName(), HttpUtil.getSortUrl(configValue + musicGroup.getId()));
             }
         }

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

@@ -25,6 +25,11 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberRankSetting">
 		SELECT * FROM member_rank_setting
+		<where>
+			<if test="isDefault != null">
+				is_default_ = #{isDefault}
+			</if>
+		</where>
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->

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

@@ -71,7 +71,9 @@ public class MemberRankSettingController extends BaseController {
     @ApiOperation(value = "获取所有会员列表")
     @GetMapping("/findAll")
     @PreAuthorize("@pcs.hasPermissions('memberRankSetting/findAll')")
-    public Object findAll() {
-        return succeed(memberRankSettingService.findAll(new HashMap<>()));
+    public Object findAll(Boolean isDefault) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("isDefault",isDefault);
+        return succeed(memberRankSettingService.findAll(map));
     }
 }