diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoUpdResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoUpdResp.java new file mode 100644 index 0000000..97bc1e5 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoUpdResp.java @@ -0,0 +1,45 @@ +package com.muyu.product.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import com.muyu.product.domain.model.RuleAttrAddModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author:cuifubo + * @Package:com.muyu.product.domain.resp + * @Project:cloud-server + * @name:RuleInfoUpdResp + * @Date:2024.11.14 16:10 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RuleInfoUpdResp { + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 规格名称 */ + @Excel(name = "规格名称") + @ApiModelProperty(name = "规格名称", value = "规格名称") + private String name; + + /** 规格状态 */ + @Excel(name = "规格状态") + @ApiModelProperty(name = "规格状态", value = "规格状态") + private String status; + /** + * 规格属性集合 + */ + private List ruleAttrList; +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java index 479a281..bb03272 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java @@ -7,6 +7,7 @@ import com.muyu.common.core.text.Convert; import com.muyu.product.domain.model.RuleInfoAddModel; import com.muyu.product.domain.resp.RuleAttributeResp; import com.muyu.product.domain.resp.RuleInfoResp; +import com.muyu.product.domain.resp.RuleInfoUpdResp; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -78,9 +79,8 @@ public class RuleInfoController extends BaseController { @RequiresPermissions("product:rule:query") @GetMapping(value = "/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) - public Result getInfo(@PathVariable("id") Long id) { - RuleInfoAddModel updById = ruleInfoService.getUpdById(id); - return Result.success(updById); + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(ruleInfoService.getUpdById(id)); } /** diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java index c2e7b85..d177b0d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java @@ -9,6 +9,7 @@ import com.muyu.product.domain.model.RuleInfoAddModel; import com.muyu.product.domain.req.RuleInfoQueryReq; import com.muyu.product.domain.resp.RuleAttributeResp; import com.muyu.product.domain.resp.RuleInfoResp; +import com.muyu.product.domain.resp.RuleInfoUpdResp; /** * 商品规格Service接口 @@ -35,5 +36,5 @@ public interface RuleInfoService extends IService { TableDataInfo queryList (RuleInfoQueryReq ruleInfoQueryReq); - RuleInfoAddModel getUpdById(Long id); + RuleInfoUpdResp getUpdById(Long id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java index fbe0dbc..035837e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java @@ -19,6 +19,7 @@ import com.muyu.product.domain.model.RuleInfoAddModel; import com.muyu.product.domain.req.RuleInfoQueryReq; import com.muyu.product.domain.resp.RuleAttributeResp; import com.muyu.product.domain.resp.RuleInfoResp; +import com.muyu.product.domain.resp.RuleInfoUpdResp; import com.muyu.product.service.RuleAttrInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -111,28 +112,42 @@ public class RuleInfoServiceImpl extends ServiceImpl } @Override - public RuleInfoAddModel getUpdById(Long id) { + public RuleInfoUpdResp getUpdById(Long id) { RuleInfo byId = this.getById(id); - List infoByRuleId = ruleAttrInfoService.getRuleInfo(byId.getId()); - ArrayList ruleAttrAddModels = new ArrayList<>(); - RuleAttrAddModel ruleAttrAddModel = new RuleAttrAddModel(); - for (RuleAttrInfo ruleAttrInfo : infoByRuleId) { - ruleAttrAddModel.setName(ruleAttrInfo.getName()); - } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(RuleAttrInfo::getRuleId,id); + List attrInfoList = this.ruleAttrInfoService.list(queryWrapper); - List list = infoByRuleId.stream() - .map(RuleAttrInfo::getAttrValue) - .toList(); - ruleAttrAddModel.setValueList(list); - ruleAttrAddModels.add(ruleAttrAddModel); - RuleInfoAddModel updById = new RuleInfoAddModel(); - updById.setId(byId.getId()); - updById.setName(byId.getName()); - updById.setStatus(byId.getStatus()); - updById.setRuleAttrList(ruleAttrAddModels); - return updById; + return RuleInfoUpdResp.builder() + .id(byId.getId()) + .name(byId.getName()) + .status(byId.getStatus()) + .ruleAttrList(attrInfoList.stream().map(RuleAttrAddModel::infoBuild).toList()) + .build(); } +// RuleInfo byId = this.getById(id); +// +// List infoByRuleId = ruleAttrInfoService.getRuleInfo(byId.getId()); +// ArrayList ruleAttrAddModels = new ArrayList<>(); +// RuleAttrAddModel ruleAttrAddModel = new RuleAttrAddModel(); +// for (RuleAttrInfo ruleAttrInfo : infoByRuleId) { +// ruleAttrAddModel.setName(ruleAttrInfo.getName()); +// } +// +// List list = infoByRuleId.stream() +// .map(RuleAttrInfo::getAttrValue) +// .toList(); +// ruleAttrAddModel.setValueList(list); +// ruleAttrAddModels.add(ruleAttrAddModel); +// RuleInfoAddModel updById = new RuleInfoAddModel(); +// updById.setId(byId.getId()); +// updById.setName(byId.getName()); +// updById.setStatus(byId.getStatus()); +// updById.setRuleAttrList(ruleAttrAddModels); +// return updById; + + }