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 ruleAttrs = new ArrayList<>(); List 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 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 implements IR Rule rule = Rule.updateBuilder(ruleAttrReq); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); //查找当前规格属性 - List 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 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 implements IR */ @Override public int deleteRuleById(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Rule byId = this.getById(queryWrapper.eq(Rule::getId, id)); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + ruleAttrService.remove(wrapper.eq(RuleAttr::getRuleId, byId.getId())); return ruleMapper.deleteRuleById(id); }