From 0a234db339e0a2a82f42b0c7e04e5ceddb0299ec Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Mon, 21 Mar 2022 02:16:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81spu=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=E5=88=86=E7=B1=BB=E3=80=81=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E6=9F=A5=E8=AF=A2=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mall/product/maintain/manager.vue   | 14 ++---
 .../views/mall/product/maintain/spuinfo.vue   |  4 +-
 .../service/impl/SpuInfoServiceImpl.java      | 30 ++++++++--
 .../xjs/mall/product/vo/spu/SpuInfoVo.java    | 58 +++++++++++++++++++
 4 files changed, 92 insertions(+), 14 deletions(-)
 create mode 100644 xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/spu/SpuInfoVo.java

diff --git a/ruoyi-ui/src/views/mall/product/maintain/manager.vue b/ruoyi-ui/src/views/mall/product/maintain/manager.vue
index 982967ff..a75809f5 100644
--- a/ruoyi-ui/src/views/mall/product/maintain/manager.vue
+++ b/ruoyi-ui/src/views/mall/product/maintain/manager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="mod-config">
+  <div class="app-container">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form :inline="true" :model="dataForm">
         <el-form-item label="分类">
@@ -91,8 +91,8 @@
 </template>
 
 <script>
-import CategoryCascader from "../common/category-cascader";
-import BrandSelect from "../common/brand-select";
+import CategoryCascader from '../../../components/mall/category-cascader'
+import BrandSelect from "../../../components/mall/brand-select";
 export default {
   data() {
     return {
@@ -127,15 +127,15 @@ export default {
   methods: {
     getSkuDetails(row, expand) {
       //sku详情查询
-      console.log("展开某行...", row, expand);
     },
+
     //处理更多指令
     handleCommand(row, command) {
-      console.log("~~~~~", row, command);
-      if ("stockSettings" == command) {
+      if ("stockSettings" === command) {
         this.$router.push({ path: "/ware-sku", query: { skuId: row.skuId } });
       }
     },
+
     searchSkuInfo() {
       this.getDataList();
     },
@@ -192,6 +192,6 @@ export default {
   beforeDestroy() {
     PubSub.unsubscribe(this.catPathSub);
     PubSub.unsubscribe(this.brandIdSub);
-  } //生命周期 - 销毁之前
+  }
 };
 </script>
diff --git a/ruoyi-ui/src/views/mall/product/maintain/spuinfo.vue b/ruoyi-ui/src/views/mall/product/maintain/spuinfo.vue
index 078e0a02..4c9c1f9d 100644
--- a/ruoyi-ui/src/views/mall/product/maintain/spuinfo.vue
+++ b/ruoyi-ui/src/views/mall/product/maintain/spuinfo.vue
@@ -10,8 +10,8 @@
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
       <el-table-column prop="spuName" header-align="center" align="center" label="名称" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="spuDescription" header-align="center" align="center" label="描述" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="catalogId" header-align="center" align="center" label="分类" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="brandId" header-align="center" align="center" label="品牌" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="catalogName" header-align="center" align="center" label="分类" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="brandName" header-align="center" align="center" label="品牌" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="weight" header-align="center" align="center" width="80px" label="重量(kg)" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="publishStatus" header-align="center" width="80px" align="center" label="上架状态" :show-overflow-tooltip="true">
         <template slot-scope="scope">
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoServiceImpl.java
index 606c4837..98923f56 100644
--- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoServiceImpl.java
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/SpuInfoServiceImpl.java
@@ -45,6 +45,10 @@ public class SpuInfoServiceImpl extends ServiceImpl<SpuInfoDao, SpuInfoEntity> i
     private SkuSaleAttrValueService skuSaleAttrValueService;
     @Resource
     private RemoteCouponFeign remoteCouponFeign;
+    @Autowired
+    private CategoryService categoryService;
+    @Autowired
+    private BrandService brandService;
 
 
     @Override
@@ -169,12 +173,28 @@ public class SpuInfoServiceImpl extends ServiceImpl<SpuInfoDao, SpuInfoEntity> i
                 .eq(StringUtils.isNotEmpty(catelogId), SpuInfoEntity::getCatalogId, catelogId);
         wrapper.orderByDesc(SpuInfoEntity::getCreateTime);
 
-        IPage<SpuInfoEntity> page = this.page(
-                new Query<SpuInfoEntity>().getPage(params),
-                wrapper
-        );
+        IPage<SpuInfoEntity> page = this.page(new Query<SpuInfoEntity>().getPage(params), wrapper);
+
+        List<SpuInfoEntity> spuInfoEntities = page.getRecords();
+        List<SpuInfoVo> collect = spuInfoEntities.stream().map(spuInfoEntity -> {
+            SpuInfoVo spuInfoVo = new SpuInfoVo();
+            BeanUtils.copyProperties(spuInfoEntity, spuInfoVo);
+
+            //获取分类信息
+            CategoryEntity categoryEntity = categoryService.getById(spuInfoEntity.getCatalogId());
+            spuInfoVo.setCatalogName(categoryEntity.getName());
+
+            //获取品牌信息
+            BrandEntity brandEntity = brandService.getById(spuInfoEntity.getBrandId());
+            spuInfoVo.setBrandName(brandEntity.getName());
+
+            return spuInfoVo;
+        }).collect(Collectors.toList());
+
+        PageUtils pageUtils = new PageUtils(page);
+        pageUtils.setList(collect);
 
-        return new PageUtils(page);
+        return pageUtils;
     }
 
 
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/spu/SpuInfoVo.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/spu/SpuInfoVo.java
new file mode 100644
index 00000000..7a0526bf
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/spu/SpuInfoVo.java
@@ -0,0 +1,58 @@
+package com.xjs.mall.product.vo.spu;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * spu信息展示vo
+ * @author xiejs
+ * @since 2022-03-21
+ */
+@Data
+public class SpuInfoVo {
+    private Long id;
+    /**
+     * 商品名称
+     */
+    private String spuName;
+    /**
+     * 商品描述
+     */
+    private String spuDescription;
+    /**
+     * 所属分类id
+     */
+    private Long catalogId;
+    /**
+     * 品牌id
+     */
+    private Long brandId;
+    /**
+     *
+     */
+    private BigDecimal weight;
+    /**
+     * 上架状态[0 - 下架，1 - 上架]
+     */
+    private Integer publishStatus;
+    /**
+     *
+     */
+    private Date createTime;
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     * 分类名称
+     */
+    private String catalogName;
+
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+}