add 订单状态查询接口

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

@@ -25,7 +25,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.authorizeRequests()
-				.antMatchers("/v2/api-docs", "/su/**","/student/apply","/examRegistration/ocr")
+				.antMatchers("/v2/api-docs", "/su/**","/student/apply","/examRegistration/ocr","/examOrder/paymentResult")
 				.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

@@ -7,6 +7,7 @@ import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.thirdparty.adapay.ConfigInit;
 import com.keao.edu.thirdparty.adapay.Payment;
+import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.entity.ExamSong;
 import com.keao.edu.user.service.ExamRegistrationPaymentService;
@@ -122,4 +123,12 @@ public class ExamOrderController extends BaseController {
     }
 
 
+    @ApiOperation(value = "/获取订单状态及订单信息")
+    @GetMapping(value = "/paymentResult")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNo", value = "订单编号", required = true, dataType = "String")})
+    public HttpResponseResult<StudentExamPaymentDto> getExamOrderInfo(String orderNo) {
+        return succeed(examRegistrationPaymentService.getExamOrderInfo(orderNo));
+    }
+
 }

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.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,4 +34,11 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
      * @return
      */
     List<ExamRegistrationPayment> getOrdersByStatus(@Param("status") String status, @Param("payType") String payType);
+
+    /**
+     * 获取报名订单信息
+     * @param orderNo
+     * @return
+     */
+    StudentExamPaymentDto getOrderInfo(@Param("orderNo") String orderNo);
 }

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

@@ -1,6 +1,7 @@
 package com.keao.edu.user.service;
 
 import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 
 import java.util.List;
@@ -25,6 +26,14 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      */
     ExamRegistrationPayment getByOrderNo(String OrderNo);
 
+
+    /**
+     * 获取订单信息
+     * @param orderNo
+     * @return
+     */
+    StudentExamPaymentDto getExamOrderInfo(String orderNo);
+
     /**
      * 更新订单信息
      *

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

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -10,6 +10,7 @@ import com.keao.edu.thirdparty.yqpay.RsqMsg;
 import com.keao.edu.thirdparty.yqpay.YqPayFeignService;
 import com.keao.edu.thirdparty.yqpay.YqPayUtil;
 import com.keao.edu.user.dao.ExamRegistrationPaymentDao;
+import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
@@ -49,8 +50,13 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
+    public StudentExamPaymentDto getExamOrderInfo(String orderNo) {
+        return examRegistrationPaymentDao.getOrderInfo(orderNo);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
-    public ExamRegistrationPayment updateOrder(Map<String,String> rpMap) {
+    public ExamRegistrationPayment updateOrder(Map<String, String> rpMap) {
         ExamRegistrationPayment order = examRegistrationPaymentDao.getByOrderNo(rpMap.get("orderNo"));
         if (order == null || !order.getTransStatus().equals(TransStatusEnum.ING)) {
             return order;
@@ -123,10 +129,10 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
                 String transNo = rpMap.get("orderNo");
 
                 rpMap.put("channelType", channelType);
-                rpMap.put("memo",memo);
-                rpMap.put("transStatus",status.getCode());
-                rpMap.put("orderNo",orderNo);
-                rpMap.put("transNo",transNo);
+                rpMap.put("memo", memo);
+                rpMap.put("transStatus", status.getCode());
+                rpMap.put("orderNo", orderNo);
+                rpMap.put("transNo", transNo);
 
                 if (orderNoList.contains(orderNo)) {
                     orderNoList.remove(orderNo);

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

@@ -135,4 +135,10 @@
     <select id="getOrdersByStatus" resultMap="ExamRegistrationPayment">
         SELECT * FROM exam_registration_payment WHERE pay_type_ = #{payType} AND trans_status_ = #{status}
     </select>
+
+    <select id="getOrderInfo" resultMap="com.keao.edu.user.dao.StudentDao.queryApplyListMap">
+        SELECT * FROM exam_registration_payment erp
+        LEFT JOIN exam_registration er ON er.id_ = erp.exam_registration_id_
+        WHERE order_no_ = #{orderNo}
+    </select>
 </mapper>