From 654cf3f6fdb808feba230d221e6a6d841d5a2b4a Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 21 May 2024 14:10:01 +0800
Subject: [PATCH] bug

---
 .../controller/CourseMedicineMarketController.java  | 12 ------------
 .../MedicineLabelAndMarketController.java           | 13 +++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java
index 30fd181d..7bfeaeac 100644
--- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java
+++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java
@@ -161,18 +161,6 @@ public class CourseMedicineMarketController {
         return R.ok();
     }
 
-    /**
-     * 修改商品和营销标签下的排序权重
-     * @return
-     */
-    @RequestMapping("/editMarketSort")
-    public R editMarketSort(@RequestBody Map<String,Integer> map){
-        CourseToMedicineMarketEntity toMarket = toMarketService.getById(map.get("id"));
-        toMarket.setSort(map.get("sort"));
-        toMarketService.updateById(toMarket);
-        return R.ok().put("result",toMarket);
-    }
-
     @RequestMapping(path = "/delToMarket")
     public R delToMarket(String marketId,String courseId) {
         if(StringUtils.isNotEmpty(courseId)){
diff --git a/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java b/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java
index 1566be33..be39f0a8 100644
--- a/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java
+++ b/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java
@@ -116,6 +116,18 @@ public class MedicineLabelAndMarketController {
         }
     }
 
+    /**
+     * 修改商品和营销标签下的排序权重
+     * @return
+     */
+    @RequestMapping("/editMarketSort")
+    public R editMarketSort(@RequestBody Map<String,Integer> map){
+        ShopProductToMedicineMarket toMarket = toMarketService.getById(map.get("id"));
+        toMarket.setSort(map.get("sort"));
+        toMarketService.updateById(toMarket);
+        return R.ok().put("result",toMarket);
+    }
+
     @RequestMapping(path = "/delLabel")
     public R delLabel(String id) {
         ShopProductMedicineLabel label = labelService.getById(id);
@@ -279,6 +291,7 @@ public class MedicineLabelAndMarketController {
         if (params.containsKey("medicineMarketId")&&!"".equals(params.get("medicineMarketId").toString())){
             wrapper.eq(ShopProductToMedicineMarket::getMedicineMarketId,params.get("medicineMarketId").toString());
         }
+        wrapper.orderByAsc(ShopProductToMedicineMarket::getSort);
         Page<ShopProductToMedicineMarket> page = toMarketService.page(new Page<>(
                 Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
         List<ShopProductToMedicineMarket> res = page.getRecords();