فهرست منبع

增加报名列表信息

周箭河 5 سال پیش
والد
کامیت
f14dd40f65

+ 1 - 1
edu-thirdparty/src/main/java/com/keao/edu/thirdparty/adapay/ConfigInit.java

@@ -38,7 +38,7 @@ public class ConfigInit {
         /**
          * prodMode 模式,默认为生产模式,false可以使用mock模式
          */
-        Adapay.prodMode = true;
+        Adapay.prodMode = false;
 
         /**
          *添加商户配置,一个商户只需要 添加一次,添加以后在内存中。

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/TransStatusEnum.java

@@ -9,7 +9,7 @@ public enum TransStatusEnum implements BaseEnum<String, TransStatusEnum> {
     ING("ING", "交易中"),
     SUCCESS("SUCCESS", "交易成功"),
     FAILED("FAILED", "交易失败"),
-    CLOSE("REFUND", "交易关闭"),
+    CLOSE("CLOSE", "交易关闭"),
     REFUND("REFUND", "交易退款");
 
     private String code;

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

@@ -18,6 +18,7 @@ import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
 import com.keao.edu.user.enums.TransStatusEnum;
 import com.keao.edu.user.page.ExamRegistrationPaymentQueryInfo;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
+import com.keao.edu.user.service.ExamOrganizationRelationService;
 import com.keao.edu.user.service.ExamRegistrationPaymentService;
 import com.keao.edu.user.service.ExamRegistrationService;
 import com.keao.edu.user.service.OrganizationService;
@@ -40,6 +41,8 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     private YqPayFeignService yqPayFeignService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private ExamOrganizationRelationService examOrganizationRelationService;
 
     @Override
     public BaseDAO<Long, ExamRegistrationPayment> getDAO() {
@@ -95,6 +98,11 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         if (examRegistrationService.update(examRegistration) <= 0) {
             throw new BizException("报名状态更新失败");
         }
+//        //更新报名人数,和报名金额
+//        examOrganizationRelationService.queryUnRelatedOrgans()
+//        if(examOrganizationRelationService.update() <= 0){
+//
+//        }
         return order;
     }
 

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

@@ -290,6 +290,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         orderNo = idGeneratorService.generatorId("payment") + "";
 
         order.setId(null);
+        order.setTransStatus(TransStatusEnum.ING);
         order.setOrderNo(orderNo);
         examRegistrationPaymentService.insert(order);
 

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

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