diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java index 88ea445e..17fd8f57 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java @@ -25,6 +25,8 @@ public class ShopProductToMedicineMarket implements Serializable { */ private Date createTime; + private Integer sort; + @TableLogic private Integer delFlag; diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java index 28db30c4..81b57e18 100644 --- a/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java @@ -25,6 +25,8 @@ public class ShopProductToSociologyMarket implements Serializable { */ private Date createTime; + private Integer sort; + @TableLogic private Integer delFlag; diff --git a/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java b/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java index 73609d5d..a5f89d59 100644 --- a/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java @@ -279,6 +279,7 @@ public class SociologyLabelAndMarketController { if (params.containsKey("sociologyMarketId")&&!"".equals(params.get("sociologyMarketId").toString())){ wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,params.get("sociologyMarketId").toString()); } + wrapper.orderByAsc(ShopProductToSociologyMarket::getSort); Page page = toMarketService.page(new Page<>( Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); List res = page.getRecords(); @@ -292,6 +293,12 @@ public class SociologyLabelAndMarketController { return R.ok().put("result", page); } + @RequestMapping("/editToMarketSort") + public R editToMarketSort(@RequestBody Map map){ + toMarketService.editToMarketSort(map); + return R.ok(); + } + @RequestMapping(path = "/saveToLabel") public R saveToLabel(@RequestBody Map params) { if (!StringUtils.isEmpty(params.get("productId").toString())){ diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java b/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java index 32a9aa8a..a0c8f0fd 100644 --- a/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java +++ b/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java @@ -3,5 +3,9 @@ package com.peanut.modules.master.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.ShopProductToSociologyMarket; +import java.util.Map; + public interface ShopProductToSociologyMarketService extends IService { + + void editToMarketSort(Map map); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java index 89eb4f9d..3e1339c8 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java @@ -7,7 +7,16 @@ import com.peanut.modules.master.service.ShopProductToSociologyMarketService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Map; + @Slf4j @Service("masterShopProductToSociologyMarketService") public class ShopProductToSociologyMarketServiceImpl extends ServiceImpl implements ShopProductToSociologyMarketService { + + @Override + public void editToMarketSort(Map map) { + ShopProductToSociologyMarket info = this.getById(map.get("id")); + info.setSort(map.get("sort")); + this.updateById(info); + } } diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java index f114c929..cb05a80f 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java @@ -38,6 +38,7 @@ public class ShopProductServiceImpl extends ServiceImpl shopProductPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ShopProduct.class, wrapper); return shopProductPage; }