fengji 团练宝添加用户加上乐团Id

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CloudTeacherAddQueryInfo.java

@@ -8,15 +8,27 @@ import java.util.List;
 
 public class CloudTeacherAddQueryInfo extends QueryInfo {
 
-	@ApiModelProperty(value = "学生编号数组")
+	@ApiModelProperty(value = "学生编号数组", required = true)
 	private List<Integer> studentIds;
 
-	@ApiModelProperty(value = "类型 1-天, 2-月 3-季, 4-半年, 5-年")
+	@ApiModelProperty(value = "类型 1-天, 2-月 3-季, 4-半年, 5-年", required = true)
 	private PeriodEnum addType;
 
-	@ApiModelProperty(value = "数量")
+	@ApiModelProperty(value = "数量", required = true)
 	private Integer times;
 
+	@ApiModelProperty(value = "乐团Id", required = true)
+	private String musicGroupId;
+
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
 	public List<Integer> getStudentIds() {
 		return studentIds;
 	}

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

@@ -69,6 +69,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacherOrder.setTime(cloudTeacherAddQueryInfo.getTimes());
             cloudTeacherOrder.setType(cloudTeacherAddQueryInfo.getAddType());
             cloudTeacherOrder.setLevel(1);
+            cloudTeacherOrder.setMusicGroupId(cloudTeacherAddQueryInfo.getMusicGroupId());
             cloudTeacherOrder.setTenantId(cloudTeacherAddQueryInfo.getTenantId());
             cloudTeacherOrderDao.insert(cloudTeacherOrder);
             this.addStudentCloudTeacher(cloudTeacherOrder);

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

@@ -1,24 +1,21 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.CloudTeacherStudent;
 import com.ym.mec.biz.dal.page.CloudTeacherAddQueryInfo;
 import com.ym.mec.biz.dal.page.CloudTeacherOrderQueryInfo;
 import com.ym.mec.biz.service.CloudTeacherOrderService;
 import com.ym.mec.biz.service.OrderPayOpsService;
-import com.ym.mec.biz.service.impl.TenantInfoServiceImpl;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.thirdparty.yqpay.Msg;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -29,7 +26,7 @@ import java.util.Map;
  * @date: 2021-12-21
  */
 @RequestMapping("cloudTeacherOrder")
-@Api(tags = "团练宝注册用户查询")
+@Api(tags = "团练宝注册,激活,添加用户,支付等")
 @RestController
 public class CloudTeacherOrderController extends BaseController {
 
@@ -42,15 +39,15 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value = "手动添加会员")
     @PostMapping("/addStudents")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/addStudents')")
-    public Object addStudents(@RequestBody CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo) {
+    @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')")
-    public Object queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
+    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryUnActive')")
+    public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
         cloudTeacherOrderQueryInfo.setStatus(1);
         if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
             throw new Exception("乐团Id必须填写");
@@ -60,8 +57,8 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value = "查询已激活团练宝用户")
     @PostMapping("/queryActive")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
-    public Object queryActive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
+    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
+    public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryActive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
         if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
             throw new Exception("乐团Id必须填写");
         }
@@ -71,22 +68,22 @@ public class CloudTeacherOrderController extends BaseController {
 
     @ApiOperation(value = "激活记录")
     @PostMapping("/queryActiveRecord")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
-    public Object queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
+    @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')")
-    public Object pay(@RequestBody List<CloudTeacherStudent> cloudTeacherStudents) throws Exception {
+    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/pay')")
+    public HttpResponseResult<Map<String, Object>> pay(@RequestBody List<CloudTeacherStudent> cloudTeacherStudents) throws Exception {
         return succeed(cloudTeacherOrderService.pay(cloudTeacherStudents));
     }
 
     @ApiOperation(value = "轮询查询订单状态")
     @GetMapping("/payCheck")
-    // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/payCheck')")
-    public Object payCheck(@RequestParam String orderNo) throws Exception {
+    @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/payCheck')")
+    public HttpResponseResult<Boolean> payCheck(@RequestParam String orderNo) throws Exception {
         return succeed(cloudTeacherOrderService.payCheck(orderNo));
     }
 }