修改商品oss上传二级目录

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

@@ -29,7 +29,7 @@ public class uploadController {
     @RequestMapping(value = "/uploadFile", produces = "application/json;charset=UTF-8")
     public String upload(MultipartFile file) {
         try {
-            String secondaryFolderName = "Afrishop";
+            String secondaryFolderName = "afrishop";
             // 获取文件名
             String fileName = file.getOriginalFilename();
             // 获取文件后缀

platform-admin/src/main/java/com/platform/dao/AdvertisementItemDao.java

@@ -3,6 +3,7 @@ package com.platform.dao;
 import com.platform.entity.AdvertisementItemEntity;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,5 +28,8 @@ public interface AdvertisementItemDao extends BaseDao<AdvertisementItemEntity> {
 
     int existItemSort(@Param("adId") String adId, @Param("sort") Integer sort);
 
+    List<AdvertisementItemEntity> changeSortBack(@Param("firstSort") Integer firstSort, @Param("endSort") Integer endSort, @Param("adId") String adId);
+
+    List<AdvertisementItemEntity> changeSortFront(@Param("firstSort") Integer firstSort, @Param("endSort") Integer endSort, @Param("adId") String adId);
 
 }

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

@@ -146,13 +146,24 @@ public class AdvertisementItemServiceImpl implements AdvertisementItemService {
             res = advertisementItemDao.updateAdItem(byId);
         } else {
             //要更换的序号被占有
-            //情况3
-            if (byId.getSort() < itemSort) {
-
+            //情况3 (2-->8)
+            Integer sort1 = byId.getSort();
+            if (sort1 < itemSort) {
+                List<AdvertisementItemEntity> list = advertisementItemDao.changeSortBack(sort1 + 1, itemSort, adId);
+                for (AdvertisementItemEntity ad : list) {
+                    ad.setSort(ad.getSort() - 1);
+                    advertisementItemDao.updateAdItem(ad);
+                }
             } else {
-                //情况4
-
+                //情况4 (8-->2)
+                List<AdvertisementItemEntity> list = advertisementItemDao.changeSortFront(itemSort, sort1 - 1, adId);
+                for (AdvertisementItemEntity ad : list) {
+                    ad.setSort(ad.getSort() + 1);
+                    advertisementItemDao.updateAdItem(ad);
                 }
+            }
+            byId.setSort(itemSort);
+            res = advertisementItemDao.updateAdItem(byId);
 
         }
 

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

@@ -57,6 +57,26 @@
         </if>
     </select>
 
+    <select id="changeSortBack" resultType="com.platform.entity.AdvertisementItemEntity">
+        select
+			`ad_id`,
+			`item_id`,
+			`is_top`,
+			`sort`,
+			`create_time`
+			from advertisement_item where sort BETWEEN #{firstSort} AND #{endSort} and ad_id=#{adId}
+    </select>
+
+    <select id="changeSortFront" resultType="com.platform.entity.AdvertisementItemEntity">
+        select
+			`ad_id`,
+			`item_id`,
+			`is_top`,
+			`sort`,
+			`create_time`
+			from advertisement_item where sort BETWEEN #{firstSort} AND #{endSort} and ad_id=#{adId}
+    </select>
+
     <delete id="deleteByItem">
         delete from advertisement_item where item_id=#{itemId} and ad_id=#{adId}
     </delete>