From acd23bfed5882cfe29b49e377c5b99c9d78c15eb Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 12 Oct 2022 23:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=92=E5=BA=8F=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=A7=BB=E5=8A=A8=E7=9A=84=E6=95=85=E9=9A=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/service/impl/GoodsServiceImpl.java   | 33 ++++++++++---
 .../chjyj/szwh/service/GoodsServiceTest.java  |  2 +-
 .../service/impl/GoodsServiceImplTest.java    | 49 ++++++++++++++++---
 3 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 2976ba9..e99d45a 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -452,21 +452,40 @@ public class GoodsServiceImpl implements GoodsService {
 
     /**
      * 处理排序问题
+     * 与前一个元素的排序进行互换，需要同时更新两条记录
      * @param goodsIsli
      * @param type
      * @return
      */
     @Override
     public int ranksort(String goodsIsli, int type) {
+        //去除排序列表
+        String where="is_deleted=0 and is_recommend=1";
+        List<Goods> tmpRanklist = goodsMapper.getGoodsByCondition(where, 8, "recommend_sort", "DESC");
         int ret = 0;
-        Goods goods = goodsMapper.getGoodsByIsli(goodsIsli);
-        if (goods != null) {
-            int ranksort = goods.getRecommendSort();
-            int sortaval = type == 1 ? ranksort + 1 : ranksort - 1;
-            if (sortaval < 0) {
-                sortaval = 0;
+        for(int i=0;i<tmpRanklist.size()-1;i++){
+            if(goodsIsli.equals(tmpRanklist.get(i).getGoodsIslicode()) ){
+                // 上移
+                if(type==1) {
+                    if(i==0){
+                        break;
+                    }else {
+                        goodsMapper.updateRecommend(tmpRanklist.get(i-1).getGoodsIslicode(),
+                                tmpRanklist.get(i).getRecommendSort());
+                        ret = goodsMapper.updateRecommend(tmpRanklist.get(i).getGoodsIslicode(),
+                                tmpRanklist.get(i-1).getRecommendSort());
+                    }
+                }else{
+                    if(i==tmpRanklist.size()-1){
+                        break;
+                    }else{
+                        goodsMapper.updateRecommend(tmpRanklist.get(i+1).getGoodsIslicode(),
+                                tmpRanklist.get(i).getRecommendSort());
+                        ret = goodsMapper.updateRecommend(tmpRanklist.get(i).getGoodsIslicode(),
+                                tmpRanklist.get(i+1).getRecommendSort());
+                    }
+                }
             }
-            ret = goodsMapper.updateRankSort(goodsIsli, sortaval);
         }
         return ret;
     }
diff --git a/src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java b/src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java
index 5421d21..e012e04 100644
--- a/src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java
+++ b/src/test/java/cn/chjyj/szwh/service/GoodsServiceTest.java
@@ -33,7 +33,7 @@ public class GoodsServiceTest {
     @Test
     public void getMapDataByTyep() {
         int type=1;
-        List<Goods> glist = goodsService.getMapDataByTyep(type);
+        List<Goods> glist = goodsService.getMapDataByType(type);
         for(Goods g:glist){
             System.out.println(g.getGoodsDetailId());
         }
diff --git a/src/test/java/cn/chjyj/szwh/service/impl/GoodsServiceImplTest.java b/src/test/java/cn/chjyj/szwh/service/impl/GoodsServiceImplTest.java
index 639c1df..f32faf2 100644
--- a/src/test/java/cn/chjyj/szwh/service/impl/GoodsServiceImplTest.java
+++ b/src/test/java/cn/chjyj/szwh/service/impl/GoodsServiceImplTest.java
@@ -1,6 +1,8 @@
 package cn.chjyj.szwh.service.impl;
 
+import cn.chjyj.szwh.bean.Goods;
 import cn.chjyj.szwh.mapper.FestivalsMapper;
+import cn.chjyj.szwh.mapper.GoodsMapper;
 import cn.chjyj.szwh.service.GoodsService;
 import cn.chjyj.szwh.utils.ApiGoodsUtils;
 import cn.chjyj.szwh.utils.DateUtils;
@@ -17,8 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
+import java.util.*;
 
 import static org.junit.Assert.*;
 
@@ -26,6 +27,8 @@ import static org.junit.Assert.*;
 @RunWith(SpringJUnit4ClassRunner.class)
 @Transactional
 public class GoodsServiceImplTest {
+    @Autowired
+    private GoodsMapper goodsMapper;
     @Autowired
     private GoodsService goodsService;
     // 节假日mapper
@@ -72,8 +75,44 @@ public class GoodsServiceImplTest {
     public void delRank() {
     }
 
+    /**
+     * 测试排序操作
+     */
+    @Rollback(true)
     @Test
     public void ranksort() {
+        //商品编号
+        String goods_isliCode="010007-00000000187499999999-1";
+        // 1:add 2: reduce
+        int sortType=1;
+
+        String where="is_deleted=0 and is_recommend=1";
+        List<Goods> tmpRanklist = goodsMapper.getGoodsByCondition(where,8, "recommend_sort", "DESC");
+        //tmpRanklist.get(0);
+        for(int i=0;i<tmpRanklist.size()-1;i++){
+            if(goods_isliCode.equals(tmpRanklist.get(i).getGoodsIslicode()) ){
+                // for add
+                if(sortType==1) {
+                    if(i==0){
+                        break;
+                    }else {
+                        goodsMapper.updateRecommend(tmpRanklist.get(i-1).getGoodsIslicode(),
+                                tmpRanklist.get(i).getRecommendSort());
+                        goodsMapper.updateRecommend(tmpRanklist.get(i).getGoodsIslicode(),
+                                tmpRanklist.get(i-1).getRecommendSort());
+                    }
+                }else{
+                    if(i==tmpRanklist.size()-1){
+                        break;
+                    }else{
+                        goodsMapper.updateRecommend(tmpRanklist.get(i+1).getGoodsIslicode(),
+                                tmpRanklist.get(i).getRecommendSort());
+                        goodsMapper.updateRecommend(tmpRanklist.get(i).getGoodsIslicode(),
+                                tmpRanklist.get(i+1).getRecommendSort());
+                    }
+                }
+            }
+        }
     }
 
     /**
@@ -146,12 +185,6 @@ public class GoodsServiceImplTest {
                         // 委托开始时间 匹配时间格式，防止转码出错
                         Date wtStart = sdf.parse(ncstart);
                         ncst = new Timestamp(wtStart.getTime());
-                        // 判断周几
-                        calendar.setTime(wtStart);
-                        int wkday = calendar.get(Calendar.DAY_OF_WEEK);
-                        //周末顺延
-                        // notice:在节假日调休时候，会有变动
-                        iday += wkday > 5 ? (wkday - 5 + 1) : 0;
                         // 委托终止时间
                         Date wtEnd = DateUtils.daysAgoOrAfter(wtStart, iday);
                         // 统计该时间段内的节假日