Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -1,18 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.auth.api.entity.SysUser;
+import java.util.Date;
 
 /**
  * 对应数据库表(student):
  */
 public class Student extends SysUser {
-
 	/**
 	 * 
 	 */
@@ -83,12 +80,6 @@ public class Student extends SysUser {
 	@ApiModelProperty(value = "家长姓名")
 	private String parentName;
 
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-	@ApiModelProperty(value = "单位名称")
-	private String unitName;
-
 
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
@@ -325,20 +316,4 @@ public class Student extends SysUser {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getUnitName() {
-		return unitName;
-	}
-
-	public void setUnitName(String unitName) {
-		this.unitName = unitName;
-	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPreRegistration.java

@@ -42,12 +42,6 @@ public class StudentPreRegistration extends BaseStudentDto {
 	/** 家长姓名 **/
 	private String parentName;
 
-	/** 备注 */
-	private String remark;
-
-	/** 单位名称 */
-	private String unitName;
-
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -156,20 +150,4 @@ public class StudentPreRegistration extends BaseStudentDto {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getUnitName() {
-		return unitName;
-	}
-
-	public void setUnitName(String unitName) {
-		this.unitName = unitName;
-	}
 }

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

@@ -3,15 +3,12 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mysql.cj.protocol.MessageSender;
 import com.ym.mec.biz.dal.dao.CloudTeacherDao;
 import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
-import com.ym.mec.biz.dal.enums.PeriodEnum;
 import com.ym.mec.biz.dal.enums.TenantOrderRecordEnum;
 import com.ym.mec.biz.dal.page.CloudTeacherAddQueryInfo;
 import com.ym.mec.biz.dal.page.CloudTeacherOrderQueryInfo;
@@ -28,9 +25,7 @@ import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import jodd.util.StringUtil;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.LocalDateTime;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;

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

@@ -86,8 +86,6 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
     @Autowired
     private SysMessageService sysMessageService;
     @Autowired
-    private ImFeignService imFeignService;
-    @Autowired
     private ImUserFriendService imUserFriendService;
     @Autowired
     private TeacherFreeTimeDao teacherFreeTimeDao;

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

@@ -728,7 +728,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         //新课程形态
         List<MusicGroupPaymentCalenderCourseSettings> newCourses;
-        if (calender.getPayUserType() == PayUserType.STUDENT && registerPayDto.getNewCourse() != null && registerPayDto.getNewCourse().size() > 0) {
+        //因为前端会传newCourse过来所以这里加了合班缴费判断
+        if (calender.getPaymentType() != PaymentType.SPAN_GROUP_CLASS_ADJUST &&
+                calender.getPayUserType() == PayUserType.STUDENT && registerPayDto.getNewCourse() != null && registerPayDto.getNewCourse().size() > 0) {
             newCourses = musicGroupPaymentCalenderCourseSettingsDao.getCalenderCourseSettings(registerPayDto.getNewCourse());
             for (MusicGroupPaymentCalenderCourseSettings calenderCourseSetting : newCourses) {
                 if (goodsDto.isRemitCourseRFeeFlag()) {

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

@@ -177,6 +177,9 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     // 团练宝激活支付
     private Map<String, Object> cloudTeacherOrder(PaymentParam payParam) {
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
+        if (tenantOrderRecord.getOrderState() == 1) {
+            throw new BizException("订单已完成支付.");
+        }
         Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         // 团练宝激活支付 主动延迟检查订单
         log.info("executePayment delayCheckCloudTeacherOrder >>>>> ");

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

@@ -184,8 +184,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setSubjectIdList(studentPreRegistration.getSelectionSubjectId().toString());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
-        student.setRemark(studentPreRegistration.getRemark());
-        student.setUnitName(studentPreRegistration.getUnitName());
         studentDao.insert(student);
         TenantContextHolder.clearTenantId();
         return true;

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

@@ -87,7 +87,8 @@
             operating_tag_,
         </if>
         teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
-        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,membership_end_time_,current_grade_num_,current_class_,tenant_id_,remark_,unit_name_)
+        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,
+        membership_end_time_,current_grade_num_,current_class_,tenant_id_)
         VALUES
         (#{userId},#{schoolName},#{subjectIdList},
         <if test="serviceTag != null">
@@ -97,7 +98,8 @@
             #{operatingTag},
         </if>
         #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
-         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},#{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId},#{remark}, #{unitName})
+         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},
+         #{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">

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

@@ -2,15 +2,12 @@ package com.ym.mec.student.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import javax.annotation.Resource;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.StudentPreRegistration;
@@ -24,14 +21,12 @@ public class StudentController extends BaseController {
 
     @Resource
     private SysUserFeignService sysUserFeignService;
-    
     @Autowired
     private StudentService studentService;
 
     @ApiOperation("注册")
     @PostMapping(value = "/registering")
     public Object registering(@RequestBody StudentPreRegistration studentPreRegistration) {
-
     	// 判断用户是否存在
         SysUser user = sysUserFeignService.queryUserByMobile(studentPreRegistration.getPhone());
         if(user != null && user.getId() != null){
@@ -39,7 +34,6 @@ public class StudentController extends BaseController {
         		return succeed("您已注册，请直接下载APP！");
         	}
         }
-
         return studentService.register(studentPreRegistration) ? succeed() : failed();
     }