增加渠道状态

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

@@ -0,0 +1,42 @@
+package com.qs.mp.common.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONType;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.qs.mp.common.json.EnumValueDeserializer;
+
+/**
+ *
+ * 渠道状态
+ *
+ */
+@JSONType(deserializer = EnumValueDeserializer.class)
+public enum ChannelStatusEnum implements IEnum<Integer> {
+  ON(1, "启用"),
+  OFF(2, "停用");
+
+  private final int value;
+  private final String desc;
+
+  ChannelStatusEnum(final int value, final String desc) {
+    this.value = value;
+    this.desc = desc;
+  }
+
+  @Override
+  public Integer getValue() {
+    return value;
+  }
+
+  /**
+   * 重写toString，单个转化成json
+   * @return
+   */
+  @Override
+  public String toString() {
+    JSONObject object = new JSONObject();
+    object.put("value",value);
+    object.put("desc", desc);
+    return object.toString();
+  }
+}

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

@@ -7,6 +7,7 @@ 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.ChannelStatusEnum;
 import com.qs.mp.common.enums.ChannelVerifyStatusEnum;
 import com.qs.mp.common.enums.SiteTypeEnum;
 import java.io.Serializable;
@@ -172,6 +173,13 @@ public class Channel implements Serializable {
   @TableField("memo")
   private String memo;
 
+  /**
+   * 状态，启用、停用
+   */
+  @TableField("status")
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+  private ChannelStatusEnum status;
+
   /**
    * 创建时间
    */

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

@@ -28,54 +28,24 @@
         <result column="biz_license_pic" property="bizLicensePic" />
         <result column="door_pic" property="doorPic" />
         <result column="memo" property="memo" />
+        <result column="status" property="status" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
 
-    <!-- 通用查询VO映射结果 -->
-    <resultMap id="ChannelVoResultMap" type="com.qs.mp.channel.domain.vo.ChannelVO">
-        <id column="channel_id" property="channelId" />
-        <result column="channel_no" property="channelNo" />
-        <result column="name" property="name" />
-        <result column="parent_id" property="parentId" />
-        <result column="level" property="level" />
-        <result column="site_type" property="siteType" />
-        <result column="comm_rate" property="commRate" />
-        <result column="province" property="province" />
-        <result column="province_id" property="provinceId" />
-        <result column="city" property="city" />
-        <result column="city_id" property="cityId" />
-        <result column="area" property="area" />
-        <result column="area_id" property="areaId" />
-        <result column="address" property="address" />
-        <result column="contact" property="contact" />
-        <result column="mobile" property="mobile" />
-        <result column="user_id" property="userId" />
-        <result column="money" property="money" />
-        <result column="frozen_money" property="frozenMoney" />
-        <result column="certify_status" property="certifyStatus" />
-        <result column="verify_status" property="verifyStatus" />
-        <result column="biz_license_pic" property="bizLicensePic" />
-        <result column="door_pic" property="doorPic" />
-        <result column="memo" property="memo" />
-        <result column="created_time" property="createdTime" />
-        <result column="updated_time" property="updatedTime" />
-        <result column="parentName" property="parentName" />
-    </resultMap>
-
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        channel_id, channel_no, name, parent_id, level, site_type, comm_rate, province, province_id, city, city_id, area, area_id, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license_pic, door_pic, memo, created_time, updated_time
+        channel_id, channel_no, name, parent_id, level, site_type, comm_rate, province, province_id, city, city_id, area, area_id, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license_pic, door_pic, memo, status, created_time, updated_time
     </sql>
 
     <!-- 查询子渠道信息 -->
-    <select id="selectChannelVoList" resultMap="ChannelVoResultMap">
+    <select id="selectChannelVoList" resultType="com.qs.mp.channel.domain.vo.ChannelVO">
 		select t1.* , t2.name parentName
 		from mp_channel t1
 		left join mp_channel t2 on t1.parent_id = t2.channel_id
 		${ew.customSqlSegment}
 	</select>
-	
+
 	<!-- 查询渠道及其子渠道经销商用户数总和 -->
     <select id="getChannelSiteCnt" resultType="integer">
         select count(t1.channel_id) as siteCnt