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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CloudTeacherOrderServiceImpl.java

@@ -253,7 +253,9 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
 
     private void paySuccess(TenantOrderRecord record) throws Exception {
         log.info("tenant orderNotify update order status start" + record.getId().toString());
-
+        if (record.getId() == null) {
+            throw new Exception("订单未找到");
+        }
         if (cloudTeacherOrderDao.updateOrderStatusOK(record.getId()) <= 0) {
             throw new Exception("更新订单状态失败");
         }

mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

@@ -126,11 +126,11 @@
         update cloud_teacher_order set status_ = 2,
        `start_time_` = CURRENT_DATE(),
        `end_time_` = case
-         when type_ = 1 then date_add(CURRENT_DATE(), interval `time_` day)
-         when type_ = 2 then date_add(CURRENT_DATE(), interval `time_` month)
-         when type_ = 3 then date_add(CURRENT_DATE(), interval `time_` * 3 month)
-         when type_ = 4 then date_add(CURRENT_DATE(), interval `time_` * 6 month)
-         when type_ = 5 then date_add(CURRENT_DATE(), interval `time_` * 12 month)
+         when type_ = 1 then date_add(CURRENT_DATE(), interval (`time_`) day)
+         when type_ = 2 then date_add(CURRENT_DATE(), interval (`time_`) month)
+         when type_ = 3 then date_add(CURRENT_DATE(), interval (`time_` * 3) month)
+         when type_ = 4 then date_add(CURRENT_DATE(), interval (`time_` * 6) month)
+         when type_ = 5 then date_add(CURRENT_DATE(), interval (`time_` * 12) month)
         end
         where platform_order_id_ = #{platformOrderId}
     </update>

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

@@ -32,21 +32,17 @@ public class CloudTeacherOrderController extends BaseController {
 
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
-    @Autowired
-    private OrderPayOpsService orderPayOpsService;
-
-    private static final Logger log = LoggerFactory.getLogger(CloudTeacherOrderController.class);
 
     @ApiOperation(value = "手动添加会员")
     @PostMapping("/addStudents")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/addStudents')")
+    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/addStudents')")
     public HttpResponseResult<Boolean> addStudents(@RequestBody CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo) {
         return succeed(cloudTeacherOrderService.addStudents(cloudTeacherAddQueryInfo));
     }
 
     @ApiOperation(value = "查询未激活团练宝用户")
     @PostMapping("/queryInactive")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryUnActive')")
+    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryUnActive')")
     public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
         cloudTeacherOrderQueryInfo.setStatus(1);
         if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
@@ -57,7 +53,7 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value = "查询已激活团练宝用户")
     @PostMapping("/queryActive")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
+    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
     public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryActive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
         if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
             throw new Exception("乐团Id必须填写");
@@ -68,14 +64,14 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value = "激活记录")
     @PostMapping("/queryActiveRecord")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
+    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
     public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
         return succeed(cloudTeacherOrderService.queryRecord(cloudTeacherOrderQueryInfo));
     }
 
     @ApiOperation(value = "激活团练宝用户")
     @PostMapping("/pay")
-    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/pay')")
+    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/pay')")
     public HttpResponseResult<Map<String, Object>> pay(@RequestBody List<CloudTeacherStudent> cloudTeacherStudents) throws Exception {
         return succeed(cloudTeacherOrderService.pay(cloudTeacherStudents));
     }