新增VO

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

@@ -0,0 +1,47 @@
+package com.qs.mp.web.controller.api.channel;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.mp.channel.domain.Channel;
+import com.qs.mp.channel.service.IChannelService;
+import com.qs.mp.common.core.page.TableDataInfo;
+import com.qs.mp.system.service.id.BizIdGenerator;
+import com.qs.mp.web.controller.common.BaseApiController;
+import io.swagger.annotations.Api;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @auther zhongcp
+ * @create 2022-02-28 16:17:48
+ * @describe 渠道管理前端控制器
+ */
+@Api("渠道管理API")
+@RestController
+@RequestMapping("/api/v1/mp/channel/*")
+@Component
+public class ChannelController extends BaseApiController {
+
+  @Autowired
+  private IChannelService channelService;
+
+  @Autowired
+  private BizIdGenerator bizIdGenerator;
+
+  /**
+   * 子渠道列表查询
+   *
+   * @return
+   */
+  @PostMapping("subchannel/list")
+  public TableDataInfo list(@RequestBody Channel channel) {
+
+    startPage();
+    List<Channel> list = channelService.list(new LambdaQueryWrapper<Channel>());
+    return getDataTable(list);
+  }
+}

mp-common/src/main/java/com/qs/mp/common/enums/ChannelCertifyStatusEnum.java

@@ -0,0 +1,27 @@
+package com.qs.mp.common.enums;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+
+/**
+ *
+ * 渠道认证状态
+ *
+ */
+public enum ChannelCertifyStatusEnum implements IEnum<String> {
+
+  NOT_CERTIFIED("n", "未认证"),
+  CERTIFIED("y", "已认证");
+
+  private final String value;
+  private final String desc;
+
+  ChannelCertifyStatusEnum(final String value, final String desc) {
+    this.value = value;
+    this.desc = desc;
+  }
+
+  @Override
+  public String getValue() {
+    return value;
+  }
+}

mp-common/src/main/java/com/qs/mp/common/enums/ChannelVerifyStatusEnum.java

@@ -0,0 +1,28 @@
+package com.qs.mp.common.enums;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+
+/**
+ *
+ * 渠道认证审核状态
+ *
+ */
+public enum ChannelVerifyStatusEnum implements IEnum<String> {
+
+  WAIT("wait", "待审核"),
+  ACCEPT("accept", "已通过"),
+  REJECT("reject", "已拒绝");
+
+  private final String value;
+  private final String desc;
+
+  ChannelVerifyStatusEnum(final String value, final String desc) {
+    this.value = value;
+    this.desc = desc;
+  }
+
+  @Override
+  public String getValue() {
+    return value;
+  }
+}

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qs.mp.common.enums.ChannelCertifyStatusEnum;
+import com.qs.mp.common.enums.ChannelVerifyStatusEnum;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -41,8 +43,8 @@ public class Channel implements Serializable {
   /**
    * 父渠道ID
    */
-  @TableField("PARANT_ID")
-  private Long parantId;
+  @TableField("PARENT_ID")
+  private Long parentId;
 
   /**
    * 渠道级别，0:经销商；1:一级渠道；2:二级渠道
@@ -111,10 +113,16 @@ public class Channel implements Serializable {
   private Integer frozenMoney;
 
   /**
-   * 状态
+   * 认证状态
    */
-  @TableField("STATUS")
-  private String status;
+  @TableField("CERTIFY_STATUS")
+  private ChannelCertifyStatusEnum certifyStatus;
+
+  /**
+   * 审核状态
+   */
+  @TableField("VERIFY_STATUS")
+  private ChannelVerifyStatusEnum verifyStatus;
 
   /**
    * 营业执照
@@ -147,4 +155,4 @@ public class Channel implements Serializable {
   private Date updatedTime;
 
 
-}
+}

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

@@ -0,0 +1,16 @@
+package com.qs.mp.channel.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 渠道经营数据
+ * @author zhongcp
+ * @Date 2022/3/1
+ */
+@Data
+public class ChannelOperDataVO {
+  long saleAmt; // 销售额
+  long commAmt; // 佣金收入
+  long newUserCnt; // 新增用户数
+  String name; // 渠道名称
+}

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

@@ -0,0 +1,16 @@
+package com.qs.mp.channel.domain.vo;
+
+import com.qs.mp.channel.domain.Channel;
+import lombok.Data;
+
+/**
+ * @author zhongcp
+ * @Date 2022/3/1
+ */
+@Data
+public class ChannelVO extends Channel {
+  long siteCnt; // 经销网点数
+  long userCnt; // 经销用户数
+
+  String parentName; // 上级渠道名称
+}

mp-service/src/main/java/com/qs/mp/manager/domain/TicketBox.java

@@ -38,6 +38,12 @@ public class TicketBox implements Serializable {
   @TableField("PIC_URL")
   private String picUrl;
 
+  /**
+   * 详细描述
+   */
+  @TableField("DESCRIPTION")
+  private String description;
+
   /**
    * 盲票类别
    */
@@ -111,4 +117,4 @@ public class TicketBox implements Serializable {
   private Date updatedTime;
 
 
-}
+}

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

@@ -7,7 +7,7 @@
         <id column="ID" property="id" />
         <result column="CHANNEL_NO" property="channelNo" />
         <result column="NAME" property="name" />
-        <result column="PARANT_ID" property="parantId" />
+        <result column="PARENT_ID" property="parentId" />
         <result column="LEVEL" property="level" />
         <result column="COMM_RATE" property="commRate" />
         <result column="PROVINCE" property="province" />
@@ -19,7 +19,8 @@
         <result column="USER_ID" property="userId" />
         <result column="MONEY" property="money" />
         <result column="FROZEN_MONEY" property="frozenMoney" />
-        <result column="STATUS" property="status" />
+        <result column="CERTIFY_STATUS" property="certifyStatus" />
+        <result column="VERIFY_STATUS" property="verifyStatus" />
         <result column="BIZ_LICENSE" property="bizLicense" />
         <result column="DOOR_PIC" property="doorPic" />
         <result column="MEMO" property="memo" />
@@ -29,7 +30,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CHANNEL_NO, NAME, PARANT_ID, LEVEL, COMM_RATE, PROVINCE, CITY, AREA, ADDRESS, CONTACT, MOBILE, USER_ID, MONEY, FROZEN_MONEY, STATUS, BIZ_LICENSE, DOOR_PIC, MEMO, CREATED_TIME, UPDATED_TIME
+        ID, CHANNEL_NO, NAME, PARENT_ID, LEVEL, COMM_RATE, PROVINCE, CITY, AREA, ADDRESS, CONTACT, MOBILE, USER_ID, MONEY, FROZEN_MONEY, CERTIFY_STATUS, VERIFY_STATUS, BIZ_LICENSE, DOOR_PIC, MEMO, CREATED_TIME, UPDATED_TIME
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/manager/TicketBoxMapper.xml

@@ -7,6 +7,7 @@
         <id column="BOX_ID" property="boxId" />
         <result column="TITLE" property="title" />
         <result column="PIC_URL" property="picUrl" />
+        <result column="DESCRIPTION" property="description" />
         <result column="CATEGORY" property="category" />
         <result column="TYPE" property="type" />
         <result column="QUANTITY" property="quantity" />
@@ -23,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        BOX_ID, TITLE, PIC_URL, CATEGORY, TYPE, QUANTITY, BOX_PRICE, PKG_UNIT, PKG_QTY, SALES_QTY, FACE_PRICE, SALE_PRICE, SALE_COMM_RATE, CREATED_TIME, UPDATED_TIME
+        BOX_ID, TITLE, PIC_URL, DESCRIPTION, CATEGORY, TYPE, QUANTITY, BOX_PRICE, PKG_UNIT, PKG_QTY, SALES_QTY, FACE_PRICE, SALE_PRICE, SALE_COMM_RATE, CREATED_TIME, UPDATED_TIME
     </sql>
 
-</mapper>
+</mapper>