Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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.ExamPaymentInfo;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.Employee;
@@ -149,8 +150,8 @@ public class ExamOrderController extends BaseController {
     @GetMapping(value = "/paymentResult")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNo", value = "订单编号", required = true, dataType = "String")})
-    public HttpResponseResult<ExamRegistrationPayment> getExamOrderInfo(String orderNo) {
-        return succeed(examRegistrationPaymentService.getByOrderNo(orderNo));
+    public HttpResponseResult<ExamPaymentInfo> getExamOrderInfo(String orderNo) {
+        return succeed(examRegistrationPaymentService.getExamOrderInfo(orderNo));
     }
 
     @PostMapping("/notify")

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

@@ -111,7 +111,7 @@ public class ExamRegistrationController extends BaseController {
     @ApiOperation(value = "获取报名信息(报名)")
     @GetMapping(value = "getExamRegistration")
     @ApiImplicitParams({@ApiImplicitParam(name = "examRegistrationId", value = "报名id", required = true, dataType = "int")})
-    public HttpResponseResult<ExamRegistration> getExamRegistration(Long examRegistrationId) {
+    public HttpResponseResult<ExamRegistrationDto> getExamRegistration(Long examRegistrationId) {
         return succeed(examRegistrationService.getExamRegistration(examRegistrationId));
     }
 

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

@@ -40,14 +40,6 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
      */
     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/dto/ExamPaymentInfo.java

@@ -0,0 +1,30 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.entity.ExamRegistration;
+import com.keao.edu.user.entity.ExamRegistrationPayment;
+import io.swagger.annotations.ApiModelProperty;
+
+public class ExamPaymentInfo{
+
+    @ApiModelProperty(value = "订单信息")
+    private ExamRegistrationPayment examRegistrationPayment;
+
+    @ApiModelProperty(value = "报名信息")
+    private ExamRegistrationDto examRegistrationDto;
+
+    public ExamRegistrationDto getExamRegistrationDto() {
+        return examRegistrationDto;
+    }
+
+    public void setExamRegistrationDto(ExamRegistrationDto examRegistrationDto) {
+        this.examRegistrationDto = examRegistrationDto;
+    }
+
+    public ExamRegistrationPayment getExamRegistrationPayment() {
+        return examRegistrationPayment;
+    }
+
+    public void setExamRegistrationPayment(ExamRegistrationPayment examRegistrationPayment) {
+        this.examRegistrationPayment = examRegistrationPayment;
+    }
+}

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.ExamPaymentInfo;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistration;
@@ -26,10 +27,10 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
     /**
      * 根据订单号获取订单
      *
-     * @param OrderNo
+     * @param orderNo
      * @return
      */
-    ExamRegistrationPayment getByOrderNo(String OrderNo);
+    ExamRegistrationPayment getByOrderNo(String orderNo);
 
 
     /**
@@ -37,7 +38,7 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      * @param orderNo
      * @return
      */
-    StudentExamPaymentDto getExamOrderInfo(String orderNo);
+    ExamPaymentInfo getExamOrderInfo(String orderNo);
 
     /**
      * 更新订单信息

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

@@ -12,6 +12,8 @@ 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.ExamPaymentInfo;
+import com.keao.edu.user.dto.ExamRegistrationDto;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
@@ -59,13 +61,18 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public ExamRegistrationPayment getByOrderNo(String OrderNo) {
-        return examRegistrationPaymentDao.getByOrderNo(OrderNo);
+    public ExamRegistrationPayment getByOrderNo(String orderNo) {
+        return examRegistrationPaymentDao.getByOrderNo(orderNo);
     }
 
     @Override
-    public StudentExamPaymentDto getExamOrderInfo(String orderNo) {
-        return examRegistrationPaymentDao.getOrderInfo(orderNo);
+    public ExamPaymentInfo getExamOrderInfo(String orderNo) {
+        ExamPaymentInfo examPaymentInfo = new ExamPaymentInfo();
+        ExamRegistrationPayment order = examRegistrationPaymentDao.getByOrderNo(orderNo);
+        ExamRegistrationDto examRegistration = examRegistrationService.getExamRegistration(order.getExamRegistrationId());
+        examPaymentInfo.setExamRegistrationPayment(order);
+        examPaymentInfo.setExamRegistrationDto(examRegistration);
+        return examPaymentInfo;
     }
 
     @Override

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

@@ -187,11 +187,6 @@
         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 erp.order_no_ = #{orderNo}
-    </select>
     <!-- 获取超时未支付的订单 -->
     <select id="findOrdersOverTime" resultMap="ExamRegistrationPayment">
         SELECT * FROM exam_registration_payment WHERE order_no_ IN