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

Dev

See merge request quanshu/mp-server!957

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

@@ -37,6 +37,8 @@ import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import ma.glasnost.orika.MapperFacade;
 
 import java.math.BigDecimal;
@@ -100,6 +102,9 @@ public class ChannelController extends BaseApiController {
 	 * @return
 	 */
 	@PostMapping("subchannel/list")
+	@ApiResponses(
+		@ApiResponse(code = 200, message = "成功", response = ChannelVO.class)
+	)
 	public TableDataInfo listChannel(@RequestBody Channel channel) {
 		Long channelId = SecurityUtils.getLoginUser().getChannelId();
 		List<ChannelVO> list = new ArrayList<ChannelVO>();
@@ -132,6 +137,9 @@ public class ChannelController extends BaseApiController {
 	 * @return
 	 */
 	@PostMapping(value = "subchannel/detail")
+	@ApiResponses(
+		@ApiResponse(code = 200, message = "成功", response = ChannelVO.class)
+	)
 	public AjaxResult getChannelDetail(@RequestBody Channel channel) {
 		if (null == channel || null == channel.getChannelId()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);

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

@@ -0,0 +1,78 @@
+package com.qs.mp.channel.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 推广员用户关联表实体类
+ * @auther quanshu
+ * @create 2022-08-08 17:45:00
+ */
+@TableName("mp_promoter_user")
+@Data
+@ApiModel("推广员用户关联表实体类")
+public class PromoterUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 推广员id
+     */
+    @ApiModelProperty("推广员id")
+    @TableField("promoter_id")
+    private Long promoterId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 门店id
+     */
+    @ApiModelProperty("门店id")
+    @TableField("channel_id")
+    private Long channelId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("updated_time")
+    private Date updatedTime;
+
+    /**
+     * 逻辑删除标识
+     */
+    @ApiModelProperty("逻辑删除标识")
+    @TableField("is_deleted")
+    @TableLogic
+    private Integer isDeleted;
+
+
+}

mp-service/src/main/java/com/qs/mp/channel/mapper/PromoterUserMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.channel.mapper;
+
+import com.qs.mp.channel.domain.PromoterUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-08-08 17:45:00
+ * @describe 推广员用户关联表mapper类
+ */
+public interface PromoterUserMapper extends BaseMapper<PromoterUser> {
+
+}

mp-service/src/main/java/com/qs/mp/channel/service/IPromoterUserService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.channel.service;
+
+import com.qs.mp.channel.domain.PromoterUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 推广员用户关联表 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-08-08
+ */
+public interface IPromoterUserService extends IService<PromoterUser> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.qs.mp.channel.service.impl;
+
+import com.qs.mp.channel.domain.PromoterUser;
+import com.qs.mp.channel.mapper.PromoterUserMapper;
+import com.qs.mp.channel.service.IPromoterUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 推广员用户关联表 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-08-08
+ */
+@Service
+public class PromoterUserServiceImpl extends ServiceImpl<PromoterUserMapper, PromoterUser> implements IPromoterUserService {
+
+}

mp-service/src/main/resources/mapper/channel/PromoterUserMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qs.mp.channel.mapper.PromoterUserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.PromoterUser">
+        <id column="id" property="id" />
+        <result column="promoter_id" property="promoterId" />
+        <result column="user_id" property="userId" />
+        <result column="channel_id" property="channelId" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="is_deleted" property="isDeleted" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, promoter_id, user_id, channel_id, created_time, updated_time, is_deleted
+    </sql>
+
+</mapper>