优化商品置顶排序

platform-admin/src/main/java/com/platform/controller/TbCfStationItemController.java

@@ -295,4 +295,12 @@ public class TbCfStationItemController extends ApiBaseAction {
         return R.error("交换失败");
     }
 
+    @RequestMapping("/existItemSort")
+    @ResponseBody
+    public R existItemSort(@RequestParam("sort") Integer sort) {
+
+        boolean exist = tbCfStationItemService.existItemSort(sort);
+
+        return R.ok().put("exist", exist);
+    }
 }

platform-admin/src/main/java/com/platform/service/TbCfStationItemService.java

@@ -107,4 +107,6 @@ public interface TbCfStationItemService {
     int itemUpward(String itemId);
 
     int itemDownward(String itemId);
+
+    boolean existItemSort(Integer sort);
 }

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

@@ -121,6 +121,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         }
         //商品主体信息
         TbCfStationItemEntity tbCfStationItem = new TbCfStationItemEntity();
+        tbCfStationItem.setSort(itemSkus.getSort());
         tbCfStationItem.setItemId(itemId);
         tbCfStationItem.setCreateTime(new Date());
         tbCfStationItem.setItemNum(0L);
@@ -263,6 +264,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         //商品主体信息
         TbCfStationItemEntity tbCfStationItem = tbCfStationItemDao.queryObject(itemId);
         if (tbCfStationItem != null) {
+            tbCfStationItem.setSort(itemSkus.getSort());
             tbCfStationItem.setItemPrice(itemSkus.getItemPrice());
             tbCfStationItem.setDiscountPrice(itemSkus.getDiscountPrice());
             tbCfStationItem.setCostPrice(itemSkus.getCostPrice());
@@ -548,5 +550,11 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         }
         return res;
     }
+
+    @Override
+    public boolean existItemSort(Integer sort) {
+
+        return tbCfStationItemDao.queryItemBySort(sort) == null ? false : true;
+    }
 }
 

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

@@ -55,6 +55,7 @@
         i.item_top,
         i.sort,
         i.supplier,
+        template,
         item_desc itemDesc
 		from tb_cf_station_item i left join tb_cf_item_desc d on i.item_id=d.item_id
 		where i.item_id = #{id}

platform-admin/src/main/resources/dev/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=diaoyun666
+#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=root
+#jdbc.password=diaoyun666
 
-#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-#jdbc.username: root
-#jdbc.password: Diaoyunnuli.8
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.username: root
+jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30

platform-admin/src/main/resources/prod/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=diaoyun666
+#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=root
+#jdbc.password=diaoyun666
 
-#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-#jdbc.username: root
-#jdbc.password: Diaoyunnuli.8
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.username: root
+jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30 

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

@@ -592,6 +592,9 @@
         </div>
         <p slot="title">{{title}}</p>
         <i-form ref="formValidate" :model="tbCfStationItem" :rules="ruleValidate" :label-width="80">
+            <Form-item  label="序号" prop="sort" style="width: 800px">
+                <i-input v-model="tbCfStationItem.sort" placeholder="置顶商品序号"/>
+            </Form-item>
             <Form-item label="商品编号" prop="itemCode" style="width: 800px">
                 <i-input v-model="tbCfStationItem.itemCode" placeholder="商品编号"/>
             </Form-item>

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

@@ -83,7 +83,7 @@ let app = new Vue({
                 },
                 {
                     isActive: false,
-                    title: '成交量'
+                    title: '下单量'
                 }
             ],
             bottomOption: [
@@ -721,7 +721,7 @@ let app = new Vue({
                 let url = '../tbcforder/getOrderByDate';
                 this.templateMethod1(url);
             } else if (index === 3) {
-                this.initEchartsMiddleData[0].name = '成交量'
+                this.initEchartsMiddleData[0].name = '下单量'
                 let url = '../tbcforder/getOrderPaidByDate';
                 this.templateMethod1(url);
             }
@@ -763,7 +763,7 @@ let app = new Vue({
                     this.initEchartsMiddle();
                 })
             } else if (this.middleOption[3].isActive) {
-                //成交量
+                //下单量
                 let url = '../tbcforder/getOrderPaidByDate?start=' + e[0] + '&end=' + e[1];
                 $.get(url, res => {
                     this.initEchartsMiddleData[0].data = []
@@ -910,4 +910,4 @@ let app = new Vue({
         }, 0);
 
     }
-})
\ No newline at end of file
+})

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

@@ -481,6 +481,17 @@ let vm = new Vue({
         },
         saveOrUpdate: function (event) {
             let flag = true
+            let exist = false
+            let url = '../tbcfstationitem/existItemSort?sort=' + vm.tbCfStationItem.sort;
+            Ajax.request({
+                url: url,
+                type: "GET",
+                contentType: "application/json",
+                successCallback: function (r) {
+                    exist = r.exist
+
+                }
+            });
             this.paramster.forEach(item => {
                 if (item.paramValue == '' || item.paramValue == null) {
                     flag = false
@@ -489,6 +500,8 @@ let vm = new Vue({
             if (vm.prevItem.length === 0 || !flag) {
                 console.log(123);
                 alert('请编辑完属性或参数后再保存');
+            } else if (exist) {
+                alert('序号['+vm.tbCfStationItem.sort+']已存在');
             } else {
                 let resArr = [];
                 this.prevItem.forEach(item => {