产品管理模块新增简介字段。

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/goods/GoodsMapper.xml

@@ -18,7 +18,7 @@
         <result column="goods_price" jdbcType="DECIMAL" property="goodsPrice"/>
         <!--        <result column="goods_cate_name" jdbcType="VARCHAR" property="goodsCateName"/>-->
         <result column="goods_weight" jdbcType="VARCHAR" property="goodsWeight"/>
-        <result column="region_id" jdbcType="BIGINT" property="regionId"/>
+        <result column="introduction" jdbcType="VARCHAR" property="introduction"/>
     </resultMap>
 
     <resultMap id="SpeResultMap" type="com.github.zuihou.business.spe.entity.Spe">
@@ -33,10 +33,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id
-        ,create_time,create_user,update_time,update_user,
+        id, create_time,create_user,update_time,update_user,
         goods_cate_id, goodsCateName,goods_name, goods_shop_id, goods_status, goods_brand_id, goods_pic, goods_price,goods_weight,
-        goods_tag,goods_unit,goods_sale_type,goods_code,goods_vr_view,goods_rel_view,goodsVrSales,goodsRelsales,goods_detail_pic
+        goods_tag,goods_unit,goods_sale_type,goods_code,goods_vr_view,goods_rel_view,goodsVrSales,goodsRelsales,goods_detail_pic, introduction
     </sql>
 
     <sql id="EquGoods_Column_List">
@@ -44,14 +43,13 @@
         goods_cate_id, goods_name, goods_shop_id, goods_status, goods_brand_id, goods_pic, goods_price,goods_weight,
         goods_tag,goods_unit,goods_sale_type,goods_code
     </sql>
+
     <sql id="Spc_Column_List">
-        id
-        ,goods_id,spec_name, spec_code,spec_status,spec_s_price,spec_m_price,spec_vr_sales,is_pro_cfg
+        id, goods_id,spec_name, spec_code,spec_status,spec_s_price,spec_m_price,spec_vr_sales,is_pro_cfg
     </sql>
-    <resultMap id="goodsAndSpe" type="com.github.zuihou.business.goods.entity.Goods" extends="BaseResultMap">
-        <collection property="goodsSpec" ofType="com.github.zuihou.business.spe.entity.Spe" select="selectSpecByGoodsId"
-                    javaType="java.util.ArrayList" column="id">
 
+    <resultMap id="goodsAndSpe" type="com.github.zuihou.business.goods.entity.Goods" extends="BaseResultMap">
+        <collection property="goodsSpec" ofType="com.github.zuihou.business.spe.entity.Spe" select="selectSpecByGoodsId" javaType="java.util.ArrayList" column="id">
         </collection>
     </resultMap>
 
@@ -63,14 +61,12 @@
             SELECT
                 goods.*, goods.goods_shop_id AS org_id,
                 cate.goods_cate_name as goodsCateName,
-                dict.name AS region,
                 SUM (spe.spec_vr_sales) AS goodsVrSales,
                 count (btorder.id) AS goodsRelSales
             FROM bt_goods goods
             LEFT JOIN bt_goods_cate cate ON goods.goods_cate_id = cate.id
             LEFT JOIN bt_spe spe ON spe.goods_id=goods.id
             LEFT JOIN bt_order btorder ON btorder.order_goods_id=goods.id
-            LEFT JOIN c_common_dictionary_item dict on goods.region_id = dict.id
 
             <trim prefix="WHERE" prefixOverrides="AND">
                 <if test="model.goodsName!= null and model.goodsName!= ''">

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/goods/dto/GoodsSaveDTO.java

@@ -76,9 +76,8 @@ public class GoodsSaveDTO implements Serializable
     @ApiModelProperty(value = "商品权重")
     private BigDecimal goods_weight;
     /**
-     * 所属区域id
+     * 简介
      */
-    @ApiModelProperty(value = "所属区域id")
-    @NotNull(message = "请选择所属区域")
-    private Long regionId;
+    @ApiModelProperty(value = "简介")
+    private Long introduction;
 }

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/goods/dto/GoodsUpdateDTO.java

@@ -73,9 +73,8 @@ public class GoodsUpdateDTO implements Serializable
     @ApiModelProperty(value = "商品价格")
     private BigDecimal goodsPrice;
     /**
-     * 所属区域id
+     * 简介
      */
-    @ApiModelProperty(value = "所属区域id")
-    @NotNull(message = "请选择所属区域")
-    private Long regionId;
+    @ApiModelProperty(value = "简介")
+    private Long introduction;
 }

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/goods/entity/Goods.java

@@ -185,14 +185,8 @@ public class Goods extends Entity<Long>
     @TableField(exist = false)
     private List<Spe> goodsSpec;
     /**
-     * 所属区域id
+     * 简介
      */
-    @ApiModelProperty(value = "所属区域id")
-    @NotNull(message = "请选择所属区域")
-    private Long regionId;
-    /**
-     * 所属区域
-     */
-    @TableField(exist = false)
-    private String region;
+    @ApiModelProperty(value = "简介")
+    private String introduction;
 }