修改商品管理，新加供应商、商品链接

platform-admin/src/main/java/com/platform/entity/TbCfStationItemEntity.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * 表名 tb_cf_station_item
  *
  * @author lipengjun
- * @date 2019-12-23 10:20:34
+ * @date 2020-01-14 18:31:13
  */
 public class TbCfStationItemEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -39,7 +39,7 @@ public class TbCfStationItemEntity implements Serializable {
      */
     private BigDecimal itemPrice;
     /**
-     * 商品折扣价格
+     * 商品折扣价
      */
     private BigDecimal discountPrice;
     /**
@@ -58,6 +58,10 @@ public class TbCfStationItemEntity implements Serializable {
      * 浏览人数
      */
     private Long itemNum;
+    /**
+     * 收藏人数
+     */
+    private Long itemCollectionNum;
     /**
      * 商品库存
      */
@@ -70,6 +74,10 @@ public class TbCfStationItemEntity implements Serializable {
      * 是否置顶 Y:是 N:否
      */
     private String itemTop;
+    /**
+     * 供应商
+     */
+    private String supplier;
     /**
      * 所属平台
      */
@@ -81,7 +89,7 @@ public class TbCfStationItemEntity implements Serializable {
     /**
      * 状态 0、删除 1、上架 2、下架
      */
-    private Integer enableFlag=2;
+    private Integer enableFlag;
     /**
      * 创建日期
      */
@@ -173,16 +181,19 @@ public class TbCfStationItemEntity implements Serializable {
     public BigDecimal getItemPrice() {
         return itemPrice;
     }
-
-
-    public BigDecimal getDiscountPrice() {
-        return discountPrice;
-    }
-
+    /**
+     * 设置：商品折扣价
+     */
     public void setDiscountPrice(BigDecimal discountPrice) {
         this.discountPrice = discountPrice;
     }
 
+    /**
+     * 获取：商品折扣价
+     */
+    public BigDecimal getDiscountPrice() {
+        return discountPrice;
+    }
     /**
      * 设置：商品链接
      */
@@ -235,6 +246,19 @@ public class TbCfStationItemEntity implements Serializable {
     public Long getItemNum() {
         return itemNum;
     }
+    /**
+     * 设置：收藏人数
+     */
+    public void setItemCollectionNum(Long itemCollectionNum) {
+        this.itemCollectionNum = itemCollectionNum;
+    }
+
+    /**
+     * 获取：收藏人数
+     */
+    public Long getItemCollectionNum() {
+        return itemCollectionNum;
+    }
     /**
      * 设置：商品库存
      */
@@ -274,6 +298,19 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemTop() {
         return itemTop;
     }
+    /**
+     * 设置：供应商
+     */
+    public void setSupplier(String supplier) {
+        this.supplier = supplier;
+    }
+
+    /**
+     * 获取：供应商
+     */
+    public String getSupplier() {
+        return supplier;
+    }
     /**
      * 设置：所属平台
      */

platform-admin/src/main/java/com/platform/service/impl/TbCfStationItemServiceImpl.java

@@ -106,6 +106,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         tbCfStationItem.setItemId(itemId);
         tbCfStationItem.setCreateTime(new Date());
         tbCfStationItem.setItemNum(0L);
+        tbCfStationItem.setItemUrl(itemSkus.getItemUrl());
+        tbCfStationItem.setSupplier(itemSkus.getSupplier());
         tbCfStationItem.setItemPrice(itemSkus.getItemPrice());
         tbCfStationItem.setDiscountPrice(itemSkus.getDiscountPrice());
         tbCfStationItem.setItemBrief(itemSkus.getItemBrief());
@@ -118,6 +120,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         tbCfStationItem.setItemDescritionId(itemSkus.getItemDescritionId());
         tbCfStationItem.setItemTop("N");
         tbCfStationItem.setItemImg(itemSkus.getItemImg());
+        tbCfStationItem.setEnableFlag(2);
         if (itemSkus.isPutaway()) {
             tbCfStationItem.setEnableFlag(1);
         }
@@ -227,6 +230,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         if (tbCfStationItem != null) {
             tbCfStationItem.setItemPrice(itemSkus.getItemPrice());
             tbCfStationItem.setDiscountPrice(itemSkus.getDiscountPrice());
+            tbCfStationItem.setItemUrl(itemSkus.getItemUrl());
+            tbCfStationItem.setSupplier(itemSkus.getSupplier());
             tbCfStationItem.setItemBrief(itemSkus.getItemBrief());
             tbCfStationItem.setItemName(itemSkus.getItemName());
             tbCfStationItem.setItemCode(itemSkus.getItemCode());
@@ -389,6 +394,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         item.setItemPrice(new BigDecimal(values[4]));
         item.setDiscountPrice(new BigDecimal(values[5]));
         String url = OssUtil.upload(new File(values[6]), "product");
+        System.err.println(url);
         item.setItemImg(url);
         item.setItemCount(Long.parseLong(values[7]));
         item.setItemCategory(values[8]);

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -18,6 +18,7 @@
         <result property="itemCount" column="item_count"/>
         <result property="itemSku" column="item_sku"/>
         <result property="itemTop" column="item_top"/>
+        <result property="supplier" column="supplier"/>
         <result property="platformCode" column="platform_code"/>
         <result property="platformName" column="platform_name"/>
         <result property="enableFlag" column="enable_flag"/>
@@ -42,6 +43,7 @@
 			`item_count`,
 			`item_sku`,
 			`item_top`,
+			`supplier`,
 			`platform_code`,
 			`platform_name`,
 			`enable_flag`,
@@ -68,6 +70,7 @@
 			`item_count`,
 			`item_sku`,
 			`item_top`,
+			`supplier`,
 			`platform_code`,
 			`platform_name`,
 			`enable_flag`,
@@ -99,6 +102,7 @@
         i.item_categorytwo,
         i.item_descrition_id,
         i.item_top,
+        i.supplier,
         d.descripition_name dname,
         t.goodstwotype_title title,
         o.goodstype_title goodtype
@@ -173,12 +177,14 @@
 			`item_category`,
 			`item_price`,
 			`discount_price`,
+			`item_url`,
 			`item_img`,
 			`item_tags`,
 			`item_num`,
 			`item_count`,
 			`item_sku`,
 			`item_top`,
+			`supplier`,
 			`enable_flag`,
 			`create_time`,
 			`item_categorytwo`,
@@ -191,12 +197,14 @@
 			#{itemCategory},
 			#{itemPrice},
 			#{discountPrice},
+			#{itemUrl},
 			#{itemImg},
 			#{itemTags},
 			#{itemNum},
 			#{itemCount},
 			#{itemSku},
 			#{itemTop},
+			#{supplier},
 			#{enableFlag},
 			#{createTime},
 			#{itemCategorytwo},
@@ -206,20 +214,26 @@
     <update id="update" parameterType="com.platform.entity.TbCfStationItemEntity">
         update tb_cf_station_item
         <set>
-            <if test="itemCode != null">`item_code` = #{itemCode},</if>
-            <if test="itemName != null">`item_name` = #{itemName},</if>
-            <if test="itemBrief != null">`item_brief` = #{itemBrief},</if>
-            <if test="itemCategory != null">`item_category` = #{itemCategory},</if>
-            <if test="itemPrice != null">`item_price` = #{itemPrice},</if>
-            <if test="discountPrice != null">`discount_price` = #{discountPrice},</if>
-            <if test="itemImg != null">`item_img` = #{itemImg},</if>
-            <if test="itemTags != null">`item_tags` = #{itemTags},</if>
-            <if test="itemCount != null">`item_count` = #{itemCount},</if>
-            <if test="itemSku != null">`item_sku` = #{itemSku},</if>
-            <if test="itemTop != null">`item_top` = #{itemTop},</if>
-            <if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
-            <if test="createTime != null">`create_time` = #{createTime},</if>
-            <if test="itemCategorytwo != null">`item_categorytwo` = #{itemCategorytwo},</if>
+            <if test="itemCode != null">`item_code` = #{itemCode}, </if>
+            <if test="itemName != null">`item_name` = #{itemName}, </if>
+            <if test="itemBrief != null">`item_brief` = #{itemBrief}, </if>
+            <if test="itemCategory != null">`item_category` = #{itemCategory}, </if>
+            <if test="itemPrice != null">`item_price` = #{itemPrice}, </if>
+            <if test="discountPrice != null">`discount_price` = #{discountPrice}, </if>
+            <if test="itemUrl != null">`item_url` = #{itemUrl}, </if>
+            <if test="itemImg != null">`item_img` = #{itemImg}, </if>
+            <if test="itemTags != null">`item_tags` = #{itemTags}, </if>
+            <if test="itemNum != null">`item_num` = #{itemNum}, </if>
+            <if test="itemCollectionNum != null">`item_collection_num` = #{itemCollectionNum}, </if>
+            <if test="itemCount != null">`item_count` = #{itemCount}, </if>
+            <if test="itemSku != null">`item_sku` = #{itemSku}, </if>
+            <if test="itemTop != null">`item_top` = #{itemTop}, </if>
+            <if test="supplier != null">`supplier` = #{supplier}, </if>
+            <if test="platformCode != null">`platform_code` = #{platformCode}, </if>
+            <if test="platformName != null">`platform_name` = #{platformName}, </if>
+            <if test="enableFlag != null">`enable_flag` = #{enableFlag}, </if>
+            <if test="createTime != null">`create_time` = #{createTime}, </if>
+            <if test="itemCategorytwo != null">`item_categorytwo` = #{itemCategorytwo}, </if>
             <if test="itemDescritionId != null">`item_descrition_id` = #{itemDescritionId}</if>
         </set>
         where item_id = #{itemId}

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html

@@ -285,6 +285,12 @@
                     </div>
                 </div>
             </Form-item>
+            <Form-item label="商品链接" prop="itemUrl" style="width: 800px">
+                <i-input v-model="tbCfStationItem.itemUrl" placeholder="商品链接"/>
+            </Form-item>
+            <Form-item label="供应商" prop="supplier" style="width: 800px">
+                <i-input v-model="tbCfStationItem.supplier" placeholder="供应商"/>
+            </Form-item>
             <Form-item label="商品一级分类" prop="itemCategory" style="width: 800px">
                 <i-select placeholder="请选择" v-model="tbCfStationItem.itemCategory" @on-change="changeGoodstype">
                     <i-option v-for="(el,i) in Goodstype" :key='i'

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -14,6 +14,7 @@ $(function () {
             {label: '点击量', name: 'itemNum', index: 'item_num', width: 45},
             /*{label: '所属平台', name: 'platformCode', index: 'platform_code', width: 80},
             {label: '平台名', name: 'platformName', index: 'platform_name', width: 80},*/
+            {label: '供应商', name: 'supplier', index: 'supplier', width: 80},
             {label: '商品一级分类', name: 'goodtype', index: 'goodtype', width: 80},
             {label: '商品二级分类', name: 'title', index: 'title', width: 80},
             {label: '商品品名', name: 'dname', index: 'itemDescritionId', width: 80},