From 009f0ea12c40484991be261c510059a014f97868 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 21 May 2024 10:34:39 +0800
Subject: [PATCH] bug

---
 .../controller/BookLabelAndMarketController.java    | 13 +++++++++++++
 .../controller/CourseSociologyMarketController.java |  6 +++---
 .../SociologyLabelAndMarketController.java          |  8 ++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java
index b48b5b19..d40df76a 100644
--- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java
@@ -79,6 +79,19 @@ public class BookLabelAndMarketController {
         return R.ok().put("result", marketTopList);
     }
 
+    /**
+     * 编辑商品和营销标签的排序权重
+     * @param map
+     * @return
+     */
+    @RequestMapping("/editMarketSort")
+    public R editMarketSort(@RequestBody Map<String,Integer> map){
+        ShopProductToBookMarket toMarket = toMarketService.getById(map.get("id"));
+        toMarket.setSort(map.get("sort"));
+        toMarketService.updateById(toMarket);
+        return R.ok().put("result",toMarket);
+    }
+
     @RequestMapping(path = "/getLabelById")
     public R getLabelById(String id) {
         return R.ok().put("result",labelService.getById(id));
diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java
index 3a45b167..f5620c9a 100644
--- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java
+++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java
@@ -49,7 +49,7 @@ public class CourseSociologyMarketController {
     @RequestMapping("/addSociologyMarket")
     public R addSociologyMarket(@RequestBody CourseSociologyMarketEntity courseSociologyMarketEntity){
         marketService.save(courseSociologyMarketEntity);
-        return R.ok();
+        return R.ok().put("market",courseSociologyMarketEntity);
     }
 
     @RequestMapping("/editSociologyMarket")
@@ -68,8 +68,8 @@ public class CourseSociologyMarketController {
                 return R.error("请先清空绑定的课程后，再操作");
             }
         }
-        marketService.save(courseSociologyMarketEntity);
-        return R.ok();
+        marketService.updateById(courseSociologyMarketEntity);
+        return R.ok().put("market",courseSociologyMarketEntity);
     }
 
     @RequestMapping(path = "/delMarket")
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 a5f89d59..db568bb8 100644
--- a/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java
+++ b/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java
@@ -226,6 +226,14 @@ public class SociologyLabelAndMarketController {
         return R.ok().put("result", page);
     }
 
+    @RequestMapping("/editMarketSort")
+    public R editMarketSort(@RequestBody Map<String,Integer> map){
+        ShopProductToSociologyMarket toMarket = toMarketService.getById(map.get("id"));
+        toMarket.setSort(map.get("sort"));
+        toMarketService.updateById(toMarket);
+        return R.ok().put("market",toMarket);
+    }
+
     /**
      * 获取书标签列表
      */