增加报名列表信息

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     public void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
-                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment")
+                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment","/examOrder/pageList")
                 .permitAll()
                 .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
                 .authenticationEntryPoint(baseAuthenticationEntryPoint).and();

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -9,6 +9,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.thirdparty.adapay.ConfigInit;
 import com.keao.edu.thirdparty.adapay.Payment;
 import com.keao.edu.thirdparty.yqpay.Msg;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
@@ -46,7 +47,7 @@ public class ExamOrderController extends BaseController {
     @ApiOperation(value = "缴费列表")
     @GetMapping(value = "pageList")
     @PreAuthorize("@pcs.hasPermissions('examOrder/pageList')")
-    public HttpResponseResult<PageInfo<ExamRegistrationPayment>> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ExamRegistrationPaymentDto>> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
             Employee employee = employeeService.get(sysUser.getId());

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.enums.TransStatusEnum;
@@ -9,6 +10,7 @@ import org.apache.poi.ss.formula.functions.T;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrationPayment> {
 
@@ -57,5 +59,17 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
      */
     List<ExamRegistrationPayment> findOrdersOverTime(@Param("orderNoList") List<String> orderNoList, @Param("transStatus") TransStatusEnum transStatus, @Param("beforeTime") Date beforeTime);
 
-    List<ExamRegistrationPayment> getOrderPageList();
+    /**
+     * 获取支付列表
+     *
+     * @return
+     */
+    List<ExamRegistrationPaymentDto> getOrderPageList(Map<String, Object> params);
+
+    /**
+     * 获取订单总条数
+     * @param params
+     * @return
+     */
+    Integer getOrderListCount(Map<String, Object> params);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamRegistrationPaymentDto.java

@@ -0,0 +1,21 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.entity.ExamLocation;
+import com.keao.edu.user.entity.ExamRegistrationPayment;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class ExamRegistrationPaymentDto extends ExamRegistrationPayment {
+
+    @ApiModelProperty(value = "考试地点")
+    private List<ExamLocation> examLocations;
+
+    public List<ExamLocation> getExamLocations() {
+        return examLocations;
+    }
+
+    public void setExamLocations(List<ExamLocation> examLocations) {
+        this.examLocations = examLocations;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRegistrationPaymentQueryInfo.java

@@ -10,6 +10,12 @@ public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "合作单位编号")
     private Integer organId;
 
+    @ApiModelProperty(value = "准考证号")
+    private String cardNo;
+
+    @ApiModelProperty(value = "考级名称")
+    private String ExamName;
+
     @ApiModelProperty(value = "考试报名编号")
     private Integer examRegistrationId;
 
@@ -51,4 +57,20 @@ public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
     public void setExaminationBasicId(Integer examinationBasicId) {
         this.examinationBasicId = examinationBasicId;
     }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getExamName() {
+        return ExamName;
+    }
+
+    public void setExamName(String examName) {
+        ExamName = examName;
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -2,6 +2,7 @@ package com.keao.edu.user.service;
 
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
@@ -52,7 +53,7 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      * @param queryInfo
      * @return
      */
-    PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationPaymentQueryInfo queryInfo);
+    PageInfo<ExamRegistrationPaymentDto> pageList(ExamRegistrationPaymentQueryInfo queryInfo);
 
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -12,6 +12,7 @@ import com.keao.edu.thirdparty.yqpay.YqPayFeignService;
 import com.keao.edu.thirdparty.yqpay.YqPayUtil;
 import com.keao.edu.user.dao.ExamOrganizationRelationDao;
 import com.keao.edu.user.dao.ExamRegistrationPaymentDao;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.ExamRegistration;
@@ -113,8 +114,8 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
-        PageInfo<ExamRegistrationPayment> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+    public PageInfo<ExamRegistrationPaymentDto> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
+        PageInfo<ExamRegistrationPaymentDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
@@ -122,12 +123,12 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
         params.put("organIds", nextLevelOrganIds);
 
-        List<ExamRegistrationPayment> dataList = Collections.EMPTY_LIST;
-        int count = this.findCount(params);
+        List<ExamRegistrationPaymentDto> dataList = Collections.EMPTY_LIST;
+        int count = examRegistrationPaymentDao.getOrderListCount(params);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = this.getDAO().queryPage(params);
+            dataList = examRegistrationPaymentDao.getOrderPageList(params);
         }
         pageInfo.setRows(dataList);
         return pageInfo;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -74,11 +74,11 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             throw new BizException("请选择专业级别");
         }
 
-        if(examRegistration.getOrganId() == null){
+        if (examRegistration.getOrganId() == null) {
             throw new BizException("机构id不能为空");
         }
         Organization organization = organizationDao.get(examRegistration.getOrganId());
-        if(organization == null){
+        if (organization == null) {
             throw new BizException("机构不存在");
         }
         Date nowDate = new Date();
@@ -104,7 +104,6 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         examRegistration.setTheoryLevelFee(theoryLevelFee);
         examRegistration.setCreateTime(nowDate);
         examRegistration.setUpdateTime(nowDate);
-        examRegistrationDao.insert(examRegistration);
 
         ExamRegistrationPayment examIngOrder = examRegistrationPaymentService.getExamIngOrder(examinationBasic.getId(), examRegistration.getStudentId());
         if (examIngOrder != null) {
@@ -113,6 +112,11 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             if (examRegistrationPaymentService.update(examIngOrder) <= 0) {
                 throw new BizException("未支付订单关闭失败");
             }
+            ExamRegistration examReg = examRegistrationDao.get(examIngOrder.getExamRegistrationId());
+            examRegistration.setId(examReg.getId());
+            examRegistrationDao.update(examRegistration);
+        } else {
+            examRegistrationDao.insert(examRegistration);
         }
 
         ExamRegistrationPayment examRegistrationPayment = new ExamRegistrationPayment();
@@ -161,10 +165,10 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = this.getDAO().queryPage(params);
-            List<Integer> examIds = dataList.stream().filter(e->Objects.nonNull(e.getOrganId())).map(ExamRegistration::getExaminationBasicId).collect(Collectors.toList());
+            List<Integer> examIds = dataList.stream().filter(e -> Objects.nonNull(e.getOrganId())).map(ExamRegistration::getExaminationBasicId).collect(Collectors.toList());
             Map<Integer, String> examIdNameMap = this.getMap("examination_basic", "id_", "name_", examIds, Integer.class, String.class);
 
-            List<Integer> organIds = dataList.stream().filter(e->Objects.nonNull(e.getOrganId())).map(ExamRegistration::getOrganId).collect(Collectors.toList());
+            List<Integer> organIds = dataList.stream().filter(e -> Objects.nonNull(e.getOrganId())).map(ExamRegistration::getOrganId).collect(Collectors.toList());
             Map<Integer, String> organIdNameMap = this.getMap("organization", "id_", "name_", organIds, Integer.class, String.class);
 
             List<Integer> subjectIds = dataList.stream().map(ExamRegistration::getSubjectId).collect(Collectors.toList());
@@ -252,18 +256,18 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 
     @Override
     public void updateExamRegistration(ExamRegistration examRegistration) {
-        if(Objects.isNull(examRegistration.getId())){
+        if (Objects.isNull(examRegistration.getId())) {
             throw new BizException("请指定学员报名信息");
         }
         ExamRegistration er = examRegistrationDao.get(examRegistration.getId().longValue());
-        if(Objects.isNull(er)) {
+        if (Objects.isNull(er)) {
             throw new BizException("学员报名信息不存在");
         }
-        if(!StudentRegistrationStatusEnum.AUDIT_WAIT.equals(er.getStatus())){
+        if (!StudentRegistrationStatusEnum.AUDIT_WAIT.equals(er.getStatus())) {
             throw new BizException("审核状态错误");
         }
-        if(!StudentRegistrationStatusEnum.AUDIT_PASS.equals(examRegistration.getStatus())
-            &&!StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())){
+        if (!StudentRegistrationStatusEnum.AUDIT_PASS.equals(examRegistration.getStatus())
+                && !StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())) {
             throw new BizException("审核状态错误");
         }
         examRegistrationDao.update(examRegistration);

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -122,6 +122,12 @@
             <if test="examRegistrationId!=null">
                 AND erp.exam_registration_id_=#{examRegistrationId}
             </if>
+            <if test="cardNo!=null">
+                AND ec.card_no_=#{cardNo}
+            </if>
+            <if test="examName!=null">
+                AND ec.card_no_=#{cardNo}
+            </if>
             <if test="organIds!=null">
                 AND erp.organ_id_ IN
                 <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -135,17 +141,28 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="queryPage" resultMap="pageList" parameterType="map">
-        SELECT erp.* FROM exam_registration_payment erp
+    <select id="queryPage" resultMap="ExamRegistrationPayment" parameterType="map">
+        SELECT erp.*,eb.exam_location_id_list_ FROM exam_registration_payment erp
+        LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
+        <include refid="queryCondition" />
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 分页查询 -->
+    <select id="getOrderPageList" resultMap="ExamRegistrationPaymentDto" parameterType="map">
+        SELECT erp.*,eb.exam_location_id_list_ FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
         <include refid="queryCondition" />
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
+    <select id="getOrderListCount" resultType="int">
         SELECT COUNT(*) FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
         <include refid="queryCondition" />
     </select>
 
@@ -185,7 +202,8 @@
         <![CDATA[ AND create_time_ <= ]]> #{beforeTime}
     </select>
 
-    <resultMap id="pageList" type="com.keao.edu.user.entity.ExamRegistrationPayment" extends="ExamRegistrationPayment">
+    <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto" extends="ExamRegistrationPayment">
         <association property="examRegistration" select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo" column="{id=exam_registration_id_}"/>
+        <association property="examLocations"  select="com.keao.edu.user.dao.ExamLocationDao.getExamLocationByIds" column="{ids=exam_location_id_list_}"/>
     </resultMap>
 </mapper>