From 18def4fffcf324d3f74935785208770956ed8bd2 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Mon, 21 Jul 2025 09:27:12 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=95=86=E5=93=81=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wares/controller/manage/BdWaresController.java     |  8 ++++++--
 .../com/hzs/sale/wares/service/IBdWaresService.java    |  5 +++++
 .../sale/wares/service/impl/BdWaresServiceImpl.java    | 10 ++++++++++
 .../main/resources/mapper/sale/wares/BdWaresMapper.xml |  4 ++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
index 33361086..acc4280c 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
@@ -327,7 +327,7 @@ public class BdWaresController extends BaseController {
         if (!isPutOn) {
             return AjaxResult.error("产品规格至少有一个上架");
         }
-        wares.setSort(0);
+//        wares.setSort(0);
         waresService.saveWares(wares, userTokenService.getLoginUser());
         return AjaxResult.success(wares.getWaresCode());
     }
@@ -458,7 +458,7 @@ public class BdWaresController extends BaseController {
             }
         }
 
-        waresParams.setSort(0);
+//        waresParams.setSort(0);
         waresService.updateWares(waresParams, userTokenService.getLoginUser());
         return AjaxResult.success(waresParams.getWaresCode());
     }
@@ -825,6 +825,10 @@ public class BdWaresController extends BaseController {
         String waresCode = CreateNormsCodeUtils.createWaresCode(waresService.getLastWaresCode());
         return AjaxResult.success(waresCode);
     }
+    @GetMapping("/getMaxSortNum")
+    public AjaxResult getMaxSortNum() {
+        return AjaxResult.success("请求成功!", iBdWaresService.getMaxSortNum());
+    }
 
     /**
      * 商品序号创建
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java
index fbd9f3da..75ceaa62 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java
@@ -23,6 +23,11 @@ import java.util.Map;
  */
 public interface IBdWaresService extends IService<BdWares> {
 
+    /**
+     * 获取最大排序值
+     * @return
+     */
+    int getMaxSortNum();
     /**
      * 新增商品基础信息
      *
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java
index 3189c5fa..aa40b32b 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java
@@ -1,6 +1,7 @@
 package com.hzs.sale.wares.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -95,6 +96,15 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
     @DubboReference
     ITransactionServiceApi transactionServiceApi;
 
+    @Override
+    public int getMaxSortNum() {
+        Integer maxSort = this.getMaxSort(SecurityUtils.getPkCountry());
+        if(ObjectUtil.isNotEmpty(maxSort)){
+            return maxSort + 1;
+        }
+        return  1;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BdWares saveWares(WaresParams waresParams, LoginUser user) {
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
index 10ef5e7d..12191f58 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
@@ -228,7 +228,7 @@
         <if test="waresStatus != null">
             and bw.WARES_STATUS &lt;= #{waresStatus}
         </if>
-        order by bw.SORT_STATUS desc , bw.WARES_PRICE ,bw.CREATION_TIME desc
+        order by bw.sort desc, bw.CREATION_TIME desc
     </select>
 
     <select id="selectByMoveUpSort" resultType="integer">
@@ -437,7 +437,7 @@
         <if test="param.systemType">
             and bw.system_type = #{param.systemType}
         </if>
-        order by bw.SORT_STATUS desc , bw.WARES_PRICE ,bw.CREATION_TIME desc
+        order by bw.SORT desc, bw.CREATION_TIME desc
     </select>
 
     <!-- 查询盒数商品对应产品列表 -->