update

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

@@ -808,7 +808,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             String musicGroupId = order.getMusicGroupId();
             Integer userId = order.getUserId();
             List<StudentPaymentOrder> oldStudentPaymentOrderList = this.queryByCondition(GroupType.MUSIC,musicGroupId, userId, DealStatusEnum.SUCCESS, OrderTypeEnum.APPLY);
-            if(oldStudentPaymentOrderList != null && oldStudentPaymentOrderList.size() > 0){
+            if(oldStudentPaymentOrderList == null || oldStudentPaymentOrderList.size() == 0){
                 StudentRegistration studentRegistration = studentRegistrationService.getStudentRegister(musicGroupId, userId);
                 MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, studentRegistration.getActualSubjectId());
                 musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() == null?0:musicOneSubjectClassPlan.getPaidStudentNum() - 1);

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

@@ -470,9 +470,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         sysUser.setOrganId(studentRegistration.getOrganId());
 
         Boolean updateNameFlag = false;
-//        if (sysUser.getRealName() == null) {
-//            sysUser.setRealName(studentRegistration.getParentsName());
-//        }
 
         if (StringUtils.isEmpty(sysUser.getUsername())) {
             sysUser.setUsername(studentRegistration.getName());

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

@@ -137,11 +137,11 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				checkSettlement(vipGroupSalarySettlement.getGivePracticeSalarySettlement());
 			}
 			vipGroupActivityAddDto.setSalarySettlementJson(JSON.toJSONString(vipGroupActivityAddDto.getVipGroupSalarySettlement()));
-			ActivityApplyStudentType applyToStudentType = getApplyToStudentType(vipGroupActivityAddDto.getApplyToStudentType());
 			super.update(vipGroupActivityAddDto);
-			applyToStudentType.setActivityId(vipGroupActivityAddDto.getId());
-			activityApplyStudentTypeDao.updateByActivity(applyToStudentType);
 		}
+		ActivityApplyStudentType applyToStudentType = getApplyToStudentType(vipGroupActivityAddDto.getApplyToStudentType());
+		applyToStudentType.setActivityId(vipGroupActivityAddDto.getId());
+		activityApplyStudentTypeDao.updateByActivity(applyToStudentType);
 		return vipGroupActivityAddDto;
 	}
 

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

@@ -596,10 +596,9 @@
         FROM
         sys_user_cash_account suca
         LEFT JOIN sys_user su ON suca.user_id_=su.id_
-        WHERE
-            suca.tenant_id_ = #{tenantId}
+        WHERE suca.tenant_id_ = #{tenantId}
         AND su.user_type_ LIKE '%STUDENT%'
-#         suca.course_balance_ >0
+#         suca.course_balance_ > 0
         <if test="search!=null and search!=''">
             AND (su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
         </if>

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.service.ActivityPlanService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
+import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;