fengji 团练宝缴费激活

mec-web/src/main/java/com/ym/mec/web/controller/CloudTeacherOrderController.java

@@ -53,19 +53,15 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value ="激活记录")
     @PostMapping("/queryActiveRecord")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
-    public Object queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
+    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
+    public Object queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
         return succeed(cloudTeacherOrderService.queryActiveRecord(cloudTeacherOrderQueryInfo));
     }
 
-    @ApiOperation(value ="激活记录")
+    @ApiOperation(value ="测试支付通知")
     @PostMapping("/testPayNotify")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
-    public Object testPayNotify(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
-        Msg msg = new Msg();
-        msg.setResponseParameters("{\"order_no_\":21122217101500001, \"merMerOrderNo\": 9888888, \"channelType\": 1}");
-        msg.setResponseType("1");
-        msg.setCode("88");
+    public Object testPayNotify(@RequestBody Msg msg) throws Exception {
         return succeed(cloudTeacherOrderService.payNotify(msg));
     }
 
@@ -86,8 +82,8 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value ="轮询查询订单状态")
     @GetMapping("/payCheck")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/payNotify')")
-    public Boolean payCheck(@RequestParam String orderNo ) {
-        return cloudTeacherOrderService.payCheck(orderNo);
+    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/payCheck')")
+    public Object payCheck(@RequestParam String orderNo ) {
+        return succeed(cloudTeacherOrderService.payCheck(orderNo));
     }
 }