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

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

@@ -31,4 +31,6 @@ public interface DegreeRegistrationDao extends BaseDAO<Integer, DegreeRegistrati
     void batchInsert(@Param("degreeRegistrationList") List<DegreeRegistration> degreeRegistrationList);
 
     List<DegreeRegistration> getLockByOrderId(@Param("orderNo") String orderNo);
+
+    List<DegreeRegistration> findByByOrderId(@Param("orderNo") String orderNo);
 }

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

@@ -39,4 +39,6 @@ public interface SporadicChargeInfoDao extends BaseDAO<Integer, SporadicChargeIn
      * @return
      */
     List<OrganMaxAmountDto> getActiveOrgansMaxAmount(@Param("type") Integer type,@Param("tenantId") Integer tenantId);
+
+    List<SporadicChargeInfo> findByIds(@Param("sporadicIds") String sporadicIds);
 }

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

@@ -71,4 +71,6 @@ public interface SporadicChargeInfoService extends BaseService<Integer, Sporadic
      * @return
      */
     List<SporadicChargeInfo> getOrganActiveInfo(Integer organId, Integer type);
+
+    List<SporadicChargeInfo> findByIds(String sporadicIds);
 }

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

@@ -410,10 +410,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "支付失败-退回");
             }
         }
-
-        if(Objects.isNull(studentPaymentOrder.getClassGroupId())){
-            return true;
-        }
         List<DegreeRegistration> degreeList = degreeRegistrationDao.getLockByOrderId(studentPaymentOrder.getOrderNo());
         Date date = new Date();
         for (DegreeRegistration degree : degreeList) {
@@ -484,7 +480,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         List<DegreeRegistrationDto> registrationDtos = degreeRegistration.getDegreeRegistrationDtos();
         if(CollectionUtils.isEmpty(registrationDtos)){
-            return BaseController.failed(HttpStatus.FORBIDDEN,"请选择考级项目");
+            return BaseController.failed(HttpStatus.CREATED,"请选择考级项目");
         }
         List<DegreeRegistrationDto> collect = registrationDtos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(collect)){
@@ -492,7 +488,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),StringUtils.join(collect1,","),null,2);
             if(!CollectionUtils.isEmpty(userLevelDegrees)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的 {} 乐器考级已报名，请勿重复选择",collect.get(0).getLevel());
+                return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() +  " 乐器考级已报名，请勿重复选择");
             }
         }
         collect = registrationDtos.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
@@ -501,7 +497,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),null,StringUtils.join(collect1,","),2);
             if(!CollectionUtils.isEmpty(userLevelDegrees)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的 {} 乐理考级已报名，请勿重复选择",collect.get(0).getLevel());
+                return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() +  " 乐理考级已报名，请勿重复选择");
             }
         }
         return BaseController.succeed();

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

@@ -273,4 +273,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
     public List<SporadicChargeInfo> getOrganActiveInfo(Integer organId, Integer type) {
         return sporadicChargeInfoDao.getOrganActiveInfo(organId, type);
     }
+
+    @Override
+    public List<SporadicChargeInfo> findByIds(String sporadicIds) {
+        return sporadicChargeInfoDao.findByIds(sporadicIds);
+    }
 }

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

@@ -357,6 +357,9 @@
             </if>
     </select>
     <select id="getLockByOrderId" resultMap="DegreeRegistration">
+        SELECT * FROM degree_registration WHERE order_no_ = #{orderNo} FOR UPDATE
+    </select>
+    <select id="findByByOrderId" resultMap="DegreeRegistration">
         SELECT * FROM degree_registration WHERE order_no_ = #{orderNo}
     </select>
 </mapper>

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

@@ -219,4 +219,7 @@
         FROM sporadic_charge_info
         <include refid="findSporadicChargeInfosCondition" />
     </select>
+    <select id="findByIds" resultMap="SporadicChargeInfo">
+        SELECT * FROM sporadic_charge_info WHERE FIND_IN_SET(id_,#{sporadicIds})
+    </select>
 </mapper>

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

@@ -63,14 +63,15 @@ public class DegreeController extends BaseController {
     @ApiOperation(value = "考级报名支付")
     @PostMapping("/pay")
     public HttpResponseResult pay(@RequestBody DegreeRegistrationActivityDto degreeRegistration) throws Exception {
-        HttpResponseResult result = degreeRegistrationService.check(degreeRegistration);
-        if(result.getCode() != 200){
-            return result;
-        }
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
+        degreeRegistration.setUserId(user.getId());
+        HttpResponseResult result = degreeRegistrationService.check(degreeRegistration);
+        if(result.getCode() != 200){
+            return result;
+        }
         TenantContextHolder.setTenantId(user.getTenantId());
         degreeRegistration.setUserId(user.getId());
         if("IDENTITY".equals(degreeRegistration.getCertificateType())){
@@ -116,6 +117,11 @@ public class DegreeController extends BaseController {
     @ApiOperation(value = "考级报名检查")
     @PostMapping("/check")
     public HttpResponseResult check(@RequestBody DegreeRegistrationActivityDto degreeRegistration) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(user)){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+        degreeRegistration.setUserId(user.getId());
         return degreeRegistrationService.check(degreeRegistration);
     }
 

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

@@ -240,14 +240,15 @@ public class StudentOrderController extends BaseController {
             }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.SPORADIC)) {
             if (Objects.nonNull(orderByOrderNo.getMusicGroupId())) {
-                SporadicChargeInfo info = sporadicChargeInfoService.get(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
+                List<SporadicChargeInfo> info = sporadicChargeInfoService.findByIds(orderByOrderNo.getMusicGroupId());
                 orderDetail.put("detail", info);
             }
             if (orderByOrderNo.getType().equals(OrderTypeEnum.DOUBLE_ELEVEN2020)) {
                 LuckDrawCount luckDrawCount = luckDrawCountService.get(orderByOrderNo.getUserId().longValue());
                 orderDetail.put("drawTimes", luckDrawCount == null ? 0 : luckDrawCount.getAvailableCount());
             } else if (OrderTypeEnum.DEGREE_REGISTRATION.equals(orderByOrderNo.getType())) {
-                DegreeRegistration degreeRegistration = degreeRegistrationDao.get(orderByOrderNo.getClassGroupId());
+                List<DegreeRegistration> degreeRegistration = degreeRegistrationDao.findByByOrderId(orderByOrderNo.getOrderNo());
+//                DegreeRegistration degreeRegistration = degreeRegistrationDao.get(orderByOrderNo.getClassGroupId());
                 orderDetail.put("degree", degreeRegistration);
                 List<StudentPaymentOrderDetail> studentPaymentOrderDetails = studentPaymentOrderDetailService.getOrderDetail(orderByOrderNo.getId());
                 if (!CollectionUtils.isEmpty(studentPaymentOrderDetails)) {