Merge remote-tracking branch 'origin/master'

# Conflicts:
#	edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TaskController.java

edu-task/src/main/java/com/keao/edu/task/jobs/PayStatusTask.java → edu-task/src/main/java/com/keao/edu/task/jobs/QueryPaymentStatusTask.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class PayStatusTask extends BaseTask {
+public class QueryPaymentStatusTask extends BaseTask {
 
 	@Autowired
 	private EduUserFeignService eduUserFeignService;

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", "/examOrder/paymentResult",
+                .antMatchers("/task/*","/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
                         "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment","/examOrder/pageList")
                 .permitAll()
                 .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)

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

@@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController
 @RequestMapping("task")
+@RestController
 public class TaskController extends BaseController {
 
     @Autowired
@@ -18,8 +18,8 @@ public class TaskController extends BaseController {
     private ExaminationBasicService examinationBasicService;
 
     // 查询订单状态
-    @GetMapping("/queryOrderStatus")
-    public void queryOrderStatus(){
+    @GetMapping("/queryPaymentStatus")
+    public void queryOrderStatus() throws Exception {
         try {
             examRegistrationPaymentService.queryPaymentStatus();
         } catch (Exception e) {

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

@@ -111,10 +111,10 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         }
         //更新报名人数，和报名金额
         ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examRegistration.getExaminationBasicId(), examRegistration.getOrganId());
-        examOrganizationRelation.setTotalRegistrationStudentNum(examOrganizationRelation.getTotalRegistrationStudentNum()+1);
+        examOrganizationRelation.setTotalRegistrationStudentNum(examOrganizationRelation.getTotalRegistrationStudentNum() + 1);
         BigDecimal amount = examOrganizationRelation.getTotalPaymentAmount().add(examRegistration.getLevelFee()).add(examRegistration.getTheoryLevelFee());
         examOrganizationRelation.setTotalPaymentAmount(amount);
-        if(examOrganizationRelationDao.update(examOrganizationRelation) <= 0){
+        if (examOrganizationRelationDao.update(examOrganizationRelation) <= 0) {
             throw new BizException("报名人数报名金额更新失败");
         }
         return order;
@@ -217,7 +217,7 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
             Map<String, Object> payment = Payment.queryPayment(order.getTransNo());
             Map<String, String> rpMap = new HashMap<>();
             rpMap.put("orderNo", order.getOrderNo());
-            rpMap.put("transNo", (String) payment.get("id"));
+            rpMap.put("transNo", order.getTransNo());
             rpMap.put("channelType", (String) payment.get("pay_channel"));
             String status = (String) payment.get("status");
             if (payment.containsKey("error_msg")) {
@@ -259,9 +259,12 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         List<ExamRegistrationPayment> ordersOverTime = examRegistrationPaymentDao.findOrdersOverTime(orderNoList, TransStatusEnum.ING, beforeDate);
         for (ExamRegistrationPayment order : ordersOverTime) {
             try {
-                order.setTransStatus(TransStatusEnum.FAILED);
-                order.setMemo("超时未支付关闭");
-
+                Map<String, String> rpMap = new HashMap<>();
+                rpMap.put("orderNo", order.getOrderNo());
+                rpMap.put("transNo", order.getTransNo());
+                rpMap.put("memo", "超时未支付关闭");
+                rpMap.put("transStatus", "FAILED");
+                updateOrder(rpMap); //更新订单
             } catch (Exception e) {
                 e.printStackTrace();
                 continue;