|
|
@@ -1,6 +1,7 @@
|
|
|
package com.ym.mec.teacher.controller;
|
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
@@ -10,13 +11,14 @@ import java.util.HashMap;
|
|
|
import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.scheduling.annotation.EnableScheduling;
|
|
|
+import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.ym.mec.auth.api.entity.SysUser;
|
|
|
import com.ym.mec.biz.dal.dao.SysConfigDao;
|
|
|
import com.ym.mec.biz.dal.dao.TenantPaymentOrderDao;
|
|
|
import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
|
|
|
@@ -37,7 +40,6 @@ import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
|
|
|
@RequestMapping("teacherOrder")
|
|
|
@Api(tags = "订单回调")
|
|
|
@RestController
|
|
|
-@EnableScheduling
|
|
|
public class TeacherOrderController extends BaseController {
|
|
|
private static final Logger logger = LoggerFactory.getLogger(TeacherOrderController.class);
|
|
|
@Autowired
|
|
|
@@ -169,4 +171,13 @@ public class TeacherOrderController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("/queryByOrderNo")
|
|
|
+ public Object query(String orderNo){
|
|
|
+ TenantPaymentOrder order = tenantPaymentOrderService.queryByOrderNo(orderNo);
|
|
|
+ if(order == null){
|
|
|
+ return failed("订单不存在");
|
|
|
+ }
|
|
|
+ return succeed(order);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
yonge