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

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

@@ -727,9 +727,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if(musicGroupRegCalender == null){
             	throw new BizException("缴费信息不存在");
             }
-            BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
-            //OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-            //BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+            BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
+			if (musicGroupRegCalender.getMemberRankSettingId() != null) {
+				cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
+			} else {
+				if (musicGroup.getCloudTeacherType() != null) {
+					OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
+					cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+				}
+			}
             
             orderAmount = orderAmount.add(cloudTeacherPrice);
             studentRegistration.setHasCloudTeacher(1);
@@ -739,12 +745,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             cloudTeacherOrder = new CloudTeacherOrder();
 
     		cloudTeacherOrder.setType(2);//月
-			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate());
+			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate() == null ? 6 : musicGroupRegCalender.getMemberValidDate());
     		
     		cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
     		cloudTeacherOrder.setStudentId(studentRegistration.getUserId());
-    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId());
-    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount());
+    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId() == null ? 1 : musicGroupRegCalender.getMemberRankSettingId());
+    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount() == null ? cloudTeacherPrice : musicGroupRegCalender.getMemberPaymentAmount());
     		cloudTeacherOrder.setStatus(0);
         }
 
@@ -950,9 +956,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if(musicGroupRegCalender == null){
             	throw new BizException("缴费信息不存在");
             }
-            BigDecimal cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
-            //OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
-            //BigDecimal cloudTeacherPrice = registerPayDto.getBuyCloudTeacher() ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+            BigDecimal cloudTeacherPrice = BigDecimal.ZERO;
+			if (musicGroupRegCalender.getMemberRankSettingId() != null) {
+				cloudTeacherPrice = musicGroupRegCalender.getMemberPaymentAmount();
+			} else {
+				if (musicGroup.getCloudTeacherType() != null) {
+					OrganizationCloudTeacherFee cloudTeacher = organizationCloudTeacherFeeDao.getByOrganId(studentRegistration.getOrganId());
+					cloudTeacherPrice = musicGroup.getCloudTeacherType() == 0 ? cloudTeacher.getPrice() : cloudTeacher.getPlusPrice();
+				}
+			}
             
             orderAmount = orderAmount.add(cloudTeacherPrice);
             studentRegistration.setHasCloudTeacher(1);
@@ -962,12 +974,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             cloudTeacherOrder = new CloudTeacherOrder();
 
     		cloudTeacherOrder.setType(2);//月
-			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate());
+			cloudTeacherOrder.setTime(musicGroupRegCalender.getMemberValidDate() == null ? 6 : musicGroupRegCalender.getMemberValidDate());
     		
     		cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
     		cloudTeacherOrder.setStudentId(studentRegistration.getUserId());
-    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId());
-    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount());
+    		cloudTeacherOrder.setLevel(musicGroupRegCalender.getMemberRankSettingId() == null ? 1 : musicGroupRegCalender.getMemberRankSettingId());
+    		cloudTeacherOrder.setAmount(musicGroupRegCalender.getMemberPaymentAmount() == null ? cloudTeacherPrice : musicGroupRegCalender.getMemberPaymentAmount());
     		cloudTeacherOrder.setStatus(0);
         }
 
@@ -3042,9 +3054,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             HashMap<Integer, String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(mapList)), 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/MusicGroupSubjectPlanServiceImpl.java

@@ -95,6 +95,10 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     @Override
     public MusicGroupSubjectGoodsAndInfoDto getSubjectGoodsAndInfo(String musicGroupId, Integer subjectId) {
         MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+        
+        if(musicGroup == null){
+        	throw new BizException("乐团信息查询失败");
+        }
 
         //课程形态
         Map<String, Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
@@ -132,14 +136,26 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         musicGroupSubjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         musicGroupSubjectGoodsAndInfo.setMusicGroup(musicGroup);
-        if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE)) {
-        	musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(musicGroupRegCalender.getMemberPaymentAmount());
-            /*OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
-            musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPlusPrice());*/
-            if(musicGroupRegCalender != null) {
-            	musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(musicGroupRegCalender.getMemberRankSettingId()));
-            }
-        }
+		if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) || musicGroup.getCloudTeacherType() != null) {
+			// 历史数据
+			if (musicGroup.getCloudTeacherType() != null) {
+				OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
+				if (musicGroup.getCloudTeacherType() == 0) {
+					musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPrice());
+				} else if (musicGroup.getCloudTeacherType() == 1) {
+					musicGroupSubjectGoodsAndInfo.setCloudTeacherPlusFee(cloudTeacherFee.getPlusPrice());
+				}
+			} else {
+				musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(musicGroupRegCalender.getMemberPaymentAmount());
+			}
+
+			if (musicGroupRegCalender != null && musicGroupRegCalender.getMemberRankSettingId() != null) {
+				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(musicGroupRegCalender
+						.getMemberRankSettingId()));
+			} else{
+				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(1));
+			}
+		}
         return musicGroupSubjectGoodsAndInfo;
     }
 

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

@@ -1465,7 +1465,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-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -243,10 +243,10 @@
                 </foreach>
             </if>
             <if test="createStartDate!=null">
-                AND date(transaction_teacher_id_) &gt;= #{createStartDate}
+                AND date(create_time_) &gt;= #{createStartDate}
             </if>
             <if test="createEndDate!=null">
-                AND date(transaction_teacher_id_) &lt;= #{createEndDate}
+                AND date(create_time_) &lt;= #{createEndDate}
             </if>
             <if test="billStartDate!=null">
                 AND date(bill_start_date_) &gt;= #{billStartDate}

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));
     }
 }