From df01c0a5ee64260657c6728520f522d92b638c97 Mon Sep 17 00:00:00 2001
From: Saisai Liu <1374434128@qq.com>
Date: Sun, 10 Mar 2024 15:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=89=8D=E5=8F=B0=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=EF=BC=8C=E5=8D=95=E8=A7=84=E6=A0=BC=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=9A=E4=BA=8E=E6=95=B0=E6=8D=AE=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/muyu/product/domain/RuleAttr.java    |  2 +-
 .../com/muyu/product/domain/req/RuleAttrReq.java  |  2 --
 .../product/service/impl/RuleServiceImpl.java     | 15 ++++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttr.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttr.java
index 0890fdb..ac2491a 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttr.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttr.java
@@ -56,7 +56,7 @@ public class RuleAttr extends BaseEntity {
         ArrayList<RuleAttr> ruleAttrs = new ArrayList<>();
         List<RuleAttrAddModel> ruleAttrAddModels = req.getRuleAttrList();
         ruleAttrAddModels.stream().map(
-                ruleAttrAddModel -> ruleAttrs.addAll(RuleAttr.constructBuilder(ruleAttrAddModel,username,req.getRuleId())
+                ruleAttrAddModel -> ruleAttrs.addAll(RuleAttr.constructBuilder(ruleAttrAddModel,username,req.getId())
                 )).toList();
         return ruleAttrs;
     }
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrReq.java
index e05215d..2cd5080 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrReq.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrReq.java
@@ -27,8 +27,6 @@ public class RuleAttrReq extends BaseEntity {
 
     /** 主键 */
     private Long id;
-    /** 规格id */
-    private Long ruleId;
     /**规格名称*/
     private String name;
     /** 属性组 */
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java
index 25639ce..bb4b1b0 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java
@@ -79,7 +79,6 @@ public class RuleServiceImpl extends ServiceImpl<RuleMapper, Rule> implements IR
     public int insertRule(RuleAttrReq ruleAttrReq) {
         Rule rule = Rule.saveBuilder(ruleAttrReq, SecurityUtils::getUsername);
         int i = ruleMapper.insertRule(rule);
-        ruleAttrReq.setRuleId(rule.getId());
         ruleAttrService.saveBatch(RuleAttr.saveBuilder(ruleAttrReq, SecurityUtils::getUsername));
         return i;
     }
@@ -98,12 +97,10 @@ public class RuleServiceImpl extends ServiceImpl<RuleMapper, Rule> implements IR
         Rule rule = Rule.updateBuilder(ruleAttrReq);
         LambdaQueryWrapper<RuleAttr> wrapper = new LambdaQueryWrapper<>();
         //查找当前规格属性
-        List<Long> longs = ruleAttrService.list(wrapper.eq(RuleAttr::getRuleId, rule.getId())).stream().map(RuleAttr::getId).toList();
-        ruleAttrService.removeBatchByIds(longs);
-        RuleAttr.saveBuilder(ruleAttrReq,SecurityUtils::getUsername)
-                .stream().map(
-                        ruleAttr -> ruleAttrService.insertRuleAttr(ruleAttr)
-                ).count();
+//        List<Long> longs = ruleAttrService.list(wrapper.eq(RuleAttr::getRuleId, rule.getId())).stream().map(RuleAttr::getId).toList();
+        ruleAttrService.remove(wrapper.eq(RuleAttr::getRuleId, rule.getId()));
+//        ruleAttrService.removeBatchByIds(longs);
+        ruleAttrService.saveBatch(RuleAttr.saveBuilder(ruleAttrReq, SecurityUtils::getUsername));
         return ruleMapper.updateRule(rule);
     }
 
@@ -126,6 +123,10 @@ public class RuleServiceImpl extends ServiceImpl<RuleMapper, Rule> implements IR
      */
     @Override
     public int deleteRuleById(Long id) {
+        LambdaQueryWrapper<Rule> queryWrapper = new LambdaQueryWrapper<>();
+        Rule byId = this.getById(queryWrapper.eq(Rule::getId, id));
+        LambdaQueryWrapper<RuleAttr> wrapper = new LambdaQueryWrapper<>();
+        ruleAttrService.remove(wrapper.eq(RuleAttr::getRuleId, byId.getId()));
         return ruleMapper.deleteRuleById(id);
     }