Merge remote-tracking branch 'origin/saas' into saas

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

@@ -40,14 +40,14 @@ public class CloudTeacherOrderController extends BaseController {
 
     private static final Logger log = LoggerFactory.getLogger(CloudTeacherOrderController.class);
 
-    @ApiOperation(value ="手动添加会员")
+    @ApiOperation(value = "手动添加会员")
     @PostMapping("/addStudents")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/addStudents')")
     public Object addStudents(@RequestBody CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo) {
         return succeed(cloudTeacherOrderService.addStudents(cloudTeacherAddQueryInfo));
     }
 
-    @ApiOperation(value ="查询未激活团练宝用户")
+    @ApiOperation(value = "查询未激活团练宝用户")
     @PostMapping("/queryInactive")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryUnActive')")
     public Object queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
@@ -58,7 +58,7 @@ public class CloudTeacherOrderController extends BaseController {
         return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
     }
 
-    @ApiOperation(value ="查询已激活团练宝用户")
+    @ApiOperation(value = "查询已激活团练宝用户")
     @PostMapping("/queryActive")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
     public Object queryActive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
@@ -69,42 +69,24 @@ public class CloudTeacherOrderController extends BaseController {
         return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
     }
 
-    @ApiOperation(value ="激活记录")
+    @ApiOperation(value = "激活记录")
     @PostMapping("/queryActiveRecord")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
     public Object queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
         return succeed(cloudTeacherOrderService.queryRecord(cloudTeacherOrderQueryInfo));
     }
 
-    @ApiOperation(value ="激活团练宝用户")
+    @ApiOperation(value = "激活团练宝用户")
     @PostMapping("/pay")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/pay')")
     public Object pay(@RequestBody List<CloudTeacherStudent> cloudTeacherStudents) throws Exception {
         return succeed(cloudTeacherOrderService.pay(cloudTeacherStudents));
     }
 
-    @ApiOperation(value ="支付执行")
-    @GetMapping("/payExecute")
-    @PostMapping("/executePayment")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amount", value = "支付金额", required = true, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "orderNo", value = "订单号", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "payChannel", value = "支付方式（alipay-支付宝app支付）", required = true, dataType = "String"),
-    })
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/payExecute')")
-    public Object executePayment(BigDecimal amount, String orderNo, String payChannel, String notifyUrl, String returnUrl, String orderSubject, String orderBody, String sign, String code, String platform) {
-        try {
-            Map<String, Object> payment = orderPayOpsService.executePayment(amount, orderNo, payChannel, returnUrl, orderSubject, orderBody, sign, code, platform);
-            return succeed(payment);
-        } catch (Exception e) {
-            return failed(e.getMessage());
-        }
-    }
-
-    @ApiOperation(value ="轮询查询订单状态")
+    @ApiOperation(value = "轮询查询订单状态")
     @GetMapping("/payCheck")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/payCheck')")
-    public Object payCheck(@RequestParam String orderNo ) throws Exception {
+    public Object payCheck(@RequestParam String orderNo) throws Exception {
         return succeed(cloudTeacherOrderService.payCheck(orderNo));
     }
 }