小程序管理后台端修改

kmall-admin/src/main/java/com/kmall/admin/entity/GoodsEntity.java

@@ -107,6 +107,79 @@ public class GoodsEntity implements Serializable {
     //品牌
     private String brandName;
 
+
+
+    private String sku;
+
+    private String goodsBizType;
+
+    private String createrSn;
+
+    private Date createTime;
+
+    private String moderSn;
+
+    private Date modTime;
+
+    private Date tstm;
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getGoodsBizType() {
+        return goodsBizType;
+    }
+
+    public void setGoodsBizType(String goodsBizType) {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getCreaterSn() {
+        return createrSn;
+    }
+
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModerSn() {
+        return moderSn;
+    }
+
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Date getTstm() {
+        return tstm;
+    }
+
+    public void setTstm(Date tstm) {
+        this.tstm = tstm;
+    }
+
+
     public Long getCreateUserDeptId() {
         return createUserDeptId;
     }

kmall-admin/src/main/java/com/kmall/admin/entity/ProductStoreRelaEntity.java

@@ -2,6 +2,7 @@ package com.kmall.admin.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 实体
@@ -58,6 +59,77 @@ public class ProductStoreRelaEntity implements Serializable {
     private String productSn;
     private String categoryName;
 
+
+
+    private String sku;
+    private String goodsBizType;
+
+    private String createrSn;
+
+    private Date createTime;
+
+    private String moderSn;
+
+    private Date modTime;
+
+    private Date tstm;
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getGoodsBizType() {
+        return goodsBizType;
+    }
+
+    public void setGoodsBizType(String goodsBizType) {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getCreaterSn() {
+        return createrSn;
+    }
+
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModerSn() {
+        return moderSn;
+    }
+
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    public Date getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    public Date getTstm() {
+        return tstm;
+    }
+
+    public void setTstm(Date tstm) {
+        this.tstm = tstm;
+    }
+
     /**
      * 设置：主键
      */

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -59,13 +59,11 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
     @Override
-    @DataFilter(userAlias = "mall_goods.create_user_id", deptAlias = "mall_goods.create_user_dept_id")
     public List<GoodsEntity> queryList(Map<String, Object> map) {
         return goodsDao.queryList(map);
     }
 
     @Override
-    @DataFilter(userAlias = "mall_goods.create_user_id", deptAlias = "mall_goods.create_user_dept_id")
     public int queryTotal(Map<String, Object> map) {
         return goodsDao.queryTotal(map);
     }
@@ -163,6 +161,8 @@ public class GoodsServiceImpl implements GoodsService {
         goods.setCreateUserId(user.getUserId());
         goods.setUpdateUserId(user.getUserId());
         goods.setUpdateTime(new Date());
+        goods.setModTime(new Date());
+        goods.setCreateTime(new Date());
         return goodsDao.save(goods);
     }
 

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -15,7 +15,6 @@
         <result property="goodsDesc" column="goods_desc"/>
         <result property="isOnSale" column="is_on_sale"/>
         <result property="addTime" column="add_time"/>
-        <result property="updateTime" column="update_time"/>
         <result property="sortOrder" column="sort_order"/>
         <result property="isDelete" column="is_delete"/>
         <result property="attributeCategory" column="attribute_category"/>
@@ -36,10 +35,14 @@
         <result property="isLimited" column="is_limited"/>
         <result property="isHot" column="is_hot"/>
         <result property="marketPrice" column="market_price"/>
-        <result property="createUserId" column="create_user_id"/>
-        <result property="createUserDeptId" column="create_user_dept_id"/>
-        <result property="updateUserId" column="update_user_id"/>
         <result property="goodsType" column="goodsType"/>
+        <result property="sku" column="sku"/>
+        <result property="goodsBizType" column="goods_biz_type"/>
+        <result column="creater_sn" property="createrSn" jdbcType="VARCHAR" />
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+        <result column="moder_sn" property="moderSn" jdbcType="VARCHAR" />
+        <result column="mod_time" property="modTime" jdbcType="TIMESTAMP" />
+        <result column="tstm" property="tstm" jdbcType="TIMESTAMP" />
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.GoodsEntity">
@@ -76,7 +79,6 @@
         mall_goods.goods_brief,
         mall_goods.is_on_sale,
         mall_goods.add_time,
-        mall_goods.update_time,
         mall_goods.sort_order,
         mall_goods.is_delete,
         mall_goods.attribute_category,
@@ -97,9 +99,6 @@
         mall_goods.is_limited,
         mall_goods.is_hot,
         mall_goods.market_price,
-        mall_goods.create_user_id,
-        mall_goods.create_user_dept_id,
-        mall_goods.update_user_id,
         mall_category.name category_name,
         mall_attribute_category.name attribute_category_name,
         mall_brand.name brand_name,
@@ -166,7 +165,6 @@
         `goods_desc`,
         `is_on_sale`,
         `add_time`,
-        `update_time`,
         `sort_order`,
         `is_delete`,
         `attribute_category`,
@@ -187,9 +185,13 @@
         `is_limited`,
         `is_hot`,
         `market_price`,
-        `create_user_id`,
-        `create_user_dept_id`,
-        `update_user_id`
+        `sku`,
+        `goods_biz_type`,
+        `create_sn`,
+        `create_time`,
+        `moder_sn`,
+        `mod_time`,
+        `tstm`
         )
         values
         (
@@ -204,7 +206,6 @@
         #{goodsDesc},
         #{isOnSale},
         #{addTime},
-        #{updateTime},
         #{sortOrder},
         #{isDelete},
         #{attributeCategory},
@@ -225,9 +226,13 @@
         #{isLimited},
         #{isHot},
         #{marketPrice},
-        #{createUserId},
-        #{createUserDeptId},
-        #{updateUserId}
+        #{sku},
+        #{goodsBizType},
+        #{createrSn},
+        #{createTime},
+        #{moderSn},
+        #{modTime},
+        #{tstm}
         )
     </insert>
 
@@ -244,7 +249,6 @@
             <if test="goodsDesc != null">`goods_desc` = #{goodsDesc},</if>
             <if test="isOnSale != null">`is_on_sale` = #{isOnSale},</if>
             <if test="addTime != null">`add_time` = #{addTime},</if>
-            <if test="updateTime != null">`update_time` = #{updateTime},</if>
             <if test="sortOrder != null">`sort_order` = #{sortOrder},</if>
             <if test="isDelete != null">`is_delete` = #{isDelete},</if>
             <if test="attributeCategory != null">`attribute_category` = #{attributeCategory},</if>
@@ -265,9 +269,27 @@
             <if test="isLimited != null">`is_limited` = #{isLimited},</if>
             <if test="isHot != null">`is_hot` = #{isHot},</if>
             <if test="marketPrice != null">`market_price` = #{marketPrice},</if>
-            <if test="createUserId != null">`create_user_id` = #{createUserId},</if>
-            <if test="createUserId != null">`create_user_dept_id` = #{createUserDeptId},</if>
-            <if test="updateUserId != null">`update_user_id` = #{updateUserId},</if>
+            <if test="sku != null" >
+                sku = #{sku,jdbcType=VARCHAR},
+            </if>
+            <if test="goodsBizType != null" >
+                goods_biz_type = #{goodsBizType,jdbcType=CHAR},
+            </if>
+            <if test="createrSn != null" >
+                creater_sn = #{createrSn,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null" >
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="moderSn != null" >
+                moder_sn = #{moderSn,jdbcType=VARCHAR},
+            </if>
+            <if test="modTime != null" >
+                mod_time = #{modTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="tstm != null" >
+                tstm = #{tstm,jdbcType=TIMESTAMP},
+            </if>
         </set>
         where id = #{id}
     </update>

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -19,6 +19,14 @@
         <result property="goodsSn" column="goodsSn"/>
         <result property="productSn" column="productSn"/>
         <result property="categoryName" column="categoryName"/>
+
+        <result column="sku" property="sku" jdbcType="VARCHAR" />
+        <result column="goods_biz_type" property="goodsBizType" jdbcType="CHAR" />
+        <result column="creater_sn" property="createrSn" jdbcType="VARCHAR" />
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+        <result column="moder_sn" property="moderSn" jdbcType="VARCHAR" />
+        <result column="mod_time" property="modTime" jdbcType="TIMESTAMP" />
+        <result column="tstm" property="tstm" jdbcType="TIMESTAMP" />
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.ProductStoreRelaEntity">
@@ -32,6 +40,7 @@
 			a.`market_price`,
 			a.`stock_price`,
 			a.`sell_volume`,
+			a.sku,a.goods_biz_type, a.creater_sn, a.create_time, a.moder_sn, a.mod_time, a.tstm,
 			b.goods_sn goodsSn,
 			c.goods_sn productSn,
 			b.name goodsName,
@@ -56,6 +65,7 @@
         a.`market_price`,
         a.`stock_price`,
         a.`sell_volume`,
+        a.sku,a.goods_biz_type, a.creater_sn, a.create_time, a.moder_sn, a.mod_time, a.tstm,
         b.goods_sn goodsSn,
         c.goods_sn productSn,
         b.name goodsName,
@@ -80,6 +90,7 @@
         a.`market_price`,
         a.`stock_price`,
         a.`sell_volume`,
+        a.sku,a.goods_biz_type, a.creater_sn, a.create_time, a.moder_sn, a.mod_time, a.tstm,
         b.goods_sn goodsSn,
         c.goods_sn productSn,
         b.name goodsName,
@@ -160,7 +171,27 @@
 			`retail_price`,
 			`market_price`,
             `stock_price`,
-            `sell_volume`)
+            `sell_volume`,
+
+        <if test="sku != null" >
+            sku,
+        </if>
+        <if test="goodsBizType != null" >
+            goods_biz_type,
+        </if>
+        <if test="createrSn != null" >
+            creater_sn,
+        </if>
+        <if test="createTime != null" >
+            create_time,
+        </if>
+        <if test="moderSn != null" >
+            moder_sn,
+        </if>
+        <if test="modTime != null" >
+            mod_time
+        </if>
+        )
 		values(
 			#{storeId},
 			#{productId},
@@ -169,7 +200,27 @@
 			#{retailPrice},
 			#{marketPrice},
 			#{stockPrice},
-			#{sellVolume})
+			#{sellVolume},
+
+        <if test="sku != null" >
+            #{sku,jdbcType=VARCHAR},
+        </if>
+        <if test="goodsBizType != null" >
+            #{goodsBizType,jdbcType=CHAR},
+        </if>
+        <if test="createrSn != null" >
+            #{createrSn,jdbcType=VARCHAR},
+        </if>
+        <if test="createTime != null" >
+            #{createTime,jdbcType=TIMESTAMP},
+        </if>
+        <if test="moderSn != null" >
+            #{moderSn,jdbcType=VARCHAR},
+        </if>
+        <if test="modTime != null" >
+            #{modTime,jdbcType=TIMESTAMP}
+        </if>
+        )
 	</insert>
 
     <update id="update" parameterType="com.kmall.admin.entity.ProductStoreRelaEntity">
@@ -183,6 +234,25 @@
             <if test="marketPrice != null">`market_price` = #{marketPrice},</if>
             <if test="stockPrice != null">`stock_price` = #{stockPrice},</if>
             <if test="sellVolume != null">`sell_volume` = #{sellVolume},</if>
+
+            <if test="sku != null" >
+                sku = #{sku,jdbcType=VARCHAR},
+            </if>
+            <if test="goodsBizType != null" >
+                goods_biz_type = #{goodsBizType,jdbcType=CHAR},
+            </if>
+            <if test="createrSn != null" >
+                creater_sn = #{createrSn,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null" >
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="moderSn != null" >
+                moder_sn = #{moderSn,jdbcType=VARCHAR},
+            </if>
+            <if test="modTime != null" >
+                mod_time = #{modTime,jdbcType=TIMESTAMP},
+            </if>
         </set>
         where id = #{id}
     </update>

kmall-admin/src/main/resources/mybatis/mapper/StoreDao.xml

@@ -15,6 +15,13 @@
         <result property="longitude" column="longitude"/>
         <result property="coverRadius" column="cover_radius"/>
         <result property="remark" column="remark"/>
+		<result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
+		<result column="merch_name" property="merchName" jdbcType="VARCHAR" />
+		<result column="creater_sn" property="createrSn" jdbcType="VARCHAR" />
+		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="moder_sn" property="moderSn" jdbcType="VARCHAR" />
+		<result column="mod_time" property="modTime" jdbcType="TIMESTAMP" />
+		<result column="tstm" property="tstm" jdbcType="TIMESTAMP" />
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.admin.entity.StoreEntity">
@@ -29,7 +36,8 @@
 			`latitude`,
 			`longitude`,
 			`cover_radius`,
-			`remark`
+			`remark`,merch_sn, merch_name, creater_sn, create_time,
+		moder_sn, mod_time, tstm
 		from mall_store
 		where id = #{id}
 	</select>
@@ -46,7 +54,8 @@
 		`latitude`,
 		`longitude`,
 		`cover_radius`,
-		`remark`
+		`remark`,merch_sn, merch_name, creater_sn, create_time,
+    moder_sn, mod_time, tstm
 		from mall_store
 		where store_name = #{storeName}
 	</select>
@@ -63,7 +72,8 @@
     		`latitude`,
     		`longitude`,
     		`cover_radius`,
-    		`remark`
+    		`remark`,merch_sn, merch_name, creater_sn, create_time,
+		moder_sn, mod_time, tstm
 		from mall_store
 		WHERE 1=1
 		<if test="storeName != null and storeName.trim() != ''">
@@ -107,7 +117,26 @@
 			`latitude`,
 			`longitude`,
 			`cover_radius`,
-			`remark`)
+			`remark`,
+		<if test="merchSn != null" >
+			merch_sn,
+		</if>
+		<if test="merchName != null" >
+			merch_name,
+		</if>
+		<if test="createrSn != null" >
+			creater_sn,
+		</if>
+		<if test="createTime != null" >
+			create_time,
+		</if>
+		<if test="moderSn != null" >
+			moder_sn,
+		</if>
+		<if test="modTime != null" >
+			mod_time
+		</if>
+		)
 		values(
 			#{storeName},
 			#{storeNumber},
@@ -118,7 +147,27 @@
 			#{latitude},
 			#{longitude},
 			#{coverRadius},
-			#{remark})
+			#{remark},
+
+		<if test="merchSn != null" >
+			#{merchSn,jdbcType=VARCHAR},
+		</if>
+		<if test="merchName != null" >
+			#{merchName,jdbcType=VARCHAR},
+		</if>
+		<if test="createrSn != null" >
+			#{createrSn,jdbcType=VARCHAR},
+		</if>
+		<if test="createTime != null" >
+			#{createTime,jdbcType=TIMESTAMP},
+		</if>
+		<if test="moderSn != null" >
+			#{moderSn,jdbcType=VARCHAR},
+		</if>
+		<if test="modTime != null" >
+			#{modTime,jdbcType=TIMESTAMP}
+		</if>
+		)
 	</insert>
 	 
 	<update id="update" parameterType="com.kmall.admin.entity.StoreEntity">
@@ -133,7 +182,29 @@
 			<if test="latitude != null">`latitude` = #{latitude}, </if>
 			<if test="longitude != null">`longitude` = #{longitude}, </if>
 			<if test="coverRadius != null">`cover_radius` = #{coverRadius}, </if>
-			<if test="remark != null">`remark` = #{remark}</if>
+			<if test="remark != null">`remark` = #{remark},</if>
+
+			<if test="merchSn != null" >
+				merch_sn = #{merchSn,jdbcType=VARCHAR},
+			</if>
+			<if test="merchName != null" >
+				merch_name = #{merchName,jdbcType=VARCHAR},
+			</if>
+			<if test="createrSn != null" >
+				creater_sn = #{createrSn,jdbcType=VARCHAR},
+			</if>
+			<if test="createTime != null" >
+				create_time = #{createTime,jdbcType=TIMESTAMP},
+			</if>
+			<if test="moderSn != null" >
+				moder_sn = #{moderSn,jdbcType=VARCHAR},
+			</if>
+			<if test="modTime != null" >
+				mod_time = #{modTime,jdbcType=TIMESTAMP},
+			</if>
+			<if test="tstm != null" >
+				tstm = #{tstm,jdbcType=TIMESTAMP},
+			</if>
 		</set>
 		where id = #{id}
 	</update>