Merge remote-tracking branch 'origin/lx_dev' into lx_dev

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java

@@ -664,7 +664,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());
     }
@@ -805,7 +805,7 @@ public class BdWaresController extends BaseController {
             }
         }
 
-        waresParams.setSort(0);
+//        waresParams.setSort(0);
         waresService.updateWares(waresParams, userTokenService.getLoginUser());
         //     waresService.saveWaresModifyRecord(waresParams, userTokenService.getLoginUser(),EModifyRecordType.WARES_UPDATE.getValue());
         return AjaxResult.success(waresParams.getWaresCode());
@@ -1181,6 +1181,10 @@ public class BdWaresController extends BaseController {
         String waresCode = CreateNormsCodeUtils.createWaresCode(waresService.getLastWaresCode());
         return AjaxResult.success(waresCode);
     }
+    @GetMapping("/getMaxSortNum")
+    public AjaxResult getMaxSortNum() {
+        return AjaxResult.success("请求成功!", waresService.getMaxSortNum());
+    }
 
     /**
      * 商品序号创建

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();
     /**
      * 新增商品基础信息
      *

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;
@@ -108,6 +109,15 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
     @DubboReference
     ITransactionServiceApi iTransactionServiceApi;
 
+    @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) {

bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml

@@ -143,7 +143,7 @@
                 #{item}
             </foreach>
         </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="getLastWaresCode" resultType="string">
@@ -226,7 +226,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">