|
@@ -372,27 +372,18 @@ public class StudentOrderController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/getOrderStatus")
|
|
|
- private HttpResponseResult getOrderStatus(String orderNo) throws Exception {
|
|
|
+ private HttpResponseResult getOrderStatus(String transNo) throws Exception {
|
|
|
|
|
|
- if (orderNo == null || orderNo.isEmpty()) {
|
|
|
- return failed("订单号必须填");
|
|
|
- }
|
|
|
-
|
|
|
- String notifyUrl = ""; //回调地址
|
|
|
- Map<String, Object> resultMap = new LinkedHashMap<>();
|
|
|
- resultMap.put("merOrderNoList", orderNo);
|
|
|
- Map<String, Object> requestMap = YqPayUtil.getRequestMap(notifyUrl, resultMap);
|
|
|
-
|
|
|
- RsqMsg rsqMsg = new RsqMsg(requestMap);
|
|
|
-
|
|
|
- Msg queryRs = yqPayFeignService.orderQuery(rsqMsg);
|
|
|
+// if (orderId == null) {
|
|
|
+// return failed("订单号必须填");
|
|
|
+// }
|
|
|
+// StudentPaymentOrder order = studentPaymentOrderService.get(orderId);
|
|
|
+// if(order == null){
|
|
|
+// return failed("订单不存在");
|
|
|
+// }
|
|
|
|
|
|
- if (queryRs.getCode().equals("88")) {
|
|
|
- String responseParameters = queryRs.getResponseParameters();
|
|
|
- List<Map<String, Object>> responseList = JSON.parseObject(responseParameters, List.class);
|
|
|
- return succeed(responseList);
|
|
|
- }
|
|
|
- return succeed("订单不存在");
|
|
|
+ Map<String, Object> payment = Payment.queryPayment(transNo);
|
|
|
+ return succeed(payment);
|
|
|
}
|
|
|
|
|
|
|