优化商品置顶

platform-admin/src/main/java/com/platform/controller/api/ShopifyController.java

@@ -446,7 +446,7 @@ public class ShopifyController {
                 tbCfStationItem.setItemCategorytwo(tags);
                 tbCfStationItem.setItemTags(tags);
                 tbCfStationItem.setItemDescritionId(null);
-                tbCfStationItem.setItemTop("N");
+                tbCfStationItem.setItemTop(0);
                 tbCfStationItem.setItemImg(productsObj.getJSONObject("image").getString("src"));
                 tbCfStationItem.setEnableFlag(2);
                 tbCfStationItemDao.save(tbCfStationItem);

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

@@ -81,7 +81,7 @@ public class TbCfStationItemEntity implements Serializable {
     /**
      * 是否置顶 Y:是 N:否
      */
-    private String itemTop;
+    private Integer itemTop;
     /**
      * 供应商
      */
@@ -122,6 +122,18 @@ public class TbCfStationItemEntity implements Serializable {
      * 创建人
      */
     private String creator;
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 
     /**
      * 设置：商品id
@@ -347,18 +359,12 @@ public class TbCfStationItemEntity implements Serializable {
         return itemSku;
     }
 
-    /**
-     * 设置：是否置顶 Y:是 N:否
-     */
-    public void setItemTop(String itemTop) {
-        this.itemTop = itemTop;
+    public Integer getItemTop() {
+        return itemTop;
     }
 
-    /**
-     * 获取：是否置顶 Y:是 N:否
-     */
-    public String getItemTop() {
-        return itemTop;
+    public void setItemTop(Integer itemTop) {
+        this.itemTop = itemTop;
     }
 
     /**

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

@@ -136,7 +136,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         tbCfStationItem.setItemTags(itemSkus.getItemTags());
         tbCfStationItem.setItemLabel(itemSkus.getItemLabel());
         tbCfStationItem.setItemDescritionId(itemSkus.getItemDescritionId());
-        tbCfStationItem.setItemTop("N");
+        tbCfStationItem.setItemTop(0);
         tbCfStationItem.setItemImg(itemSkus.getItemImg());
         tbCfStationItem.setSkuImgs(itemSkus.getSkuImgs());
         tbCfStationItem.setEnableFlag(2);

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

@@ -21,6 +21,7 @@
         <result property="itemCount" column="item_count"/>
         <result property="itemSku" column="item_sku"/>
         <result property="itemTop" column="item_top"/>
+        <result property="sort" column="sort"/>
         <result property="supplier" column="supplier"/>
         <result property="template" column="template"/>
         <result property="skuImgs" column="sku_imgs"/>
@@ -51,6 +52,7 @@
 			`item_count`,
 			`item_sku`,
 			`item_top`,
+			sort,
 			`supplier`,
 			 template,
 			`sku_imgs`,
@@ -83,6 +85,7 @@
 			`item_count`,
 			`item_sku`,
 			`item_top`,
+			sort,
 			`supplier`,
 			 template,
 			`sku_imgs`,
@@ -132,6 +135,7 @@
         i.item_categorytwo,
         i.item_descrition_id,
         i.item_top,
+        i.sort,
         i.supplier,
         i.template,
         i.sku_imgs,
@@ -180,7 +184,7 @@
                 order by ${sidx} ${order}
             </when>
             <otherwise>
-                order by i.create_time desc
+                order by i.item_top desc,i.sort asc
             </otherwise>
         </choose>
         <if test="offset != null and limit != null">
@@ -249,6 +253,7 @@
 			`item_count`,
 			`item_sku`,
 			`item_top`,
+			sort,
 			`supplier`,
 			template,
 			`sku_imgs`,
@@ -277,6 +282,7 @@
 			#{itemCount},
 			#{itemSku},
 			#{itemTop},
+			#{sort},
 			#{supplier},
 			#{template},
 			#{skuImgs},
@@ -308,6 +314,7 @@
             <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="sort != null">`sort` = #{sort},</if>
             <if test="supplier != null">`supplier` = #{supplier},</if>
             <if test="template != null">`template` = #{template},</if>
             <if test="skuImgs != null">`sku_imgs` = #{skuImgs},</if>

platform-admin/src/main/test/test/ImpartCode.java

@@ -373,7 +373,7 @@ public class ImpartCode {
 					tbCfStationItem.setItemCategorytwo(goodsTwoId);
 					tbCfStationItem.setItemDescritionId(goodsThreeId);
 					tbCfStationItem.setItemTags(product_type + "," + two + "," + three);
-					tbCfStationItem.setItemTop("N");
+					tbCfStationItem.setItemTop(0);
 
 					// 上传图片获取主图
 					String src = productsObj.getJSONObject("image").getString("src");

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

@@ -5,7 +5,7 @@ $(function () {
             {label: 'itemId', name: 'itemId', index: 'item_id', key: true, hidden: true},
             {label: '商品图片', name: 'itemImg', index: 'item_img', width: 40, formatter: imageFormat},
             {label: '商品编号', name: 'itemCode', index: 'item_code', width: 60},
-            {label: '商品名称', name: 'itemName', index: 'item_name', width: 160},
+            {label: '商品名称', name: 'itemName', index: 'item_name', width: 120},
             /* {label: '商品标题', name: 'itemBrief', index: 'item_brief', width: 120},*/
             /*{label: '商品链接', name: 'itemUrl', index: 'item_url', width: 80,formatter:linkFormat},*/
             {label: '商品原价', name: 'itemPrice', index: 'item_price', width: 45},
@@ -15,12 +15,26 @@ $(function () {
             /*{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: 'itemTop', index: 'item_top', width: 80,hidden: true},
             {label: '商品一级分类', name: 'goodtype', index: 'goodtype', width: 80},
             {label: '商品二级分类', name: 'title', index: 'title', width: 80},
             {label: '商品三级分类', name: 'dname', index: 'itemDescritionId', width: 80},
             {label: '状态', name: 'enableFlag', index: 'enable_flag', width: 60, formatter: itemStatusFormat},
             {label: '创建日期', name: 'createTime', index: 'create_time', width: 80},
-            {label: '创建人', name: 'uname', index: 'uname', width: 80}
+           /* {label: '创建人', name: 'uname', index: 'uname', width: 80},*/
+            {
+                label: '操作', index: 'operate', width: 120, formatter: function (value, grid, rows) {
+                    if (rows.itemTop === 1) {
+                        return '<span class="label label-danger pointer" onclick="vm.placedTop(\'' + rows.id + '\')">置顶</span>&nbsp;&nbsp;' +
+                            '<span class="label label-warning pointer" onclick="vm.off(\'' + rows.id + '\')" ">取消</span>&nbsp;&nbsp;' +
+                            '<span class="label label-success pointer" onclick="vm.activate(\'' + rows.id + '\')" ">up</span>'+
+                            '<span class="label label-warning pointer" onclick="vm.off(\'' + rows.id + '\')" ">down</span>&nbsp;&nbsp;';
+                    }
+                    return '<span class="label label-info pointer" onclick="vm.placedTop(\'' + rows.id + '\')">置顶</span>&nbsp;&nbsp;' +
+                        '<span class="label label-warning pointer" onclick="vm.off(\'' + rows.id + '\')" ">up</span>&nbsp;&nbsp;' +
+                        '<span class="label label-success pointer" onclick="vm.activate(\'' + rows.id + '\')" ">down</span>';
+                }
+            }
         ]
     });
 });