增加报名列表信息

edu-task/pom.xml

@@ -57,6 +57,10 @@
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.keao.edu</groupId>
+			<artifactId>edu-user-client-api</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -0,0 +1,19 @@
+package com.keao.edu.task.jobs;
+
+import com.keao.edu.task.core.BaseTask;
+import com.keao.edu.task.core.TaskException;
+import com.keao.edu.user.api.client.EduUserFeignService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PayStatusTask extends BaseTask {
+
+	@Autowired
+	private EduUserFeignService eduUserFeignService;
+
+	@Override
+	public void execute() throws TaskException {
+		eduUserFeignService.queryPaymentStatus();
+	}
+}

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

@@ -10,7 +10,7 @@ public class ConfigInit {
     private static ConfigInit instance;
     public final static Integer organId = 46; //商户对应的分部
     public final static String merNo = "B09767221"; //商户对应的分部
-    public final static String appId = "app_f0ebdd29-046f-4b60-bd50-92e2c1285c02";
+    public final static String appId = "app_42a86688-db6f-422c-b5e3-c0883dbadb1d";
 
     public final static String wxAppId = "wx751141096e75a4ee";
     public final static String wxAppSecret = "e882d76c95d1613607a85338b1bed3ff";

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/EduUserFeignService.java

@@ -1,7 +1,6 @@
 package com.keao.edu.user.api.client;
 
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.keao.edu.common.config.FeignConfiguration;
 import com.keao.edu.user.api.client.fallback.EduUserFeignServiceFallback;
 import com.keao.edu.user.api.entity.ExamRoom;
@@ -38,4 +37,8 @@ public interface EduUserFeignService {
 	 */
 	@GetMapping(value = "roomStudentRelation/get")
 	ExamRoomStudentRelation getExamRoomStudentRelation(@RequestParam("basicId") Integer basicId, @RequestParam("roomId") String roomId, @RequestParam("studentId") Integer studentId);
+
+	@GetMapping("task/queryPaymentStatus")
+	// 订单支付状态查询
+	void queryPaymentStatus();
 }

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/fallback/EduUserFeignServiceFallback.java

@@ -3,9 +3,7 @@ package com.keao.edu.user.api.client.fallback;
 import com.keao.edu.user.api.client.EduUserFeignService;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
-import com.keao.edu.user.api.entity.Student;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @Component
 public class EduUserFeignServiceFallback implements EduUserFeignService {
@@ -25,4 +23,9 @@ public class EduUserFeignServiceFallback implements EduUserFeignService {
 		return null;
 	}
 
+	@Override
+	public void queryPaymentStatus() {
+		return;
+	}
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/UserServerApplication.java

@@ -1,5 +1,9 @@
 package com.keao.edu.user;
 
+import com.huifu.adapay.Adapay;
+import com.huifu.adapay.model.MerConfig;
+import com.keao.edu.thirdparty.adapay.ConfigInit;
+import com.keao.edu.user.service.NotifyCallback;
 import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -32,4 +36,15 @@ public class UserServerApplication {
 	public RestTemplate restTemplate() {
 		return new RestTemplate();
 	}
+
+	@Bean
+	public static void startMqtt() {
+		MerConfig merConfig = ConfigInit.merConfig;
+		NotifyCallback notifyCallback = new NotifyCallback();
+		try {
+			Adapay.startMqttListener(merConfig, notifyCallback);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }

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

@@ -60,6 +60,6 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      *
      * @throws Exception
      */
-    void queryOrderStatus() throws Exception;
+    void queryPaymentStatus() throws Exception;
 
 }

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

@@ -120,7 +120,7 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public void queryOrderStatus() throws Exception {
+    public void queryPaymentStatus() throws Exception {
         yqPayQuery();
         adaPayQuery();
     }