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 a4ab0b76..39df481e 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 @@ -297,7 +297,7 @@ public class BdWaresController extends BaseController { if (!isPutOn) { return AjaxResult.error("产品规格至少有一个上架"); } - wares.setSort(0); +// wares.setSort(0); iBdWaresService.saveWares(wares, userTokenService.getLoginUser()); return AjaxResult.success(wares.getWaresCode()); } @@ -429,7 +429,7 @@ public class BdWaresController extends BaseController { } } - waresParams.setSort(0); +// waresParams.setSort(0); iBdWaresService.updateWares(waresParams, userTokenService.getLoginUser()); return AjaxResult.success(waresParams.getWaresCode()); } @@ -794,6 +794,10 @@ public class BdWaresController extends BaseController { String waresCode = CreateNormsCodeUtils.createWaresCode(iBdWaresService.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 fb836c13..57410693 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 { + /** + * 获取最大排序值 + * @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 440668e7..0fdf6c5a 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; @@ -88,6 +89,15 @@ public class BdWaresServiceImpl extends ServiceImpl impl @DubboReference IRangeServiceApi iRangeServiceApi; + @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 fcb01e90..4ab09698 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 @@ -232,7 +232,7 @@ and bw.WARES_STATUS <= #{waresStatus} - order by bw.SORT_STATUS desc , bw.WARES_PRICE ,bw.CREATION_TIME desc + order by bw.sort desc, bw.CREATION_TIME desc