Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!965

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/PromoterController.java

@@ -12,14 +12,18 @@ import com.qs.mp.common.jsms.JSMSUtils;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,6 +41,23 @@ public class PromoterController extends BaseApiController {
     @Autowired
     private IChannelService channelService;
 
+    @PostMapping("/delete/{id}")
+    @ApiOperation("删除推广员")
+    @ApiImplicitParams(
+        @ApiImplicitParam(name = "id", value = "推广员id", required = true, dataType = "Long", paramType = "path")
+    )
+    public AjaxResult delete(@PathVariable("id") Long id) {
+        Long channelId = SecurityUtils.getLoginUser().getChannelId();
+        int count = channelService.count(
+            new LambdaQueryWrapper<Channel>().eq(Channel::getChannelId, id).eq(Channel::getParentId, channelId));
+        if (count <= 0) {
+            return AjaxResult.error("您没有权限删除该推广员");
+        }
+        channelService.removeById(id);
+
+        return AjaxResult.success();
+    }
+
 
     @PostMapping("/list")
     @ApiOperation("门店下推广员列表")
@@ -56,7 +77,7 @@ public class PromoterController extends BaseApiController {
             .nested(StringUtils.isNotBlank(param.getSearchValue()), queryWrapper -> {
                 queryWrapper.like(Channel::getName, param.getSearchValue())
                     .or()
-                    .like(Channel::getWordNo, param.getSearchValue());
+                    .like(Channel::getWorkNo, param.getSearchValue());
             }));
 
         return getDataTable(list);

mp-service/src/main/java/com/qs/mp/channel/domain/Channel.java

@@ -45,9 +45,9 @@ public class Channel implements Serializable {
   @ApiModelProperty("渠道编码")
   private String channelNo;
 
-  @TableField("word_no")
+  @TableField("work_no")
   @ApiModelProperty("工号")
-  private String wordNo;
+  private String workNo;
 
   /**
    * 渠道名称

mp-service/src/main/java/com/qs/mp/channel/domain/param/PromoterCreateParam.java

@@ -32,7 +32,7 @@ public class PromoterCreateParam {
 
     @ApiModelProperty("工号")
     @NotBlank(message = "工号不能为空")
-    private String wordNo;
+    private String workNo;
 
     @ApiModelProperty("佣金比例")
     @NotNull(message = "佣金比例不能为空")

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java

@@ -90,7 +90,7 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
         // 创建推广员
         Channel promoter = new Channel();
         promoter.setUserId(sysUser.getUserId());
-        promoter.setWordNo(param.getWordNo());
+        promoter.setWorkNo(param.getWorkNo());
         promoter.setName(param.getName());
         promoter.setLevel(-1);
         promoter.setCommRate(param.getCommRate());