update:报名审核中 -> 审核拒绝

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -1,23 +1,29 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.dto.*;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.OrderByTypeExportDto;
+import com.ym.mec.biz.dal.dto.OrderStatisDto;
+import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
+import com.ym.mec.biz.dal.dto.StudentPaymentOrderDto;
+import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
+import com.ym.mec.biz.dal.dto.StudentVipDouble11Dto;
+import com.ym.mec.biz.dal.dto.UserGoodsDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
 
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrder> {
 
     StudentPaymentOrder lockOrder(@Param("id") Long id);
@@ -414,4 +420,11 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @return
      */
     StudentPaymentOrder getUserReplacementIngOrder(@Param("userId") Integer userId, @Param("replacementId") Integer replacementId);
+    
+    /**
+     * 批量更新
+     * @param studentPaymentOrderList
+     * @return
+     */
+    int batchUpdate(@Param("studentPaymentOrderList") List<StudentPaymentOrder> studentPaymentOrderList);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -181,7 +181,8 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
      */
     StudentPaymentOrder getUserReplacementIngOrder(Integer userId, Integer replacementId);
 
-
     void callOrderCallBack(StudentPaymentOrder order) throws Exception;
+    
+    int batchUpdate(List<StudentPaymentOrder> studentPaymentOrderList);
 
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRegistrationService.java

@@ -1,19 +1,33 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import com.ym.mec.biz.dal.dto.NoClassMusicStudentDto;
+import com.ym.mec.biz.dal.dto.PageInfoReg;
+import com.ym.mec.biz.dal.dto.RegisterDto;
+import com.ym.mec.biz.dal.dto.StudentAddDto;
+import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
+import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
+import com.ym.mec.biz.dal.dto.StudentInfo;
+import com.ym.mec.biz.dal.dto.StudentMusicDetailDto;
+import com.ym.mec.biz.dal.dto.StudentMusicGroupDto;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.page.NoClassMusicStudentQueryInfo;
 import com.ym.mec.biz.dal.page.RegistrationOrPreQueryInfo;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
-import org.apache.ibatis.annotations.Param;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
 
 public interface StudentRegistrationService extends BaseService<Long, StudentRegistration> {
 
@@ -430,5 +444,10 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
      */
     StudentRegistration getStudentRegister(String musicGroupId, Integer studentId);
 
-
+    /**
+     * 云教练收费：审核中的记录审核失败
+     * @param studentRegistration
+     * @return
+     */
+    Boolean setCloudTeacherToFailed(StudentRegistration studentRegistration);
 }

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

@@ -640,4 +640,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     public StudentPaymentOrder getUserReplacementIngOrder(Integer userId, Integer replacementId) {
         return studentPaymentOrderDao.getUserReplacementIngOrder(userId, replacementId);
     }
+
+	@Override
+	public int batchUpdate(List<StudentPaymentOrder> studentPaymentOrderList) {
+		return studentPaymentOrderDao.batchUpdate(studentPaymentOrderList);
+	}
 }

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

@@ -1902,4 +1902,39 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     public StudentRegistration getStudentRegister(String musicGroupId, Integer studentId) {
         return studentRegistrationDao.getStudentRegister(musicGroupId,studentId);
     }
+
+	@Override
+    @Transactional(rollbackFor = Exception.class)
+	public Boolean setCloudTeacherToFailed(StudentRegistration studentRegistration) {
+        
+        if(studentRegistration.getPayingStatus() != 2){
+        	throw new BizException("只有'审核中'的记录才能取消审核");
+        }
+		
+		Date date = new Date();
+		
+		studentRegistration.setPayingStatus(0);
+		studentRegistration.setUpdateTime(date);
+		update(studentRegistration);
+		
+		List<StudentPaymentOrder> studentPaymentOrderList = studentPaymentOrderService.queryByCondition(GroupType.MUSIC, studentRegistration.getMusicGroupId(), studentRegistration.getUserId(), DealStatusEnum.ING, OrderTypeEnum.APPLY);
+		
+		List<StudentPaymentOrder> updateList = new ArrayList<StudentPaymentOrder>();
+		
+		if(studentPaymentOrderList != null && studentPaymentOrderList.size() > 0){
+			for(StudentPaymentOrder studentPaymentOrder : studentPaymentOrderList){
+				if(StringUtils.equals("205", studentPaymentOrder.getPaymentAccountNo())){
+					studentPaymentOrder.setStatus(DealStatusEnum.CLOSE);
+					studentPaymentOrder.setMemo("云教练审核拒绝");
+					updateList.add(studentPaymentOrder);
+				}
+			}
+		}
+		
+		if(updateList.size() > 0){
+			studentPaymentOrderService.batchUpdate(updateList);
+		}
+		
+		return true;
+	}
 }

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

@@ -193,6 +193,91 @@
         </set>
         WHERE id_ = #{id} AND version_ = #{version}
     </update>
+    
+    <update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrder">
+		<foreach collection="studentPaymentOrderList" item="studentPaymentOrder" separator=";">
+	        UPDATE student_payment_order
+	        <set>
+	            <if test="studentPaymentOrder.receiveStatus != null and studentPaymentOrder.receiveStatus != ''">
+	                receive_status_ = #{studentPaymentOrder.receiveStatus},
+	            </if>
+	            <if test="studentPaymentOrder.status != null">
+	                status_ = #{studentPaymentOrder.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+	            </if>
+	            <if test="studentPaymentOrder.groupType != null">
+	                group_type_ = #{studentPaymentOrder.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+	            </if>
+	            <if test="studentPaymentOrder.orderNo != null">
+	                order_no_ = #{studentPaymentOrder.orderNo},
+	            </if>
+	            <if test="studentPaymentOrder.classGroupId != null">
+	                class_group_id_ = #{studentPaymentOrder.classGroupId},
+	            </if>
+	            <if test="studentPaymentOrder.expectAmount != null">
+	                expect_amount_ = #{studentPaymentOrder.expectAmount},
+	            </if>
+	            <if test="studentPaymentOrder.memo != null">
+	                memo_ = #{studentPaymentOrder.memo},
+	            </if>
+	            <if test="studentPaymentOrder.paymentChannel != null">
+	                payment_channel_ = #{studentPaymentOrder.paymentChannel},
+	            </if>
+	            <if test="studentPaymentOrder.userId != null">
+	                user_id_ = #{studentPaymentOrder.userId},
+	            </if>
+	            <if test="studentPaymentOrder.paymentAccountNo != null">
+	                payment_account_no_ = #{studentPaymentOrder.paymentAccountNo},
+	            </if>
+	            <if test="studentPaymentOrder.merNos != null">
+	                mer_nos_ = #{studentPaymentOrder.merNos},
+	            </if>
+	            <if test="studentPaymentOrder.paymentBusinessChannel != null">
+	                payment_business_channel_ = #{studentPaymentOrder.paymentBusinessChannel},
+	            </if>
+	            <if test="studentPaymentOrder.transNo != null">
+	                trans_no_ = #{studentPaymentOrder.transNo},
+	            </if>
+	            <if test="studentPaymentOrder.actualAmount != null">
+	                actual_amount_ = #{studentPaymentOrder.actualAmount},
+	            </if>
+	            <if test="studentPaymentOrder.comAmount != null">
+	                com_amount_ = #{studentPaymentOrder.comAmount},
+	            </if>
+	            <if test="studentPaymentOrder.perAmount != null">
+	                per_amount_ = #{studentPaymentOrder.perAmount},
+	            </if>
+	            <if test="studentPaymentOrder.balancePaymentAmount != null">
+	                balance_payment_amount_ = #{studentPaymentOrder.balancePaymentAmount},
+	            </if>
+	            <if test="studentPaymentOrder.remitFee != null">
+	                remit_fee_ = #{studentPaymentOrder.remitFee},
+	            </if>
+	            <if test="studentPaymentOrder.courseRemitFee != null">
+	                course_remit_fee_ = #{studentPaymentOrder.courseRemitFee},
+	            </if>
+	            <if test="studentPaymentOrder.type != null">
+	                type_ = #{studentPaymentOrder.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+	            </if>
+	            <if test="studentPaymentOrder.musicGroupId != null">
+	                music_group_id_ = #{studentPaymentOrder.musicGroupId},
+	            </if>
+	            <if test="studentPaymentOrder.organId != null">
+	                organ_id_ = #{studentPaymentOrder.organId},
+	            </if>
+	            <if test="studentPaymentOrder.routingOrganId != null">
+	                routing_organ_id_ = #{studentPaymentOrder.routingOrganId},
+	            </if>
+	            <if test="studentPaymentOrder.payTime != null">
+	                pay_time_ = #{studentPaymentOrder.payTime},
+	            </if>
+	            <if test="studentPaymentOrder.version != null">
+	                version_ = version_+1,
+	            </if>
+	            update_time_ = NOW()
+	        </set>
+	        WHERE id_ = #{studentPaymentOrder.id} AND version_ = #{studentPaymentOrder.version}
+		</foreach>
+    </update>
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">

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

@@ -1,16 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
-import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
-import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
-import com.ym.mec.biz.dal.page.*;
-import com.ym.mec.biz.service.EmployeeService;
-
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -18,7 +7,10 @@ import io.swagger.annotations.ApiOperation;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
@@ -27,24 +19,46 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 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.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderCourseSettingsDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.DelRegisterDto;
+import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
+import com.ym.mec.biz.dal.dto.PageInfoReg;
+import com.ym.mec.biz.dal.dto.RegisterDto;
+import com.ym.mec.biz.dal.dto.StudentAddDto;
+import com.ym.mec.biz.dal.dto.StudentPreRegistrationDto;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.page.NoClassMusicStudentQueryInfo;
+import com.ym.mec.biz.dal.page.RegistrationOrPreQueryInfo;
+import com.ym.mec.biz.dal.page.StudentPreRegistrationQueryInfo;
+import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
+import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentPreRegistrationService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
 
@@ -434,4 +448,17 @@ public class StudentRegistrationController extends BaseController {
             return succeed(studentRegistrationService.setNoneCloudTeacher(id));
         }
     }
+
+
+    @ApiOperation(value = "云教练审核失败")
+    @PostMapping("/setCloudTeacherToFailed")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/setCloudTeacherToFailed')")
+    public HttpResponseResult<Boolean> setCloudTeacherToFailed(Long id) {
+        StudentRegistration studentRegistration = studentRegistrationService.get(id);
+        
+        if(studentRegistration == null){
+        	return failed("参数提交错误");
+        }
+        return studentRegistrationService.setCloudTeacherToFailed(studentRegistration) ? succeed() : failed();
+    }
 }