From be370ba2cf190b1a441b13ff13074eba1a79bc11 Mon Sep 17 00:00:00 2001
From: franky <frankyhu@outlook.com>
Date: Tue, 5 Jul 2022 22:33:11 +0800
Subject: [PATCH 01/56] =?UTF-8?q?spu=20=E4=BF=AE=E6=94=B9=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=BB=84=E5=90=88=E5=88=86=E7=B1=BB=E5=92=8C?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9=E7=9A=84=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/ProductPropertyViewRespVO.java         | 43 +++++++++++++++++++
 .../controller/admin/spu/vo/SpuRespVO.java    | 11 +++--
 .../service/spu/ProductSpuServiceImpl.java    | 31 +++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
new file mode 100644
index 000000000..0499138a9
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.product.controller.admin.property.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.Set;
+
+/**
+ * @Description: ProductPropertyViewRespVO
+ * @Author: franky
+ * @CreateDate: 2022/7/5 21:29
+ * @Version: 1.0.0
+ */
+@ApiModel("管理后台 - 规格名称详情展示 Request VO")
+@Data
+@ToString(callSuper = true)
+public class ProductPropertyViewRespVO {
+
+    @ApiModelProperty(value = "规格名称id", example = "1")
+    public Long propertyId;
+
+    @ApiModelProperty(value = "规格名称", example = "内存")
+    public String name;
+
+    @ApiModelProperty(value = "规格属性值集合", example = "[{\"v1\":11,\"v2\":\"64G\"},{\"v1\":10,\"v2\":\"32G\"}]")
+    public Set<Tuple2> propertyValues;
+
+    @Data
+    @ApiModel(value = "规格属性值元组")
+    public static class Tuple2 {
+        private final long v1;
+        private final String v2;
+        public Tuple2(Long v1, String v2) {
+            this.v1 = v1;
+            this.v2 = v2;
+        }
+
+    }
+
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
index 90387f90a..0121aec47 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
 
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyViewRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +20,7 @@ public class SpuRespVO extends ProductSpuBaseVO {
 
     // TODO @franky：注解要完整
 
-    @ApiModelProperty(value = "主键", required = true)
+    @ApiModelProperty(value = "主键", required = true, example = "1")
     private Long id;
 
     @ApiModelProperty(value = "创建时间")
@@ -28,9 +29,13 @@ public class SpuRespVO extends ProductSpuBaseVO {
     /**
      * SKU 数组
      */
-    List<ProductSkuRespVO> skus;
+    @ApiModelProperty(value = "sku 数组", example = "[{\"spuId\":4,\"properties\":[{\"propertyId\":3,\"valueId\":15},{\"propertyId\":2,\"valueId\":10}],\"price\":12,\"originalPrice\":32,\"costPrice\":22,\"barCode\":\"765670123123\",\"picUrl\":\"http://test.yudao.iocoder.cn/72938088f1ca8438837c3b51394aea43.jpg\",\"status\":0,\"id\":7,\"createTime\":1656683270000},{\"spuId\":4,\"properties\":[{\"propertyId\":3,\"valueId\":15},{\"propertyId\":2,\"valueId\":11}],\"price\":13,\"originalPrice\":33,\"costPrice\":23,\"barCode\":\"888788770999\",\"picUrl\":\"http://test.yudao.iocoder.cn/6b902c700e5d32e862b6fd9af2e1c0e4.jpg\",\"status\":0,\"id\":8,\"createTime\":1656683270000},{\"spuId\":4,\"properties\":[{\"propertyId\":3,\"valueId\":16},{\"propertyId\":2,\"valueId\":10}],\"price\":14,\"originalPrice\":34,\"costPrice\":24,\"barCode\":\"9999981212\",\"picUrl\":\"http://test.yudao.iocoder.cn/eddf3c79b1917160d94d05244e1f47da.jpg\",\"status\":0,\"id\":9,\"createTime\":1656683270000},{\"spuId\":4,\"properties\":[{\"propertyId\":3,\"valueId\":16},{\"propertyId\":2,\"valueId\":11}],\"price\":15,\"originalPrice\":35,\"costPrice\":25,\"barCode\":\"4444121212\",\"picUrl\":\"http://test.yudao.iocoder.cn/88ac3eb068ea9cfac4726879b2776ccf.jpg\",\"status\":0,\"id\":10,\"createTime\":1656683270000}]")
+    private List<ProductSkuRespVO> skus;
 
     @ApiModelProperty(value = "分类id数组，一直递归到一级父节点", example = "[1,2,4]")
-    LinkedList<Long> categoryIds;
+    private LinkedList<Long> categoryIds;
+
+    @ApiModelProperty(value = "规格属性修改和详情展示组合", example = "[{\"propertyId\":2,\"name\":\"内存\",\"propertyValues\":[{\"v1\":11,\"v2\":\"64G\"},{\"v1\":10,\"v2\":\"32G\"}]},{\"propertyId\":3,\"name\":\"尺寸\",\"propertyValues\":[{\"v1\":16,\"v2\":\"6.1\"},{\"v1\":15,\"v2\":\"5.7\"}]}]")
+    private List<ProductPropertyViewRespVO> productPropertyViews;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 4420b0af8..eb48bed25 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -1,6 +1,10 @@
 package cn.iocoder.yudao.module.product.service.spu;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyViewRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
@@ -11,6 +15,7 @@ import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
 import cn.iocoder.yudao.module.product.service.category.CategoryService;
+import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +46,9 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     @Resource
     private ProductSkuService productSkuService;
 
+    @Resource
+    private ProductPropertyService productPropertyService;
+
     @Override
     @Transactional
     public Long createSpu(ProductSpuCreateReqVO createReqVO) {
@@ -104,6 +112,29 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         if (null != spuVO) {
             List<ProductSkuRespVO> skuReqs = ProductSkuConvert.INSTANCE.convertList(productSkuService.getSkusBySpuId(id));
             spuVO.setSkus(skuReqs);
+            List<ProductSkuRespVO.Property> properties = new ArrayList<>();
+            // 组合 sku 规格属性
+            for (ProductSkuRespVO productSkuRespVO : skuReqs) {
+                properties.addAll(productSkuRespVO.getProperties());
+            }
+            Map<Long, List<ProductSkuBaseVO.Property>> propertyMaps = properties.stream().collect(Collectors.groupingBy(ProductSkuBaseVO.Property::getPropertyId));
+            List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(new ArrayList<>(propertyMaps.keySet()));
+            // 装载组装过后的属性
+            List<ProductPropertyViewRespVO> productPropertyViews = new ArrayList<>();
+            propertyAndValueList.forEach(p -> {
+                ProductPropertyViewRespVO productPropertyViewRespVO = new ProductPropertyViewRespVO();
+                productPropertyViewRespVO.setPropertyId(p.getId());
+                productPropertyViewRespVO.setName(p.getName());
+                Set<ProductPropertyViewRespVO.Tuple2> propertyValues = new HashSet<>();
+                Map<Long, ProductPropertyValueRespVO> propertyValueMaps = p.getPropertyValueList().stream().collect(Collectors.toMap(ProductPropertyValueRespVO::getId, pv -> pv));
+                propertyMaps.get(p.getId()).forEach(pv -> {
+                    ProductPropertyViewRespVO.Tuple2 tuple2 = new ProductPropertyViewRespVO.Tuple2(pv.getValueId(), propertyValueMaps.get(pv.getValueId()).getName());
+                    propertyValues.add(tuple2);
+                });
+                productPropertyViewRespVO.setPropertyValues(propertyValues);
+                productPropertyViews.add(productPropertyViewRespVO);
+            });
+            spuVO.setProductPropertyViews(productPropertyViews);
             // 组合分类
             if (null != spuVO.getCategoryId()) {
                 LinkedList<Long> categoryArray = new LinkedList<>();

From f3c83488a3f0aee95609d80e1a424eb32638a434 Mon Sep 17 00:00:00 2001
From: franky <16621167566@163.com>
Date: Wed, 6 Jul 2022 17:06:19 +0800
Subject: [PATCH 02/56] =?UTF-8?q?spu=20=E4=BF=AE=E6=94=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mall/product/spu/index.vue      | 1019 +++++++++--------
 1 file changed, 560 insertions(+), 459 deletions(-)

diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index da7d18115..753589719 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -55,8 +55,8 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="主键" align="center" prop="id"/>
       <el-table-column label="商品名称" align="center" prop="name"/>
-<!--      <el-table-column label="卖点" align="center" prop="sellPoint"/>-->
-<!--      <el-table-column label="描述" align="center" prop="description"/>-->
+      <!--      <el-table-column label="卖点" align="center" prop="sellPoint"/>-->
+      <!--      <el-table-column label="描述" align="center" prop="description"/>-->
       <el-table-column label="分类id" align="center" prop="categoryId"/>
       <el-table-column label="商品主图地址" align="center" prop="picUrls">
         <template slot-scope="scope">
@@ -67,7 +67,7 @@
       <el-table-column label="点赞初始人数" align="center" prop="likeCount"/>
       <el-table-column label="价格 (分)" align="center" prop="price"/>
       <el-table-column label="库存数量" align="center" prop="quantity"/>
-<!--      <el-table-column label="状态" align="center" prop="status"/>-->
+      <!--      <el-table-column label="状态" align="center" prop="status"/>-->
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -115,7 +115,7 @@
         <el-form-item label="商品规格">
           <el-button size="mini" @click="shopTagInput()">添加规格</el-button>
           <div v-for="(tag, tagIndex) in skuTags" :key="tagIndex">
-            <span>{{tag.name}}</span>
+            <span>{{ tag.name }}</span>
             <el-button style="margin-left: 10px" class="button-new-tag" type="text" icon="el-icon-delete"
                        @click="removeTag(tagIndex)">删除
             </el-button>
@@ -125,7 +125,7 @@
               :key="tagItem"
               style="margin-right: 10px"
               :disable-transitions="false">
-              {{tagItem}}
+              {{ tagItem }}
             </el-tag>
             <!--            <el-input-->
             <!--              class="input-new-tag"-->
@@ -176,7 +176,7 @@
             :span-method="tableSpanMethod">
             <el-table-column v-for="(leftTitle, index) in skuTags" :key="index" :label="leftTitle.name">
               <template slot-scope="scope">
-                {{scope.row.propertyChildNames[index]}}
+                {{ scope.row.propertyChildNames[index] }}
               </template>
             </el-table-column>
             <el-table-column v-if="skuTags.length"
@@ -244,7 +244,8 @@
             <el-table-column
               label="操作">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="changeSkuStatus(`${scope.$index}`)" v-if="scope.row.status===0">
+                <el-button type="text" size="small" @click="changeSkuStatus(`${scope.$index}`)"
+                           v-if="scope.row.status===0">
                   正常
                 </el-button>
                 <el-button type="text" size="small" @click="changeSkuStatus(`${scope.$index}`)" v-else>已禁用</el-button>
@@ -280,464 +281,564 @@
 </template>
 
 <script>
-    import {createSpu, updateSpu, deleteSpu, getSpu, getSpuPage, exportSpuExcel} from "@/api/mall/product/spu";
-    import {
-        createCategory,
-        deleteCategory,
-        exportCategoryExcel,
-        getCategory,
-        listCategory,
-        updateCategory
-    } from "@/api/mall/product/category";
-    import {
-        createProperty,
-        updateProperty,
-        deleteProperty,
-        getProperty,
-        getPropertyPage,
-        exportPropertyExcel
-    } from "@/api/mall/product/property";
+import {createSpu, updateSpu, deleteSpu, getSpu, getSpuPage, exportSpuExcel} from "@/api/mall/product/spu";
+import {
+  createCategory,
+  deleteCategory,
+  exportCategoryExcel,
+  getCategory,
+  listCategory,
+  updateCategory
+} from "@/api/mall/product/category";
+import {
+  createProperty,
+  updateProperty,
+  deleteProperty,
+  getProperty,
+  getPropertyPage,
+  exportPropertyExcel
+} from "@/api/mall/product/property";
 
-    import Editor from '@/components/Editor';
-    import ImageUpload from '@/components/ImageUpload';
+import Editor from '@/components/Editor';
+import ImageUpload from '@/components/ImageUpload';
 
-    export default {
-        name: "Spu",
-        components: {
-            Editor, ImageUpload
-        },
-        data() {
-            return {
-                tableLeftTitles: [],
-                dbTagValues: [],
-                allhistoryTags: [],
-                unUseTags: [],
-                propertyPageList: [],
-                isShowTagInput: false,
-                addTagInput: {
-                    name: '',
-                    propertyId: '',
-                    selectValues: [],
-                    selectValueIds: [],
-                },
-                skuTags: [],
-                propName: {
-                    checkStrictly: true,
-                    label: 'name',
-                    value: 'id'
-                },
-                categoryList: [],
-                // 遮罩层
-                loading: true,
-                // 导出遮罩层
-                exportLoading: false,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 商品spu列表
-                list: [],
-                // 弹出层标题
-                title: "",
-                // 是否显示弹出层
-                open: false,
-                dateRangeCreateTime: [],
-                // 查询参数
-                queryParams: {
-                    pageNo: 1,
-                    pageSize: 10,
-                    name: null,
-                    sellPoint: null,
-                    description: null,
-                    categoryId: null,
-                    picUrls: null,
-                    sort: null,
-                    likeCount: null,
-                    price: null,
-                    quantity: null,
-                    status: null,
-                },
-                // 表单参数
-                form: {
-                    id: undefined,
-                    name: undefined,
-                    sellPoint: undefined,
-                    description: undefined,
-                    categoryId: undefined,
-                    categoryIds: [],
-                    picUrls: undefined,
-                    sort: undefined,
-                    likeCount: undefined,
-                    price: undefined,
-                    quantity: undefined,
-                    status: undefined,
-                    isShowTagInput: undefined,
-                    skus:[],
-                },
-                // 表单校验
-                rules: {
-                    sellPoint: [{required: true, message: "卖点不能为空", trigger: "blur"}],
-                    description: [{required: true, message: "描述不能为空", trigger: "blur"}],
-                    categoryIds: [{required: true, message: "分类id不能为空", trigger: "blur"}],
-                    picUrls: [{required: true, message: "商品主图地址", trigger: "blur"}],
-                    sort: [{required: true, message: "排序字段不能为空", trigger: "blur"}],
-                },
-                tagIndex:0,
-            };
-        },
-        created() {
-
-            this.getList();
-
-        },
-        methods: {
-            getTableSpecData() {
-                return this.value
-            },
-            tableSpanMethod({row, column, rowIndex, columnIndex}) {
-
-            },
-            changeSkuStatus(tagIndex) {
-                if(this.form.skus[tagIndex].status == 0){
-                    this.form.skus[tagIndex].status = 1 ;
-                }else {
-                    this.form.skus[tagIndex].status = 0 ;
-                }
-
-            },
-            skuAddProdName() {
-                if (this.initing) {
-                    return
-                }
-                let skuList = []
-                for (let i = 0; i < this.value.length; i++) {
-                    const sku = Object.assign({}, this.value[i])
-                    if (!sku.properties) {
-                        return
-                    }
-                    sku.skuName = ''
-                    let properties = sku.properties.split(';')
-                    for (const propertiesKey in properties) {
-                        sku.skuName += properties[propertiesKey].split(':')[1] + ' '
-                    }
-                    sku.prodName = this.prodName + ' ' + sku.skuName
-                    skuList.push(sku)
-                }
-                this.$emit('input', skuList)
-            },
-            handleTagClose(tagIndex, tagItemIndex) {
-
-            },
-            //确定添加sku规格
-            addTag() {
-
-                let skus = this.unUseTags.map(function (item, index) {
-                    return item.name
-                });
-                console.log("skus=="+JSON.stringify(skus))
-                let index = skus.indexOf(this.addTagInput.name);
-                console.log("index=="+index)
-                console.log("skus[index].id=="+this.unUseTags[index].id)
-                console.log("this.unUseTags[index].propertyValueList=="+JSON.stringify(this.unUseTags[index].propertyValueList))
-                this.addTagInput.propertyId = this.unUseTags[index].id;
-                for (let i = 0; i < this.addTagInput.selectValues.length; i++) {
-                    for (let j = 0; j < this.unUseTags[index].propertyValueList.length; j++) {
-                        if (this.addTagInput.selectValues[i] === this.unUseTags[index].propertyValueList[j].name) {
-                            this.addTagInput.selectValueIds.push(this.unUseTags[index].propertyValueList[j].id)
-                        }
-                    }
-                }
-                let addTagInput = JSON.parse(JSON.stringify(this.addTagInput))
-                console.log("addTagInput=="+JSON.stringify(addTagInput))
-                this.skuTags.push(addTagInput);
-                this.unUseTags.splice(index, 1);
-                this.isShowTagInput = false;
-                this.getTable();
-            },
-            getTable(){
-                this.form.skus=[];
-                let skuTags = JSON.parse(JSON.stringify(this.skuTags));
-                let sku1s = [];
-                let skuIds = [];
-                let propertyIds = [];
-                let propertyNames = [];
-                for (let i = 0; i < skuTags.length; i++) {
-                    sku1s.push(skuTags[i].selectValues);
-                   skuIds.push(skuTags[i].selectValueIds);
-                   propertyIds.push(skuTags[i].propertyId);
-                   propertyNames.push(skuTags[i].name);
-                }
-                let skuAll = sku1s.reduce((x,y) =>{
-                    let arr = [];
-                    x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
-                    return arr;
-                },[[]])
-                console.log(skuAll);
-
-                let skuIdAll = skuIds.reduce((x,y) =>{
-                    let arr = [];
-                    x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
-                    return arr;
-                },[[]])
-                console.log(skuIdAll);
-                for (let i = 0; i < skuAll.length; i++) {
-                    let han = {
-                        propertyNames:propertyNames,
-                        propertyIds:propertyIds,
-                        propertyChildNames:skuAll[i],
-                        propertyChildIds:skuIdAll[i],
-                        properties: [],
-                        picUrl: '',
-                        costPrice: '',
-                        originalPrice: '',
-                        spuId: '',
-                        prodName: '',
-                        price: '',
-                        barCode: '',
-                        status: '0',
-                    }
-                    this.form.skus.push(han);
-                }
-                this.form.skus.forEach(x=>{
-                    x.properties=[];
-                    for (let i = 0; i <x.propertyIds.length ; i++) {
-                        x.properties.push({
-                            propertyId:x.propertyIds[i],
-                            valueId:x.propertyChildIds[i]
-                        })
-                    }
-                })
-
-                console.log("this.skus=="+JSON.stringify(this.form.skus))
-            },
-            hideTagInput() {
-                this.isShowTagInput = false;
-                this.addTagInput = {
-                    name: '',
-                    propertyId: '',
-                    selectValues: [],
-                    selectValueIds: [],
-                };
-            },
-            shopTagInput() {
-                if (this.unUseTags.length <= 0) {
-                    return this.$message.error("规格已经添加完毕")
-                }
-                this.isShowTagInput = true;
-                this.addTagInput = {
-                    name: '',
-                    propertyId: '',
-                    selectValues: [],
-                    selectValueIds: [],
-                };
-            },
-            //删除已选的规格
-            removeTag(row) {
-                let skus = this.allhistoryTags.map(function (item, index) {
-                    return item.name
-                })
-                let index = skus.indexOf(this.skuTags[row].name);
-                this.unUseTags.push(this.allhistoryTags[index]);
-                this.skuTags.splice(row, 1);
-                this.getTable();
-            },
-            handleTagClick(row) {
-                for (let i = 0; i < this.propertyPageList.length; i++) {
-                    if (row == this.propertyPageList[i].name) {
-                        this.dbTagValues = this.propertyPageList[i].propertyValueList
-                    }
-                }
-            },
-            /** 查询规格 */
-            getPropertyPageList() {
-                // 执行查询
-                getPropertyPage().then(response => {
-                    this.propertyPageList = response.data.list;
-
-                    this.unUseTags = this.propertyPageList.map(function (item, index) {
-                        return item
-                    })
-                    this.allhistoryTags = JSON.parse(JSON.stringify(this.unUseTags));
-                    console.log(this.propertyPageList)
-                });
-            },
-            /** 查询分类 */
-            getListCategory() {
-                // 执行查询
-                listCategory().then(response => {
-                    this.categoryList = this.handleTree(response.data, "id", "parentId");
-
-                });
-            },
-            /** 查询列表 */
-            getList() {
-                this.loading = true;
-                // 处理查询参数
-                let params = {...this.queryParams};
-                this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
-                // 执行查询
-                getSpuPage(params).then(response => {
-                    this.list = response.data.list;
-                    this.total = response.data.total;
-                    this.loading = false;
-                });
-            },
-            /** 取消按钮 */
-            cancel() {
-                this.open = false;
-                this.reset();
-            },
-            /** 表单重置 */
-            reset() {
-
-                this.form = {
-                    id: undefined,
-                    name: undefined,
-                    sellPoint: undefined,
-                    description: undefined,
-                    categoryId: undefined,
-                    categoryIds: [],
-                    picUrls: undefined,
-                    sort: undefined,
-                    likeCount: undefined,
-                    price: undefined,
-                    quantity: undefined,
-                    status: undefined,
-                    isShowTagInput: undefined,
-                    skus:[],
-                };
-                this.skuTags=[];
-                this.resetForm("form");
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNo = 1;
-                this.getList();
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRangeCreateTime = [];
-                this.resetForm("queryForm");
-                this.handleQuery();
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset();
-                this.open = true;
-                this.title = "添加商品spu";
-                this.getListCategory();
-                this.getPropertyPageList();
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset();
-                const id = row.id;
-                getSpu(id).then(response => {
-                  console.log(">>>>>> response.data:" + JSON.stringify(response.data))
-                    let dataSpu = response.data;
-                    this.form = {
-                        id: dataSpu.id,
-                        name: dataSpu.name,
-                        sellPoint: dataSpu.sellPoint,
-                        description: dataSpu.sellPoint,
-                        categoryId: dataSpu.sellPoint,
-                        categoryIds: dataSpu.categoryIds,
-                        picUrls: dataSpu.picUrls,
-                        sort: dataSpu.sort,
-                        likeCount: dataSpu.likeCount,
-                        price: dataSpu.price,
-                        quantity: dataSpu.quantity,
-                        status: dataSpu.status,
-                        isShowTagInput:undefined,
-                        skus:dataSpu.skus
-                        // skus:dataSpu.productSkuRespVOS,
-                    };
-                    this.open = true;
-                    this.title = "修改商品spu";
-                });
-            },
-
-            /** 提交按钮 */
-            submitForm() {
-                console.log(this.form.picUrls.split(','));
-
-                this.$refs["form"].validate(valid => {
-                    if (!valid) {
-                        return;
-                    }
-                    this.form.picUrls = this.form.picUrls.split(',');
-                    this.form.categoryId = this.form.categoryIds[(this.form.categoryIds.length - 1)];
-                    this.form.status = Number(this.form.status);
-                    // 修改的提交
-                    if (this.form.id != null) {
-                        updateSpu(this.form).then(response => {
-                            this.$modal.msgSuccess("修改成功");
-                            this.open = false;
-                            this.getList();
-                        });
-                        return;
-                    }
-                    // 添加的提交
-                    createSpu(this.form).then(response => {
-                        this.$modal.msgSuccess("新增成功");
-                        this.open = false;
-                        this.getList();
-                    });
-                });
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                const id = row.id;
-                this.$modal.confirm('是否确认删除商品spu编号为"' + id + '"的数据项?').then(function () {
-                    return deleteSpu(id);
-                }).then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("删除成功");
-                }).catch(() => {
-                });
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                // 处理查询参数
-                let params = {...this.queryParams};
-                params.pageNo = undefined;
-                params.pageSize = undefined;
-                this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
-                // 执行导出
-                this.$modal.confirm('是否确认导出所有商品spu数据项?').then(() => {
-                    this.exportLoading = true;
-                    return exportSpuExcel(params);
-                }).then(response => {
-                    this.$download.excel(response, '商品spu.xls');
-                    this.exportLoading = false;
-                }).catch(() => {
-                });
-            }
-        }
+export default {
+  name: "Spu",
+  components: {
+    Editor, ImageUpload
+  },
+  data() {
+    return {
+      tableLeftTitles: [],
+      dbTagValues: [],
+      allhistoryTags: [],
+      unUseTags: [],
+      propertyPageList: [],
+      isShowTagInput: false,
+      addTagInput: {
+        name: '',
+        propertyId: '',
+        selectValues: [],
+        selectValueIds: [],
+        selectObect:[],
+      },
+      skuTags: [],
+      propName: {
+        checkStrictly: true,
+        label: 'name',
+        value: 'id'
+      },
+      categoryList: [],
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 商品spu列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        sellPoint: null,
+        description: null,
+        categoryId: null,
+        picUrls: null,
+        sort: null,
+        likeCount: null,
+        price: null,
+        quantity: null,
+        status: null,
+      },
+      // 表单参数
+      form: {
+        id: undefined,
+        name: undefined,
+        sellPoint: undefined,
+        description: undefined,
+        categoryId: undefined,
+        categoryIds: [],
+        picUrls: undefined,
+        sort: undefined,
+        likeCount: undefined,
+        price: undefined,
+        quantity: undefined,
+        status: undefined,
+        isShowTagInput: undefined,
+        skus: [],
+      },
+      // 表单校验
+      rules: {
+        sellPoint: [{required: true, message: "卖点不能为空", trigger: "blur"}],
+        description: [{required: true, message: "描述不能为空", trigger: "blur"}],
+        categoryIds: [{required: true, message: "分类id不能为空", trigger: "blur"}],
+        picUrls: [{required: true, message: "商品主图地址", trigger: "blur"}],
+        sort: [{required: true, message: "排序字段不能为空", trigger: "blur"}],
+      },
+      tagIndex: 0,
     };
-</script>
-<style lang="scss">
-  .app-container {
-    .el-tag + .el-tag {
-      margin-left: 10px;
-    }
+  },
+  created() {
 
-    .button-new-tag {
-      margin-left: 10px;
-      height: 32px;
-      line-height: 30px;
-      padding-top: 0;
-      padding-bottom: 0;
-    }
+    this.getList();
+    this.getPropertyPageList();
+    this.getListCategory();
+  },
+  methods: {
+    getTableSpecData() {
+      return this.value
+    },
+    tableSpanMethod({row, column, rowIndex, columnIndex}) {
 
-    .input-new-tag {
-      width: 90px;
-      margin-left: 10px;
-      vertical-align: bottom;
-    }
+    },
+    changeSkuStatus(tagIndex) {
+      if (this.form.skus[tagIndex].status == 0) {
+        this.form.skus[tagIndex].status = 1;
+      } else {
+        this.form.skus[tagIndex].status = 0;
+      }
 
-    .img-height {
-      height: 65px;
+    },
+    skuAddProdName() {
+      if (this.initing) {
+        return
+      }
+      let skuList = []
+      for (let i = 0; i < this.value.length; i++) {
+        const sku = Object.assign({}, this.value[i])
+        if (!sku.properties) {
+          return
+        }
+        sku.skuName = ''
+        let properties = sku.properties.split(';')
+        for (const propertiesKey in properties) {
+          sku.skuName += properties[propertiesKey].split(':')[1] + ' '
+        }
+        sku.prodName = this.prodName + ' ' + sku.skuName
+        skuList.push(sku)
+      }
+      this.$emit('input', skuList)
+    },
+    handleTagClose(tagIndex, tagItemIndex) {
+
+    },
+    //确定添加sku规格
+    addTag() {
+
+      let skus = this.unUseTags.map(function (item, index) {
+        return item.name
+      });
+      let index = skus.indexOf(this.addTagInput.name);
+
+      this.addTagInput.propertyId = this.unUseTags[index].id;
+      for (let i = 0; i < this.addTagInput.selectValues.length; i++) {
+        for (let j = 0; j < this.unUseTags[index].propertyValueList.length; j++) {
+          if (this.addTagInput.selectValues[i] === this.unUseTags[index].propertyValueList[j].name) {
+            this.addTagInput.selectValueIds.push(this.unUseTags[index].propertyValueList[j].id)
+            this.addTagInput.selectObect.push({
+              id:this.unUseTags[index].propertyValueList[j].id,
+              name:this.unUseTags[index].propertyValueList[j].name,
+            })
+          }
+        }
+      }
+      let addTagInput = JSON.parse(JSON.stringify(this.addTagInput))
+      this.skuTags.push(addTagInput);
+
+      // if (this.skuTags.length > 1) {
+        this.skuTags = this.skuTags.sort((a, b) => a.propertyId - b.propertyId);
+        this.skuTags.forEach(function (item,index) {
+          item.selectObect = item.selectObect.sort((a, b) => a.id - b.id)
+        })
+
+      for (let i = 0; i <this.skuTags.length ; i++) {
+        let selectValueIds=[];
+        let selectValues=[];
+        for (let j = 0; j < this.skuTags[i].selectObect.length; j++) {
+          selectValueIds.push(this.skuTags[i].selectObect[j].id);
+          selectValues.push(this.skuTags[i].selectObect[j].name);
+        }
+        this.skuTags[i].selectValues = selectValues;
+        this.skuTags[i].selectValueIds = selectValueIds;
+      }
+
+      this.unUseTags.splice(index, 1);
+      this.isShowTagInput = false;
+      this.getTable();
+    },
+    getTable() {
+      this.form.skus = [];
+      let skuTags = JSON.parse(JSON.stringify(this.skuTags));
+      let sku1s = [];
+      let skuIds = [];
+      let propertyIds = [];
+      let propertyNames = [];
+      for (let i = 0; i < skuTags.length; i++) {
+        sku1s.push(skuTags[i].selectValues);
+        skuIds.push(skuTags[i].selectValueIds);
+        propertyIds.push(skuTags[i].propertyId);
+        propertyNames.push(skuTags[i].name);
+      }
+
+      let skuAll = sku1s.reduce((x, y) => {
+        let arr = [];
+        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
+        return arr;
+      }, [[]])
+
+      let skuIdAll = skuIds.reduce((x, y) => {
+        let arr = [];
+        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
+        return arr;
+      }, [[]])
+
+      for (let i = 0; i < skuAll.length; i++) {
+        let han = {
+          propertyNames: propertyNames,
+          propertyIds: propertyIds,
+          propertyChildNames: skuAll[i],
+          propertyChildIds: skuIdAll[i],
+          properties: [],
+          picUrl: '',
+          costPrice: '',
+          originalPrice: '',
+          spuId: '',
+          prodName: '',
+          price: '',
+          barCode: '',
+          status: '0',
+        }
+        this.form.skus.push(han);
+      }
+      this.form.skus.forEach(x => {
+        x.properties = [];
+        for (let i = 0; i < x.propertyIds.length; i++) {
+          x.properties.push({
+            propertyId: x.propertyIds[i],
+            valueId: x.propertyChildIds[i]
+          })
+        }
+      })
+
+    },
+    hideTagInput() {
+      this.isShowTagInput = false;
+      this.addTagInput = {
+        name: '',
+        propertyId: '',
+        selectValues: [],
+        selectValueIds: [],
+        selectObect: [],
+      };
+    },
+    shopTagInput() {
+      if (this.unUseTags.length <= 0) {
+        return this.$message.error("规格已经添加完毕")
+      }
+      this.isShowTagInput = true;
+      this.addTagInput = {
+        name: '',
+        propertyId: '',
+        selectValues: [],
+        selectValueIds: [],
+        selectObect: [],
+      };
+    },
+    //删除已选的规格
+    removeTag(row) {
+      let skus = this.allhistoryTags.map(function (item, index) {
+        return item.name
+      })
+      let index = skus.indexOf(this.skuTags[row].name);
+      this.unUseTags.push(this.allhistoryTags[index]);
+      this.skuTags.splice(row, 1);
+      this.getTable();
+    },
+    handleTagClick(row) {
+      for (let i = 0; i < this.propertyPageList.length; i++) {
+        if (row == this.propertyPageList[i].name) {
+          this.dbTagValues = this.propertyPageList[i].propertyValueList
+        }
+      }
+    },
+    /** 查询规格 */
+    getPropertyPageList() {
+      // 执行查询
+      getPropertyPage().then(response => {
+        this.propertyPageList = response.data.list;
+
+        this.unUseTags = this.propertyPageList.map(function (item, index) {
+          return item
+        })
+        this.allhistoryTags = JSON.parse(JSON.stringify(this.unUseTags));
+      });
+    },
+    /** 查询分类 */
+    getListCategory() {
+      // 执行查询
+      listCategory().then(response => {
+        this.categoryList = this.handleTree(response.data, "id", "parentId");
+
+      });
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getSpuPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+
+      this.form = {
+        id: undefined,
+        name: undefined,
+        sellPoint: undefined,
+        description: undefined,
+        categoryId: undefined,
+        categoryIds: [],
+        picUrls: undefined,
+        sort: undefined,
+        likeCount: undefined,
+        price: undefined,
+        quantity: undefined,
+        status: undefined,
+        isShowTagInput: undefined,
+        skus: [],
+      };
+      this.skuTags = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加商品spu";
+      this.getPropertyPageList();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getSpu(id).then(response => {
+        let dataSpu = response.data;
+        this.form = {
+          id: dataSpu.id,
+          name: dataSpu.name,
+          sellPoint: dataSpu.sellPoint,
+          description: dataSpu.sellPoint,
+          categoryId: dataSpu.sellPoint,
+          categoryIds: dataSpu.categoryIds,
+          picUrls: dataSpu.picUrls,
+          sort: dataSpu.sort,
+          likeCount: dataSpu.likeCount,
+          price: dataSpu.price,
+          quantity: dataSpu.quantity,
+          status: dataSpu.status,
+          isShowTagInput: undefined,
+          skus: [],
+          skusList: dataSpu.skus,
+          productPropertyViews: dataSpu.productPropertyViews,
+          // skus:dataSpu.productSkuRespVOS,
+        };
+        this.getDataHandle();
+        this.open = true;
+        this.title = "修改商品spu";
+      });
+    },
+    getDataHandle() {
+      let that = this;
+      let productPropertyViews = JSON.parse(JSON.stringify(this.form.productPropertyViews));
+      productPropertyViews = productPropertyViews.sort((a, b) => a.propertyId - b.propertyId);
+      productPropertyViews.forEach(item => {
+        item.propertyValues = item.propertyValues.sort((a, b) => a.v1 - b.v1);
+      })
+      let skuIds = [];
+      for (let i = 0; i < productPropertyViews.length; i++) {
+        let han = {
+          name: productPropertyViews[i].name,
+          propertyId: productPropertyViews[i].propertyId,
+          selectValues: [],
+          selectValueIds: [],
+        }
+        for (let j = 0; j < productPropertyViews[i].propertyValues.length; j++) {
+          han.selectValues.push(productPropertyViews[i].propertyValues[j].v2);
+          han.selectValueIds.push(productPropertyViews[i].propertyValues[j].v1);
+        }
+        skuIds.push(han)
+      }
+      this.skuTags = skuIds;
+      this.unUseTags = this.allhistoryTags.filter((v) =>
+        skuIds.every((val) => val.name != v.name)
+      )
+      this.getHandleTable();
+    },
+    getHandleTable() {
+      this.form.skus = [];
+      let skuTags = JSON.parse(JSON.stringify(this.skuTags));
+      let sku1s = [];
+      let skuIds = [];
+      let propertyIds = [];
+      let propertyNames = [];
+      for (let i = 0; i < skuTags.length; i++) {
+        sku1s.push(skuTags[i].selectValues);
+        skuIds.push(skuTags[i].selectValueIds);
+        propertyIds.push(skuTags[i].propertyId);
+        propertyNames.push(skuTags[i].name);
+      }
+      let skuAll = sku1s.reduce((x, y) => {
+        let arr = [];
+        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
+        return arr;
+      }, [[]])
+
+      let skuIdAll = skuIds.reduce((x, y) => {
+        let arr = [];
+        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
+        return arr;
+      }, [[]])
+
+      for (let i = 0; i < skuAll.length; i++) {
+        let han = {
+          propertyNames: propertyNames,
+          propertyIds: propertyIds,
+          propertyChildNames: skuAll[i],
+          propertyChildIds: skuIdAll[i],
+          properties: this.form.skusList[i].properties,
+          picUrl: this.form.skusList[i].picUrl,
+          costPrice: this.form.skusList[i].costPrice,
+          originalPrice: this.form.skusList[i].originalPrice,
+          spuId: this.form.skusList[i].spuId,
+          prodName: this.form.skusList[i].prodName,
+          price: this.form.skusList[i].price,
+          barCode: this.form.skusList[i].barCode,
+          status: this.form.skusList[i].status,
+        }
+        this.form.skus.push(han);
+      }
+      this.form.skus.forEach(x => {
+        x.properties = [];
+        for (let i = 0; i < x.propertyIds.length; i++) {
+          x.properties.push({
+            propertyId: x.propertyIds[i],
+            valueId: x.propertyChildIds[i]
+          })
+        }
+      })
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        this.form.picUrls = this.form.picUrls.split(',');
+        this.form.categoryId = this.form.categoryIds[(this.form.categoryIds.length - 1)];
+        this.form.status = Number(this.form.status);
+        // 修改的提交
+        if (this.form.id != null) {
+          updateSpu(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createSpu(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除商品spu编号为"' + id + '"的数据项?').then(function () {
+        return deleteSpu(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有商品spu数据项?').then(() => {
+        this.exportLoading = true;
+        return exportSpuExcel(params);
+      }).then(response => {
+        this.$download.excel(response, '商品spu.xls');
+        this.exportLoading = false;
+      }).catch(() => {
+      });
     }
   }
+};
+</script>
+<style lang="scss">
+.app-container {
+  .el-tag + .el-tag {
+    margin-left: 10px;
+  }
+
+  .button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .input-new-tag {
+    width: 90px;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
+
+  .img-height {
+    height: 65px;
+  }
+}
 </style>

From e2a6530acb94de6a36be483162bc3b66804c4a2c Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Mon, 11 Jul 2022 12:05:48 +0800
Subject: [PATCH 03/56] =?UTF-8?q?feature(uniapp=E5=88=86=E7=B1=BB):=20?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/category/AppCategoryController.java   |  40 +++
 .../category/vo/AppCategoryListRespVO.java    |  38 +++
 .../app/spu/AppProductSpuController.java      |  37 +++
 .../app/spu/vo/AppSpuPageReqVO.java           |  18 ++
 .../app/spu/vo/AppSpuPageRespVO.java          |  52 +++
 .../convert/category/CategoryConvert.java     |   2 +
 .../convert/spu/ProductSpuConvert.java        |   7 +
 .../service/category/CategoryService.java     |   8 +
 .../service/category/CategoryServiceImpl.java |  11 +
 .../service/spu/ProductSpuService.java        |  11 +
 .../service/spu/ProductSpuServiceImpl.java    |  16 +-
 yudao-ui-app/api/category.js                  |   5 +
 yudao-ui-app/api/product.js                   |   5 +
 yudao-ui-app/pages.json                       |  12 +-
 yudao-ui-app/pages/category/category.vue      | 305 ++++++++++--------
 yudao-ui-app/pages/category/product-list.vue  | 161 +++++++++
 16 files changed, 587 insertions(+), 141 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
 create mode 100644 yudao-ui-app/api/category.js
 create mode 100644 yudao-ui-app/api/product.js
 create mode 100644 yudao-ui-app/pages/category/product-list.vue

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
new file mode 100644
index 000000000..201690717
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.product.controller.app.category;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
+import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
+import cn.iocoder.yudao.module.product.service.category.CategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Comparator;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "用户 APP - 商品分类")
+@RestController
+@RequestMapping("/product/category")
+@Validated
+public class AppCategoryController {
+
+    @Resource
+    private CategoryService categoryService;
+
+    @GetMapping("/list")
+    @ApiOperation("获得商品分类列表")
+    public CommonResult<List<AppCategoryListRespVO>> listByQuery() {
+        List<CategoryDO> list = categoryService.getCategoryList();
+        list.sort(Comparator.comparing(CategoryDO::getSort));
+        return success(CategoryConvert.INSTANCE.convertList03(list));
+    }
+
+
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
new file mode 100644
index 000000000..e50c53e4d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.product.controller.app.category.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "App - 商品分类 列表 Request VO", description = "参数和 CategoryBaseVO 是一致的")
+public class AppCategoryListRespVO {
+
+    @ApiModelProperty(value = "分类编号", required = true, example = "2")
+    private Long id;
+
+    @ApiModelProperty(value = "父分类编号", required = true, example = "1")
+    @NotNull(message = "父分类编号不能为空")
+    private Long parentId;
+
+    @ApiModelProperty(value = "分类名称", required = true, example = "办公文具")
+    @NotBlank(message = "分类名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "分类图标")
+    @NotBlank(message = "分类图标不能为空")
+    private String icon;
+
+    @ApiModelProperty(value = "分类图片", required = true)
+    @NotBlank(message = "分类图片不能为空")
+    private String bannerUrl;
+
+    @ApiModelProperty(value = "分类排序", required = true, example = "1")
+    private Integer sort;
+
+    @ApiModelProperty(value = "分类描述", required = true, example = "描述")
+    private String description;
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
new file mode 100644
index 000000000..e56aa3813
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.product.controller.app.spu;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
+import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "用户 APP -  商品spu")
+@RestController
+@RequestMapping("/product/spu")
+@Validated
+public class AppProductSpuController {
+
+    @Resource
+    private ProductSpuService spuService;
+
+    @GetMapping("/page")
+    @ApiOperation("获得商品spu分页")
+    public CommonResult<PageResult<AppSpuPageRespVO>> getSpuPage(@Valid AppSpuPageReqVO pageVO) {
+        return success(spuService.getSpuPage(pageVO));
+    }
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
new file mode 100644
index 000000000..38ed4975e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.product.controller.app.spu.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ApiModel("App - 商品spu分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AppSpuPageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "分类id")
+    private Long categoryId;
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
new file mode 100644
index 000000000..0f77fd516
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.product.controller.app.spu.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@ApiModel("App - 商品spu分页 Request VO")
+@Data
+public class AppSpuPageRespVO  {
+
+    @ApiModelProperty(value = "主键", required = true, example = "1")
+    private Long id;
+
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+
+    @ApiModelProperty(value = "卖点", required = true)
+    @NotNull(message = "卖点不能为空")
+    private String sellPoint;
+
+    @ApiModelProperty(value = "描述", required = true)
+    @NotNull(message = "描述不能为空")
+    private String description;
+
+    @ApiModelProperty(value = "分类id", required = true)
+    @NotNull(message = "分类id不能为空")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "商品主图地址,* 数组，以逗号分隔,最多上传15张", required = true)
+    @NotNull(message = "商品主图地址,* 数组，以逗号分隔,最多上传15张不能为空")
+    private List<String> picUrls;
+
+    @ApiModelProperty(value = "排序字段", required = true)
+    @NotNull(message = "排序字段不能为空")
+    private Integer sort;
+
+    @ApiModelProperty(value = "点赞初始人数")
+    private Integer likeCount;
+
+    @ApiModelProperty(value = "价格 单位使用：分")
+    private Integer price;
+
+    @ApiModelProperty(value = "库存数量")
+    private Integer quantity;
+
+    @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
+    private Boolean status;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
index 2b2cfe99c..9099067e2 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
@@ -4,6 +4,7 @@ import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
+import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.*;
@@ -31,4 +32,5 @@ public interface CategoryConvert {
 
     List<CategoryExcelVO> convertList02(List<CategoryDO> list);
 
+    List<AppCategoryListRespVO> convertList03(List<CategoryDO> list);
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
index 92efaf0e8..513e5e50b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
@@ -4,6 +4,8 @@ import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
@@ -40,6 +42,11 @@ public interface ProductSpuConvert {
 
     List<SpuExcelVO> convertList02(List<ProductSpuDO> list);
 
+    SpuPageReqVO convert(AppSpuPageReqVO bean);
+
+    @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "tokenizeToStringArray")
+    AppSpuPageRespVO convertAppResp(ProductSpuDO list);
+
     @Named("tokenizeToStringArray")
     default List<String> translatePicUrlsArrayFromString(String picUrls) {
         return Arrays.asList(StringUtils.tokenizeToStringArray(picUrls, ","));
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java
index 4df2f19f9..92c8463dd 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.product.service.category;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.*;
+import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
 
 import javax.validation.Valid;
@@ -83,4 +84,11 @@ public interface CategoryService {
      * @param categoryId 分类id
      */
     void validatedCategoryById(Long categoryId);
+
+    /**
+     * app端获得商品分类列表
+     *
+     * @return 商品分类列表
+     */
+    List<CategoryDO> getCategoryList();
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java
index 3fa441b66..85e456b2c 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.product.service.category;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -13,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
@@ -106,4 +108,13 @@ public class CategoryServiceImpl implements CategoryService {
         return categoryMapper.selectList(treeListReqVO);
     }
 
+    @Override
+    public List<CategoryDO> getCategoryList() {
+        return categoryMapper.selectList()
+                .stream()
+                .filter(v->v.getStatus().equals(CommonStatusEnum.ENABLE.getStatus()))
+                .collect(Collectors.toList());
+    }
+
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
index e4fc47d56..e66f93fd0 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.product.service.spu;
 import java.util.*;
 import javax.validation.*;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
@@ -67,4 +69,13 @@ public interface ProductSpuService {
      */
     List<ProductSpuDO> getSpuList(SpuExportReqVO exportReqVO);
 
+    /**
+     * 获得商品spu分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 商品spu分页
+     */
+    PageResult<AppSpuPageRespVO> getSpuPage(AppSpuPageReqVO pageReqVO);
+
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index eb48bed25..0ff02e66f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -8,9 +8,10 @@ import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
@@ -175,4 +176,17 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         return ProductSpuMapper.selectList(exportReqVO);
     }
 
+    @Override
+    public PageResult<AppSpuPageRespVO> getSpuPage(AppSpuPageReqVO pageReqVO) {
+        PageResult<ProductSpuDO> productSpuDOPageResult = ProductSpuMapper.selectPage(ProductSpuConvert.INSTANCE.convert(pageReqVO));
+        PageResult<AppSpuPageRespVO> pageResult = new PageResult<>();
+        List<AppSpuPageRespVO> collect = productSpuDOPageResult.getList()
+                .stream()
+                .map(ProductSpuConvert.INSTANCE::convertAppResp)
+                .collect(Collectors.toList());
+        pageResult.setList(collect);
+        pageResult.setTotal(productSpuDOPageResult.getTotal());
+        return pageResult;
+    }
+
 }
diff --git a/yudao-ui-app/api/category.js b/yudao-ui-app/api/category.js
new file mode 100644
index 000000000..630efd29d
--- /dev/null
+++ b/yudao-ui-app/api/category.js
@@ -0,0 +1,5 @@
+//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
+const { http } = uni.$u
+
+// 查询分类列表
+export const categoryListData = params => http.get('product/category/list', { params })
diff --git a/yudao-ui-app/api/product.js b/yudao-ui-app/api/product.js
new file mode 100644
index 000000000..bebd27ca9
--- /dev/null
+++ b/yudao-ui-app/api/product.js
@@ -0,0 +1,5 @@
+//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
+const { http } = uni.$u
+
+// 查询商品spu列表
+export const productSpuPage = params => http.get('/product/spu/page', { params })
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 3ef50a0a9..c6daa7423 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -12,6 +12,14 @@
 				"navigationBarTitleText": "分类"
 			}
 		},
+    {
+    	"path": "pages/category/product-list",
+    	"style": {
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+    	}
+    },
 		{
 			"path": "pages/cart/cart",
 			"style": {
@@ -112,7 +120,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "yudao-ui-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#FFFFFF"
+		"navigationBarBackgroundColor": "#ffffff",
+		"backgroundColor": "#ffffff"
 	}
 }
diff --git a/yudao-ui-app/pages/category/category.vue b/yudao-ui-app/pages/category/category.vue
index 8e0decdac..70b993273 100644
--- a/yudao-ui-app/pages/category/category.vue
+++ b/yudao-ui-app/pages/category/category.vue
@@ -1,176 +1,205 @@
 <template>
   <view class="container">
+    <!-- 搜索框 -->
     <view class="search-wrap">
-      <u-search placeholder="搜索" disabled height="32" :show-action="false" @click="handleSearchClick"></u-search>
+      <u-search placeholder="搜索" disabled height="32" bgColor="#f2f2f2" margin="0 20rpx" :show-action="false"
+        @click="handleSearchClick"></u-search>
     </view>
+
+    <!-- 分类内容 -->
     <view class="category-box">
-      <view class="box-left">
-        <view>
-          <view class="category-item" v-for="(item, index) in categoryList" :key="item.id">
-            <view class="item-title" :class="{ active: currentIndex === index }" @click="handleCategoryClick(index)">
-              <text>{{ item.name }}</text>
-            </view>
+      <!-- 左侧导航栏 -->
+      <scroll-view scroll-y="true" class='box-left'>
+        <view class="category-item" v-for="(item, index) in categoryList" :key="item.id">
+          <view class="item-title" :class="{ active: currentIndex === index }" @click="handleCategoryClick(index)">
+            <text>{{ item.name }}</text>
           </view>
         </view>
-      </view>
-      <view class="box-right">
-        <image class="category-image" :showLoading="true" :src="categoryList[currentIndex].image" width="530rpx" height="160rpx" @click="click"></image>
+      </scroll-view>
+
+      <!-- 右侧分类内容 -->
+      <scroll-view scroll-y="true" class="box-right">
+        <view class="category-image">
+          <image :showLoading="true" :src="categoryList[currentIndex].bannerUrl" mode='widthFix' @click="click"></image>
+        </view>
+
         <view class="sub-category-box" v-for="(item, index) in categoryList[currentIndex].children" :key="item.id">
           <view class="sub-category-header">
-            <view class="title">{{ item.title }}</view>
-            <view class="more">查看更多</view>
+            <view class="title">{{ item.name }}</view>
+            <view class="more" @click="handleCategory(item, 0)">查看更多</view>
+          </view>
+
+          <view class="sub-category-grid">
+            <u-grid col="3">
+              <u-grid-item v-for="(subItem, subIndex) in item.children" :key="subItem.id">
+                <view class="sub-category-item" @click="handleCategory(item, subIndex)">
+                  <u-icon name="photo" :size="80" v-if="subItem.bannerUrl === null"></u-icon>
+                  <image :src="item.bannerUrl" v-if="subItem.bannerUrl != null" mode='widthFix' />
+                  <text class="sub-category-title">{{ subItem.name }}</text>
+                </view>
+              </u-grid-item>
+            </u-grid>
           </view>
-          <u-grid class="sub-category-grid" col="3">
-            <u-grid-item v-for="(subItem, subIndex) in item.category" :key="subItem.id">
-              <view class="sub-category-item">
-                <u-icon name="photo" :size="80"></u-icon>
-                <text class="sub-category-title">{{ subItem.title }}</text>
-              </view>
-            </u-grid-item>
-          </u-grid>
         </view>
-      </view>
+      </scroll-view>
     </view>
   </view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      currentIndex: 0,
-      categoryList: []
-    }
-  },
-  onLoad() {
-    for (let i = 0; i < 10; i++) {
-      this.categoryList.push({
-        id: i,
-        image: 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
-        name: '商品分类' + i,
-        children: [
-          {
-            id: 0,
-            title: '分类' + i + '-1',
-            category: [
-              {
-                id: 0,
-                image: '',
-                title: '分类' + i + '-1-1'
-              },
-              {
-                id: 2,
-                image: '',
-                title: '分类' + i + '-1-2'
-              },
-              {
-                id: 3,
-                image: '',
-                title: '分类' + i + '-1-3'
-              }
-            ]
-          },
-          {
-            id: 1,
-            title: '分类' + i + '-2',
-            category: [
-              {
-                id: 0,
-                image: '',
-                title: '分类' + i + '-2-1'
-              },
-              {
-                id: 2,
-                image: '',
-                title: '分类' + i + '-2-2'
-              },
-              {
-                id: 3,
-                image: '',
-                title: '分类' + i + '-2-3'
-              }
-            ]
-          }
-        ]
-      })
-    }
-  },
-  methods: {
-    handleSearchClick(e) {
-      uni.$u.route('/pages/search/search')
+  import { categoryListData } from '../../api/category';
+  import { handleTree, convertTree } from '../../utils/tree.js';
+
+  export default {
+    data() {
+      return {
+        currentIndex: 0,
+        categoryList: []
+      }
     },
-    handleCategoryClick(index) {
-      if (this.currentIndex !== index) {
-        this.currentIndex = index
+    onLoad() {
+      this.handleCategoryList();
+    },
+    methods: {
+      // 点击搜索框
+      handleSearchClick(e) {
+        uni.$u.route('/pages/search/search')
+      },
+      // 点击左侧导航栏
+      handleCategoryClick(index) {
+        if (this.currentIndex !== index) {
+          this.currentIndex = index
+        }
+      },
+      // 获取分类列表并构建树形结构
+      handleCategoryList() {
+        categoryListData().then(res => {
+          this.categoryList = handleTree(res.data, "id", "parentId");
+        })
+      },
+      handleCategory(item, index){
+        // console.log(item)
+        // console.log(index)
+        uni.navigateTo({
+          url:"./product-list?item="+encodeURIComponent(JSON.stringify(item))+"&index="+index
+        })
       }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-
-.search-wrap {
-  background: $custom-bg-color;
-  padding: 20rpx;
-}
-
-.category-box {
-  display: flex;
-  .box-left {
-    width: 200rpx;
-    padding-top: 20rpx;
-    border-right: $custom-border-style;
-    .category-item {
-      border-bottom: $custom-border-style;
-      padding: 20rpx 0;
-      .item-title {
-        padding-left: 30rpx;
-        font-size: 28rpx;
-        &.active {
-          border-left: 6rpx solid $u-primary;
-          font-weight: 700;
-        }
-      }
-    }
+  .search-wrap {
+    background: #ffffff;
+    position: fixed;
+    top: 0;
+    left: 0;
+    box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.07);
+    padding: 20rpx 0;
+    width: 100%;
+    z-index: 3;
   }
-  .box-right {
-    flex: 1;
-    .category-image {
-      width: 510rpx;
-      height: 160rpx;
-      padding: 20rpx;
+
+  .category-box {
+    position: fixed;
+    display: flex;
+    overflow: hidden;
+    margin-top: 100rpx;
+    height: calc(100% - 100rpx);
+
+    .box-left {
+      width: 200rpx;
+      padding-top: 5rpx;
+      overflow: scroll;
+      z-index: 2;
+      background-color: #f2f2f2;
+
+      .category-item {
+        line-height: 80rpx;
+        height: 80rpx;
+        text-align: center;
+        color: #777;
+
+        .item-title {
+          font-size: 28rpx;
+
+          &.active {
+            font-size: 28rpx;
+            font-weight: bold;
+            position: relative;
+            background: #fff;
+            color: $u-primary;
+          }
+
+          &.active::before {
+            position: absolute;
+            left: 0;
+            content: "";
+            width: 8rpx;
+            height: 32rpx;
+            top: 25rpx;
+            background: $u-primary;
+          }
+        }
+      }
     }
 
-    .sub-category-box {
-      .sub-category-header {
-        @include flex-space-between;
-        padding: 30rpx 20rpx;
+    .box-right {
+      width: 550rpx;
+      height: 100%;
+      box-sizing: border-box;
+      z-index: 1;
 
-        .title {
-          font-size: 28rpx;
-          font-weight: 700;
-        }
-        .more {
-          font-size: 22rpx;
-          color: #939393;
+      .category-image {
+        width: 510rpx;
+        box-sizing: border-box;
+        overflow: hidden;
+        position: relative;
+        margin: 30rpx 20rpx 0;
+
+        image {
+          width: 100%;
         }
       }
 
-      .sub-category-grid {
-        padding: 0 15rpx;
+      .sub-category-box {
+        .sub-category-header {
+          @include flex-space-between;
+          padding: 20rpx 20rpx;
 
-        .sub-category-item {
-          @include flex-center(column);
-          background: #fff;
+          .title {
+            font-size: 28rpx;
+            font-weight: bolder;
+          }
 
-          .sub-category-title {
-            margin: 15rpx 0;
-            font-size: 24rpx;
+          .more {
+            font-size: 22rpx;
+            color: #939393;
+          }
+        }
+
+        .sub-category-grid {
+          padding: 0 15rpx;
+
+          .sub-category-item {
+            @include flex-center(column);
+            background: #fff;
+
+            image {
+              text-align: center;
+              width: 150rpx;
+              height: 150rpx;
+              line-height: 150rpx;
+              font-size: 0;
+            }
+
+            .sub-category-title {
+              margin: 15rpx 0;
+              font-size: 22rpx;
+            }
           }
         }
       }
     }
   }
-}
 </style>
diff --git a/yudao-ui-app/pages/category/product-list.vue b/yudao-ui-app/pages/category/product-list.vue
new file mode 100644
index 000000000..d75867fc5
--- /dev/null
+++ b/yudao-ui-app/pages/category/product-list.vue
@@ -0,0 +1,161 @@
+<template>
+  <view class="container">
+    <u-navbar :title="title" :autoBack="true" placeholder="true" titleStyle="font-size: 28rpx">
+    </u-navbar>
+    <view class="context">
+      <view class="tabs-top">
+        <u-tabs :list="categoryList" @click="changeTabs" :current="current" lineHeight="2" lineWidth="85rpx"
+          itemStyle="padding-left: 15px; padding-right: 15px; height: 85rpx;"></u-tabs>
+      </view>
+      <scroll-view scroll-y="true" class="product-list" enable-flex="true">
+        <view class="flex-box">
+          <block v-for="(item, index) in productList[current]" :key="index">
+            <view class="product-item">
+              <view class="product-image">
+                <image :src="item.picUrls[0]" mode='widthFix' />
+              </view>
+              <view class="product-button">
+                <view class="product-text">【{{ item.sellPoint }}】{{ item.name }}</view>
+                <view class="product-price-button">
+                  <text class="product-price">￥
+                    <text class="price-size">{{ towNumber(item.price) }}</text></text>
+                  <text class="product-like-ccount">销量 {{ item.likeCount }}</text>
+                </view>
+              </view>
+            </view>
+          </block>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    productSpuPage
+  } from '../../api/product';
+
+  export default {
+    data() {
+      return {
+        title: "",
+        current: 0,
+        categoryList: [],
+        productList: {}
+      }
+    },
+    onLoad(option) {
+      const item = JSON.parse(decodeURIComponent(option.item))
+      this.title = item.name
+      this.categoryList = item.children
+      this.handleProductSpu(option.index);
+    },
+    methods: {
+      changeTabs(item) {
+        if (item.index != this.current) {
+          this.handleProductSpu(item.index)
+        }
+      },
+      handleProductSpu(index) {
+        let param = {}
+        param.categoryId = this.categoryList[index].id
+        console.log(this.categoryList)
+        console.log(index)
+        productSpuPage(param).then(res => {
+          this.productList[index] = res.data.list
+          this.current = index
+        })
+      },
+      towNumber(val) {
+        return (val / 100).toFixed(2)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .context {
+    width: 100vw;
+    position: fixed;
+    top: 160rpx;
+    left: 0;
+  }
+
+  .tabs-top {
+    position: relative;
+    top: 0;
+    width: 100%;
+    height: 85rpx;
+  }
+
+  .product-list {
+    position: relative;
+    background-color: #f2f2f2;
+    height: calc(100vh - 88rpx - 100rpx - var(--status-bar-height));
+    width: 100%;
+
+    .flex-box {
+      width: 730rpx;
+      margin: 0 auto;
+      @include flex;
+      flex-wrap: wrap;
+      justify-content: left;
+
+      .product-item {
+        width: 345rpx;
+        height: 450rpx;
+        background-color: #ffffff;
+        margin: 20rpx 10rpx 0;
+        border-radius: 20rpx;
+
+        .product-image {
+          width: 100%;
+          height: 300rpx;
+          overflow: hidden;
+          border-radius: 20rpx;
+          image {
+            width: 100%;
+          }
+        }
+
+        .product-button {
+          width: 330rpx;
+          margin: 15rpx auto 0;
+
+          .product-text {
+            font-size: 25rpx;
+            height: 70rpx;
+            overflow: hidden;
+            -webkit-line-clamp: 2;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+          }
+
+          .product-price-button {
+            font-size: 20rpx;
+            margin-top: 20rpx;
+
+            .product-price {
+              color: red;
+
+              .price-size {
+                font-size: 26rpx;
+              }
+            }
+
+            .product-like-ccount {
+              font-size: 16rpx;
+              margin-left: 10rpx;
+            }
+          }
+
+        }
+      }
+
+    }
+
+    // }
+
+  }
+</style>

From 07d361f4983fb2f0d237ca4602f8bd54f5e54f2e Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Tue, 19 Jul 2022 11:21:59 +0800
Subject: [PATCH 04/56] =?UTF-8?q?feature(uniapp=E5=88=86=E7=B1=BB):=20?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/utils/tree.js | 59 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 yudao-ui-app/utils/tree.js

diff --git a/yudao-ui-app/utils/tree.js b/yudao-ui-app/utils/tree.js
new file mode 100644
index 000000000..2be7336ce
--- /dev/null
+++ b/yudao-ui-app/utils/tree.js
@@ -0,0 +1,59 @@
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+export function handleTree(data, id, parentId, children, rootId) {
+  id = id || 'id'
+  parentId = parentId || 'parentId'
+  children = children || 'children'
+  rootId = rootId || Math.min.apply(Math, data.map(item => {
+    return item[parentId]
+  })) || 0
+  //对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data))
+  //循环所有项
+  const treeData = cloneData.filter(father => {
+    let branchArr = cloneData.filter(child => {
+      //返回每一项的子级数组
+      return father[id] === child[parentId]
+    });
+    branchArr.length > 0 ? father.children = branchArr : '';
+    //返回第一层
+    return father[parentId] === rootId;
+  });
+  return treeData !== '' ? treeData : data;
+}
+
+/**
+ * 树形结构进行删除深度不够的分支
+ * 目前只删除了不够三层的分支
+ * 对于高于三层的部分目前不做处理
+ * todo 暴力遍历，可用递归修改
+ * @param {*} data 树形结构
+ */
+export function convertTree(data) {
+   //对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data))
+  // 遍历克隆数据，对源数据进行删除操作
+  for (let first = 0; first < cloneData.length; first++) {
+    for (let second = 0; second < cloneData[first].children.length; second++) {
+      for (let three = 0; three < cloneData[first].children[second].children.length; three++) {
+        if (data[first].children[second].children[three].children == undefined ||
+          data[first].children[second].children[three].children === 0) {
+          data[first].children[second].children.splice(second, 1);
+        }
+      }
+      if (data[first].children[second].children == undefined || data[first].children[second].children === 0) {
+        data[first].children.splice(second, 1);
+      }
+    }
+    if (data[first].children == undefined || data[first].children.length === 0) {
+      data.splice(first, 1);
+    }
+  }
+  return data;
+}

From af6a02245051d29bb4d57ddf4db92f5acf41f4d8 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Wed, 27 Jul 2022 16:04:53 +0800
Subject: [PATCH 05/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/spu/AppProductSpuController.java      | 12 ++++++++--
 .../controller/app/spu/vo/AppSpuRespVO.java   | 22 ++++++++++++++++++
 yudao-ui-app/api/product.js                   |  5 +++-
 yudao-ui-app/pages/index/index.vue            |  6 ++---
 yudao-ui-app/pages/product/product.vue        | 23 +++++++++++++++----
 5 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
index e56aa3813..1cb07eec5 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
@@ -1,18 +1,19 @@
 package cn.iocoder.yudao.module.product.controller.app.spu;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuRespVO;
 import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -34,4 +35,11 @@ public class AppProductSpuController {
     public CommonResult<PageResult<AppSpuPageRespVO>> getSpuPage(@Valid AppSpuPageReqVO pageVO) {
         return success(spuService.getSpuPage(pageVO));
     }
+
+    @GetMapping("/")
+    @ApiOperation("获取商品 - 通过商品id")
+    public CommonResult<AppSpuRespVO> getSpu(@RequestParam("spuId") Long spuId) {
+        AppSpuRespVO appSpuRespVO = BeanUtil.toBean(spuService.getSpu(spuId), AppSpuRespVO.class);
+        return success(appSpuRespVO);
+    }
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
new file mode 100644
index 000000000..7f638a704
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.product.controller.app.spu.vo;
+
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+@ApiModel("App - 商品spu Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AppSpuRespVO extends SpuRespVO {
+
+
+}
diff --git a/yudao-ui-app/api/product.js b/yudao-ui-app/api/product.js
index bebd27ca9..5338d5d10 100644
--- a/yudao-ui-app/api/product.js
+++ b/yudao-ui-app/api/product.js
@@ -2,4 +2,7 @@
 const { http } = uni.$u
 
 // 查询商品spu列表
-export const productSpuPage = params => http.get('/product/spu/page', { params })
+export const productSpuPage = params => http.get('product/spu/page', { params })
+
+// 查询商品
+export const productSpu = params => http.get('product/spu/', { params })
diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index 293710648..52b504e87 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -169,8 +169,8 @@ export default {
     }
   },
   onLoad() {
-    //this.loadBannerData();
-    //this.loadNoticeData();
+    this.loadBannerData();
+    this.loadNoticeData();
   },
   methods: {
     loadBannerData() {
@@ -302,7 +302,7 @@ export default {
       margin: 10rpx;
       background: #ffffff;
       border-radius: 10rpx;
-      box-shadow: -1rpx 1rpx 2rpx #afd3f5, 1rpx 1rpx 0rpx #afd3f5;
+      box-shadow: 0rpx 6rpx 8rpx rgba(58,134,185,0.2);
       .prod-image {
         width: 224rpx;
         height: 224rpx;
diff --git a/yudao-ui-app/pages/product/product.vue b/yudao-ui-app/pages/product/product.vue
index 532bc4fc6..6fbbb8708 100644
--- a/yudao-ui-app/pages/product/product.vue
+++ b/yudao-ui-app/pages/product/product.vue
@@ -43,7 +43,7 @@
     <u-popup :show="skuPopup" :round="10" :closeable="true" :closeOnClickOverlay="false" @close="skuPopup = false">
       <view class="sku-popup-slot">
         <view class="current-sku-info">
-          <u--image class="current-sku-img" :showLoading="true" :src="product.sku[currentSkuIndex].image" width="120rpx" height="120rpx"></u--image>
+          <u--image class="current-sku-img" :showLoading="true" :src="product.sku[currentSkuIndex].picUrl" width="120rpx" height="120rpx"></u--image>
           <view class="current-sku-desc">
             <view class="name">{{ product.sku[currentSkuIndex].desc }}</view>
             <custom-text-price color="red" size="12" intSize="18" :price="product.sku[currentSkuIndex].price"></custom-text-price>
@@ -178,6 +178,8 @@
 </template>
 
 <script>
+    import { productSpu } from '../../api/product';
+
 export default {
   data() {
     return {
@@ -194,19 +196,19 @@ export default {
         sku: [
           {
             id: 0,
-            image: 'https://cdn.uviewui.com/uview/album/1.jpg',
+            picUrl: 'https://cdn.uviewui.com/uview/album/1.jpg',
             price: 13.0,
             desc: '山不在高，有仙则名。'
           },
           {
             id: 1,
-            image: 'https://cdn.uviewui.com/uview/album/2.jpg',
+            picUrl: 'https://cdn.uviewui.com/uview/album/2.jpg',
             price: 11.0,
             desc: '水不在深，有龙则灵。'
           },
           {
             id: 2,
-            image: 'https://cdn.uviewui.com/uview/album/3.jpg',
+            picUrl: 'https://cdn.uviewui.com/uview/album/3.jpg',
             price: 10.0,
             desc: '斯是陋室，惟吾德馨。'
           }
@@ -302,7 +304,18 @@ export default {
     }
   },
   methods: {
-    loadProductData() {},
+    loadProductData() {
+      let param = {}
+      param.spuId =  this.product.id
+      productSpu(param).then(res => {
+        this.product.images = res.data.picUrls;
+        this.product.sku = res.data.skus;
+        this.product.desc = res.data.description.replace(/<[^>]*>/g,'');
+        this.product.price = res.data.price;
+        this.product.title = res.data.name;
+        console.log(res)
+      })
+    },
     handleSkuItemClick(index) {
       this.currentSkuIndex = index
     },

From 6a0f7134524569843391070db148510da58f3c31 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 Jul 2022 19:37:31 +0800
Subject: [PATCH 06/56] =?UTF-8?q?mall=EF=BC=9A=E5=AE=8C=E5=96=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=E7=9A=84=E5=90=8E=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/enums/ErrorCodeConstants.java     |  14 +-
 .../admin/category/CategoryController.java    |  92 ---------
 .../category/ProductCategoryController.java   |  76 +++++++
 .../admin/category/vo/CategoryExcelVO.java    |  47 -----
 .../category/vo/CategoryExportReqVO.java      |  26 ---
 .../admin/category/vo/CategoryPageReqVO.java  |  31 ---
 .../category/vo/CategoryTreeListReqVO.java    |  25 ---
 ...BaseVO.java => ProductCategoryBaseVO.java} |   8 +-
 ...O.java => ProductCategoryCreateReqVO.java} |   4 +-
 .../category/vo/ProductCategoryListReqVO.java |  14 ++
 ...RespVO.java => ProductCategoryRespVO.java} |   2 +-
 ...O.java => ProductCategoryUpdateReqVO.java} |   3 +-
 .../app/category/AppCategoryController.java   |  10 +-
 .../convert/category/CategoryConvert.java     |  26 +--
 ...CategoryDO.java => ProductCategoryDO.java} |  23 ++-
 .../dal/mysql/category/CategoryMapper.java    |  40 ----
 .../mysql/category/ProductCategoryMapper.java |  33 +++
 .../service/category/CategoryService.java     |  94 ---------
 .../service/category/CategoryServiceImpl.java | 120 -----------
 .../category/ProductCategoryService.java      |  79 +++++++
 .../category/ProductCategoryServiceImpl.java  | 125 ++++++++++++
 .../service/spu/ProductSpuServiceImpl.java    |  10 +-
 .../category/CategoryServiceImplTest.java     | 192 ------------------
 .../ProductCategoryServiceImplTest.java       | 126 ++++++++++++
 .../test/resources/application-unit-test.yaml |  50 +++++
 .../src/test/resources/logback.xml            |   4 +
 .../src/test/resources/sql/create_tables.sql  |   5 +-
 27 files changed, 556 insertions(+), 723 deletions(-)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/CategoryController.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExcelVO.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExportReqVO.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryPageReqVO.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryTreeListReqVO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/{CategoryBaseVO.java => ProductCategoryBaseVO.java} (87%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/{CategoryCreateReqVO.java => ProductCategoryCreateReqVO.java} (68%)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryListReqVO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/{CategoryRespVO.java => ProductCategoryRespVO.java} (87%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/{CategoryUpdateReqVO.java => ProductCategoryUpdateReqVO.java} (85%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/{CategoryDO.java => ProductCategoryDO.java} (70%)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/CategoryMapper.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/ProductCategoryMapper.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImplTest.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/test/resources/logback.xml

diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
index e328d2512..d47bb7543 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
@@ -3,16 +3,18 @@ package cn.iocoder.yudao.module.product.enums;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 
 /**
- * product 错误码枚举类
- * <p>
+ * Product 错误码枚举类
+ *
  * product 系统，使用 1-008-000-000 段
  */
 public interface ErrorCodeConstants {
 
-    // ========== 商品分类相关  1008001000============
-    ErrorCode CATEGORY_NOT_EXISTS = new ErrorCode(1008001000, "商品分类不存在");
-    ErrorCode CATEGORY_PARENT_NOT_EXISTS = new ErrorCode(1008001001, "父分类不存在");
-    ErrorCode CATEGORY_EXISTS_CHILDREN = new ErrorCode(1008001002, "存在子分类，无法删除");
+    // ========== 商品分类相关 1008001000 ============
+    ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1008001000, "商品分类不存在");
+    ErrorCode PRODUCT_CATEGORY_PARENT_NOT_EXISTS = new ErrorCode(1008001001, "父分类不存在");
+    ErrorCode PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL = new ErrorCode(1008001002, "父分类不能是二级分类");
+    ErrorCode PRODUCT_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1008001003, "存在子分类，无法删除");
+    ErrorCode PRODUCT_CATEGORY_DISABLED = new ErrorCode(1008001004, "商品分类({})已禁用，无法使用");
 
     // ========== 品牌相关编号 1008002000 ==========
     ErrorCode BRAND_NOT_EXISTS = new ErrorCode(1008002000, "品牌不存在");
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/CategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/CategoryController.java
deleted file mode 100644
index 12408ac28..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/CategoryController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.category;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.*;
-import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
-import cn.iocoder.yudao.module.product.service.category.CategoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-
-@Api(tags = "管理后台 - 商品分类")
-@RestController
-@RequestMapping("/product/category")
-@Validated
-public class CategoryController {
-
-    @Resource
-    private CategoryService categoryService;
-
-    @PostMapping("/create")
-    @ApiOperation("创建商品分类")
-    @PreAuthorize("@ss.hasPermission('product:category:create')")
-    public CommonResult<Long> createCategory(@Valid @RequestBody CategoryCreateReqVO createReqVO) {
-        return success(categoryService.createCategory(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新商品分类")
-    @PreAuthorize("@ss.hasPermission('product:category:update')")
-    public CommonResult<Boolean> updateCategory(@Valid @RequestBody CategoryUpdateReqVO updateReqVO) {
-        categoryService.updateCategory(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除商品分类")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('product:category:delete')")
-    public CommonResult<Boolean> deleteCategory(@RequestParam("id") Long id) {
-        categoryService.deleteCategory(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @ApiOperation("获得商品分类")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('product:category:query')")
-    public CommonResult<CategoryRespVO> getCategory(@RequestParam("id") Long id) {
-        CategoryDO category = categoryService.getCategory(id);
-        return success(CategoryConvert.INSTANCE.convert(category));
-    }
-
-    // TODO @JeromeSoar：这应该是个 app 的接口，提供商品分类的树结构。这个调整下，后端只返回列表，前端构建 tree。注意，不需要返回创建时间、是否开启等无关字段。
-    // TODO @YunaiV: 这个是在管理端展示了一个类似菜单的分类树列表, treeListReqVO 只是查询参数的封装命名，返给前端的是列表数据。PS: 这里 /page 接口没有使用到。
-    @GetMapping("/listByQuery")
-    @ApiOperation("获得商品分类列表")
-    @PreAuthorize("@ss.hasPermission('product:category:query')")
-    public CommonResult<List<CategoryRespVO>> listByQuery(@Valid CategoryTreeListReqVO treeListReqVO) {
-        List<CategoryDO> list = categoryService.getCategoryTreeList(treeListReqVO);
-        list.sort(Comparator.comparing(CategoryDO::getSort));
-        return success(CategoryConvert.INSTANCE.convertList(list));
-    }
-    
-    @GetMapping("/export-excel")
-    @ApiOperation("导出商品分类 Excel")
-    @PreAuthorize("@ss.hasPermission('product:category:export')")
-    @OperateLog(type = EXPORT)
-    public void exportCategoryExcel(@Valid CategoryExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<CategoryDO> list = categoryService.getCategoryList(exportReqVO);
-        // 导出 Excel
-        List<CategoryExcelVO> datas = CategoryConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "商品分类.xls", "数据", CategoryExcelVO.class, datas);
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
new file mode 100644
index 000000000..1f519e40d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.product.controller.admin.category;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
+import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
+import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Comparator;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "管理后台 - 商品分类")
+@RestController
+@RequestMapping("/product/category")
+@Validated
+public class ProductCategoryController {
+
+    @Resource
+    private ProductCategoryService categoryService;
+
+    @PostMapping("/create")
+    @ApiOperation("创建商品分类")
+    @PreAuthorize("@ss.hasPermission('product:category:create')")
+    public CommonResult<Long> createProductCategory(@Valid @RequestBody ProductCategoryCreateReqVO createReqVO) {
+        return success(categoryService.createProductCategory(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("更新商品分类")
+    @PreAuthorize("@ss.hasPermission('product:category:update')")
+    public CommonResult<Boolean> updateProductCategory(@Valid @RequestBody ProductCategoryUpdateReqVO updateReqVO) {
+        categoryService.updateProductCategory(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除商品分类")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('product:category:delete')")
+    public CommonResult<Boolean> deleteProductCategory(@RequestParam("id") Long id) {
+        categoryService.deleteProductCategory(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得商品分类")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('product:category:query')")
+    public CommonResult<ProductCategoryRespVO> getProductCategory(@RequestParam("id") Long id) {
+        ProductCategoryDO category = categoryService.getProductCategory(id);
+        return success(CategoryConvert.INSTANCE.convert(category));
+    }
+
+    @GetMapping("/list")
+    @ApiOperation("获得商品分类列表")
+    @PreAuthorize("@ss.hasPermission('product:category:query')")
+    public CommonResult<List<ProductCategoryRespVO>> getProductCategoryList(@Valid ProductCategoryListReqVO treeListReqVO) {
+        List<ProductCategoryDO> list = categoryService.getEnableProductCategoryList(treeListReqVO);
+        list.sort(Comparator.comparing(ProductCategoryDO::getSort));
+        return success(CategoryConvert.INSTANCE.convertList(list));
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExcelVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExcelVO.java
deleted file mode 100644
index f8e36ee8c..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExcelVO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.category.vo;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-
-/**
- * 商品分类 Excel VO
- *
- * @author 芋道源码
- */
-@Data
-public class CategoryExcelVO {
-
-    @ExcelProperty("分类编号")
-    private Long id;
-
-    @ExcelProperty("父分类编号")
-    private Long parentId;
-
-    @ExcelProperty("分类名称")
-    private String name;
-
-    @ExcelProperty("分类图标")
-    private String icon;
-
-    @ExcelProperty("分类图片")
-    private String bannerUrl;
-
-    @ExcelProperty("分类排序")
-    private Integer sort;
-
-    @ExcelProperty("分类描述")
-    private String description;
-
-    @ExcelProperty(value = "开启状态", converter = DictConvert.class)
-    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-    private Integer status;
-
-    @ExcelProperty("创建时间")
-    private Date createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExportReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExportReqVO.java
deleted file mode 100644
index c119fb2dc..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExportReqVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.category.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel(value = "管理后台 - 商品分类 Excel 导出 Request VO", description = "参数和 CategoryPageReqVO 是一致的")
-@Data
-public class CategoryExportReqVO {
-
-    @ApiModelProperty(value = "分类名称", example = "办公文具")
-    private String name;
-
-    @ApiModelProperty(value = "开启状态", example = "0")
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryPageReqVO.java
deleted file mode 100644
index 1cf83bbbe..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryPageReqVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.category.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel("管理后台 - 商品分类分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class CategoryPageReqVO extends PageParam {
-
-    @ApiModelProperty(value = "分类名称", example = "办公文具")
-    private String name;
-
-    @ApiModelProperty(value = "开启状态", example = "0")
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryTreeListReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryTreeListReqVO.java
deleted file mode 100644
index 214349ee5..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryTreeListReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.category.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Data
-@ApiModel(value = "管理后台 - 商品分类列表查询 Request VO", description = "参数和 CategoryPageReqVO 是一致的")
-public class CategoryTreeListReqVO extends CategoryExportReqVO {
-
-    @ApiModelProperty(value = "分类名称", example = "办公文具")
-    private String name;
-
-    @ApiModelProperty(value = "开启状态", example = "0")
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
similarity index 87%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryBaseVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
index 598e093eb..9b9c77a08 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
 */
 @Data
-public class CategoryBaseVO {
+public class ProductCategoryBaseVO {
 
     @ApiModelProperty(value = "父分类编号", required = true, example = "1")
     @NotNull(message = "父分类编号不能为空")
@@ -21,13 +21,9 @@ public class CategoryBaseVO {
     @NotBlank(message = "分类名称不能为空")
     private String name;
 
-    @ApiModelProperty(value = "分类图标")
-    @NotBlank(message = "分类图标不能为空")
-    private String icon;
-
     @ApiModelProperty(value = "分类图片", required = true)
     @NotBlank(message = "分类图片不能为空")
-    private String bannerUrl;
+    private String picUrl;
 
     @ApiModelProperty(value = "分类排序", required = true, example = "1")
     private Integer sort;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryCreateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryCreateReqVO.java
similarity index 68%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryCreateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryCreateReqVO.java
index ce583f08b..d35e1ad3c 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryCreateReqVO.java
@@ -1,14 +1,12 @@
 package cn.iocoder.yudao.module.product.controller.admin.category.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.annotations.*;
-import javax.validation.constraints.*;
 
 @ApiModel("管理后台 - 商品分类创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class CategoryCreateReqVO extends CategoryBaseVO {
+public class ProductCategoryCreateReqVO extends ProductCategoryBaseVO {
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryListReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryListReqVO.java
new file mode 100644
index 000000000..a487c16a4
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryListReqVO.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.product.controller.admin.category.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "管理后台 - 商品分类列表查询 Request VO")
+@Data
+public class ProductCategoryListReqVO {
+
+    @ApiModelProperty(value = "分类名称", example = "办公文具")
+    private String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryRespVO.java
similarity index 87%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryRespVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryRespVO.java
index e7d0b2238..9c3d1b458 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryRespVO.java
@@ -8,7 +8,7 @@ import io.swagger.annotations.*;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class CategoryRespVO extends CategoryBaseVO {
+public class ProductCategoryRespVO extends ProductCategoryBaseVO {
 
     @ApiModelProperty(value = "分类编号", required = true, example = "2")
     private Long id;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryUpdateReqVO.java
similarity index 85%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryUpdateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryUpdateReqVO.java
index 13ee83c1e..b0c8fe57d 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryUpdateReqVO.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.product.controller.admin.category.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.annotations.*;
 import javax.validation.constraints.*;
 
@@ -9,7 +8,7 @@ import javax.validation.constraints.*;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class CategoryUpdateReqVO extends CategoryBaseVO {
+public class ProductCategoryUpdateReqVO extends ProductCategoryBaseVO {
 
     @ApiModelProperty(value = "分类编号", required = true, example = "2")
     @NotNull(message = "分类编号不能为空")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
index 201690717..508059ae7 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.product.controller.app.category;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
 import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
-import cn.iocoder.yudao.module.product.service.category.CategoryService;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
+import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
@@ -25,13 +25,13 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 public class AppCategoryController {
 
     @Resource
-    private CategoryService categoryService;
+    private ProductCategoryService categoryService;
 
     @GetMapping("/list")
     @ApiOperation("获得商品分类列表")
     public CommonResult<List<AppCategoryListRespVO>> listByQuery() {
-        List<CategoryDO> list = categoryService.getCategoryList();
-        list.sort(Comparator.comparing(CategoryDO::getSort));
+        List<ProductCategoryDO> list = categoryService.getEnableProductCategoryList();
+        list.sort(Comparator.comparing(ProductCategoryDO::getSort));
         return success(CategoryConvert.INSTANCE.convertList03(list));
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
index 9099067e2..637c52976 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
@@ -1,14 +1,14 @@
 package cn.iocoder.yudao.module.product.convert.category;
 
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
+
+import java.util.List;
 
 /**
  * 商品分类 Convert
@@ -20,17 +20,13 @@ public interface CategoryConvert {
 
     CategoryConvert INSTANCE = Mappers.getMapper(CategoryConvert.class);
 
-    CategoryDO convert(CategoryCreateReqVO bean);
+    ProductCategoryDO convert(ProductCategoryCreateReqVO bean);
 
-    CategoryDO convert(CategoryUpdateReqVO bean);
+    ProductCategoryDO convert(ProductCategoryUpdateReqVO bean);
 
-    CategoryRespVO convert(CategoryDO bean);
+    ProductCategoryRespVO convert(ProductCategoryDO bean);
 
-    List<CategoryRespVO> convertList(List<CategoryDO> list);
+    List<ProductCategoryRespVO> convertList(List<ProductCategoryDO> list);
 
-    PageResult<CategoryRespVO> convertPage(PageResult<CategoryDO> page);
-
-    List<CategoryExcelVO> convertList02(List<CategoryDO> list);
-
-    List<AppCategoryListRespVO> convertList03(List<CategoryDO> list);
+    List<AppCategoryListRespVO> convertList03(List<ProductCategoryDO> list);
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/CategoryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
similarity index 70%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/CategoryDO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
index c6eb655ab..cb63f7563 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/CategoryDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-// TODO @JeromeSoar：Product 前缀
 /**
  * 商品分类 DO
  *
+ * 商品分类一共两级：
+ * 1）一级分类：{@link #parentId} 等于 0
+ * 2）二级分类：{@link #parentId} 等于父分类
+ *
  * @author 芋道源码
  */
 @TableName("product_category")
@@ -19,7 +22,12 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CategoryDO extends BaseDO {
+public class ProductCategoryDO extends BaseDO {
+
+    /**
+     * 父分类编号 - 根分类
+     */
+    public static final Long PARENT_ID_NULL = 0L;
 
     /**
      * 分类编号
@@ -35,15 +43,12 @@ public class CategoryDO extends BaseDO {
      */
     private String name;
     /**
-     * 分类图标
-     */
-    private String icon;
-    /**
-     * 分类 Banner 图片
+     * 分类图片
      *
-     * 第一层的商品分类，会有该字段，用于用户 App 展示
+     * 一级分类：推荐 200 x 100 分辨率
+     * 二级分类：推荐 100 x 100 分辨率
      */
-    private String bannerUrl;
+    private String picUrl;
     /**
      * 分类排序
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/CategoryMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/CategoryMapper.java
deleted file mode 100644
index e0f798e18..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/CategoryMapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.product.dal.mysql.category;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.CategoryExportReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.CategoryPageReqVO;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 商品分类 Mapper
- *
- * @author 芋道源码
- */
-@Mapper
-public interface CategoryMapper extends BaseMapperX<CategoryDO> {
-
-    default PageResult<CategoryDO> selectPage(CategoryPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<CategoryDO>()
-                .likeIfPresent(CategoryDO::getName, reqVO.getName())
-                .eqIfPresent(CategoryDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(CategoryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(CategoryDO::getId));
-    }
-
-    default List<CategoryDO> selectList(CategoryExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<CategoryDO>()
-                .likeIfPresent(CategoryDO::getName, reqVO.getName())
-                .eqIfPresent(CategoryDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(CategoryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(CategoryDO::getId));
-    }
-
-    default Long selectCountByParentId(Long parentId) {
-        return selectCount(CategoryDO::getParentId, parentId);
-    }
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/ProductCategoryMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/ProductCategoryMapper.java
new file mode 100644
index 000000000..8130d5a46
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/ProductCategoryMapper.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.product.dal.mysql.category;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 商品分类 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface ProductCategoryMapper extends BaseMapperX<ProductCategoryDO> {
+
+    default List<ProductCategoryDO> selectList(ProductCategoryListReqVO listReqVO) {
+        return selectList(new LambdaQueryWrapperX<ProductCategoryDO>()
+                .likeIfPresent(ProductCategoryDO::getName, listReqVO.getName())
+                .orderByDesc(ProductCategoryDO::getId));
+    }
+
+    default Long selectCountByParentId(Long parentId) {
+        return selectCount(ProductCategoryDO::getParentId, parentId);
+    }
+
+    default List<ProductCategoryDO> selectListByStatus(Integer status) {
+        return selectList(ProductCategoryDO::getStatus, status);
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java
deleted file mode 100644
index 92c8463dd..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package cn.iocoder.yudao.module.product.service.category;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.*;
-import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
-
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-
-// TODO @JeromeSoar：需要 Product 前缀
-/**
- * 商品分类 Service 接口
- *
- * @author 芋道源码
- */
-public interface CategoryService {
-
-    /**
-     * 创建商品分类
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createCategory(@Valid CategoryCreateReqVO createReqVO);
-
-    /**
-     * 更新商品分类
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateCategory(@Valid CategoryUpdateReqVO updateReqVO);
-
-    /**
-     * 删除商品分类
-     *
-     * @param id 编号
-     */
-    void deleteCategory(Long id);
-
-    /**
-     * 获得商品分类
-     *
-     * @param id 编号
-     * @return 商品分类
-     */
-    CategoryDO getCategory(Long id);
-
-    /**
-     * 获得商品分类列表
-     *
-     * @param ids 编号
-     * @return 商品分类列表
-     */
-    List<CategoryDO> getCategoryList(Collection<Long> ids);
-
-    /**
-     * 获得商品分类分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 商品分类分页
-     */
-    PageResult<CategoryDO> getCategoryPage(CategoryPageReqVO pageReqVO);
-
-    /**
-     * 获得商品分类列表, 用于 Excel 导出
-     *
-     * @param exportReqVO 查询条件
-     * @return 商品分类列表
-     */
-    List<CategoryDO> getCategoryList(CategoryExportReqVO exportReqVO);
-
-    /**
-     * 获得商品分类列表
-     *
-     * @param treeListReqVO 查询条件
-     * @return 商品分类列表
-     */
-    List<CategoryDO> getCategoryTreeList(CategoryTreeListReqVO treeListReqVO);
-
-    /**
-     *  验证选择的分类的合法性
-     * @param categoryId 分类id
-     */
-    void validatedCategoryById(Long categoryId);
-
-    /**
-     * app端获得商品分类列表
-     *
-     * @return 商品分类列表
-     */
-    List<CategoryDO> getCategoryList();
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java
deleted file mode 100644
index 85e456b2c..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package cn.iocoder.yudao.module.product.service.category;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.*;
-import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
-import cn.iocoder.yudao.module.product.dal.mysql.category.CategoryMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
-
-/**
- * 商品分类 Service 实现类
- *
- * @author 芋道源码
- */
-@Service
-@Validated
-public class CategoryServiceImpl implements CategoryService {
-
-    @Resource
-    private CategoryMapper categoryMapper;
-
-    @Override
-    public Long createCategory(CategoryCreateReqVO createReqVO) {
-        // 校验父分类存在
-        this.validateCategoryExists(createReqVO.getParentId(), CATEGORY_PARENT_NOT_EXISTS);
-        // 插入
-        CategoryDO category = CategoryConvert.INSTANCE.convert(createReqVO);
-        categoryMapper.insert(category);
-        // 返回
-        return category.getId();
-    }
-
-    @Override
-    public void updateCategory(CategoryUpdateReqVO updateReqVO) {
-        // 校验父分类存在
-        this.validateCategoryExists(updateReqVO.getParentId(), CATEGORY_PARENT_NOT_EXISTS);
-        // 校验分类是否存在
-        this.validateCategoryExists(updateReqVO.getId(), CATEGORY_NOT_EXISTS);
-        // 更新
-        CategoryDO updateObj = CategoryConvert.INSTANCE.convert(updateReqVO);
-        categoryMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteCategory(Long id) {
-        // TODO 芋艿 补充只有不存在商品才可以删除
-        // 校验分类是否存在
-        CategoryDO categoryDO = this.validateCategoryExists(id, CATEGORY_NOT_EXISTS);
-        // 校验是否还有子分类
-        if (categoryMapper.selectCountByParentId(categoryDO.getParentId()) > 0) {
-            throw ServiceExceptionUtil.exception(CATEGORY_EXISTS_CHILDREN);
-        }
-        // 删除
-        categoryMapper.deleteById(id);
-    }
-
-    private CategoryDO validateCategoryExists(Long id, ErrorCode errorCode) {
-        // TODO franky：0 要枚举哈
-        if (id == 0) {
-            return new CategoryDO().setId(id);
-        }
-        CategoryDO categoryDO = categoryMapper.selectById(id);
-        if (categoryDO == null) {
-            throw exception(errorCode);
-        }
-        return categoryDO;
-    }
-
-    @Override
-    public void validatedCategoryById(Long categoryId) {
-        this.validateCategoryExists(categoryId, CATEGORY_NOT_EXISTS);
-    }
-
-    @Override
-    public CategoryDO getCategory(Long id) {
-        return categoryMapper.selectById(id);
-    }
-
-    @Override
-    public List<CategoryDO> getCategoryList(Collection<Long> ids) {
-        return categoryMapper.selectBatchIds(ids);
-    }
-
-    @Override
-    public PageResult<CategoryDO> getCategoryPage(CategoryPageReqVO pageReqVO) {
-        return categoryMapper.selectPage(pageReqVO);
-    }
-
-    @Override
-    public List<CategoryDO> getCategoryList(CategoryExportReqVO exportReqVO) {
-        return categoryMapper.selectList(exportReqVO);
-    }
-
-    @Override
-    public List<CategoryDO> getCategoryTreeList(CategoryTreeListReqVO treeListReqVO) {
-        return categoryMapper.selectList(treeListReqVO);
-    }
-
-    @Override
-    public List<CategoryDO> getCategoryList() {
-        return categoryMapper.selectList()
-                .stream()
-                .filter(v->v.getStatus().equals(CommonStatusEnum.ENABLE.getStatus()))
-                .collect(Collectors.toList());
-    }
-
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
new file mode 100644
index 000000000..264f81c27
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
@@ -0,0 +1,79 @@
+package cn.iocoder.yudao.module.product.service.category;
+
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品分类 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface ProductCategoryService {
+
+    /**
+     * 创建商品分类
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createProductCategory(@Valid ProductCategoryCreateReqVO createReqVO);
+
+    /**
+     * 更新商品分类
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateProductCategory(@Valid ProductCategoryUpdateReqVO updateReqVO);
+
+    /**
+     * 删除商品分类
+     *
+     * @param id 编号
+     */
+    void deleteProductCategory(Long id);
+
+    /**
+     * 获得商品分类
+     *
+     * @param id 编号
+     * @return 商品分类
+     */
+    ProductCategoryDO getProductCategory(Long id);
+
+    /**
+     * 获得商品分类列表
+     *
+     * @param ids 编号
+     * @return 商品分类列表
+     */
+    List<ProductCategoryDO> getEnableProductCategoryList(Collection<Long> ids);
+
+    /**
+     * 获得商品分类列表
+     *
+     * @param listReqVO 查询条件
+     * @return 商品分类列表
+     */
+    List<ProductCategoryDO> getEnableProductCategoryList(ProductCategoryListReqVO listReqVO);
+
+    /**
+     * 验证选择的商品分类是否合法
+     *
+     * @param id 分类编号
+     */
+    void validateProductCategory(Long id);
+
+    /**
+     * 获得开启状态的商品分类列表
+     *
+     * @return 商品分类列表
+     */
+    List<ProductCategoryDO> getEnableProductCategoryList();
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
new file mode 100644
index 000000000..65f61b323
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
@@ -0,0 +1,125 @@
+package cn.iocoder.yudao.module.product.service.category;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
+import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
+import cn.iocoder.yudao.module.product.dal.mysql.category.ProductCategoryMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
+
+/**
+ * 商品分类 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class ProductCategoryServiceImpl implements ProductCategoryService {
+
+    @Resource
+    private ProductCategoryMapper productCategoryMapper;
+
+    @Override
+    public Long createProductCategory(ProductCategoryCreateReqVO createReqVO) {
+        // 校验父分类存在
+        validateParentProductCategory(createReqVO.getParentId());
+
+        // 插入
+        ProductCategoryDO category = CategoryConvert.INSTANCE.convert(createReqVO);
+        productCategoryMapper.insert(category);
+        // 返回
+        return category.getId();
+    }
+
+    @Override
+    public void updateProductCategory(ProductCategoryUpdateReqVO updateReqVO) {
+        // 校验分类是否存在
+        validateProductCategoryExists(updateReqVO.getId());
+        // 校验父分类存在
+        validateParentProductCategory(updateReqVO.getParentId());
+
+        // 更新
+        ProductCategoryDO updateObj = CategoryConvert.INSTANCE.convert(updateReqVO);
+        productCategoryMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteProductCategory(Long id) {
+        // 校验分类是否存在
+        validateProductCategoryExists(id);
+        // 校验是否还有子分类
+        if (productCategoryMapper.selectCountByParentId(id) > 0) {
+            throw exception(PRODUCT_CATEGORY_EXISTS_CHILDREN);
+        }
+
+        // 删除
+        productCategoryMapper.deleteById(id);
+    }
+
+    private void validateParentProductCategory(Long id) {
+        // 如果是根分类，无需验证
+        if (Objects.equals(id, ProductCategoryDO.PARENT_ID_NULL)) {
+            return;
+        }
+        // 父分类不存在
+        ProductCategoryDO category = productCategoryMapper.selectById(id);
+        if (category == null) {
+            throw exception(PRODUCT_CATEGORY_PARENT_NOT_EXISTS);
+        }
+        // 父分类不能是二级分类
+        if (Objects.equals(id, ProductCategoryDO.PARENT_ID_NULL)) {
+            throw exception(PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL);
+        }
+    }
+
+    private void validateProductCategoryExists(Long id) {
+        ProductCategoryDO category = productCategoryMapper.selectById(id);
+        if (category == null) {
+            throw exception(PRODUCT_CATEGORY_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public void validateProductCategory(Long id) {
+        ProductCategoryDO category = productCategoryMapper.selectById(id);
+        if (category == null) {
+            throw exception(PRODUCT_CATEGORY_NOT_EXISTS);
+        }
+        if (ObjectUtil.notEqual(category.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
+            throw exception(PRODUCT_CATEGORY_DISABLED);
+        }
+    }
+
+    @Override
+    public ProductCategoryDO getProductCategory(Long id) {
+        return productCategoryMapper.selectById(id);
+    }
+
+    @Override
+    public List<ProductCategoryDO> getEnableProductCategoryList(Collection<Long> ids) {
+        return productCategoryMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public List<ProductCategoryDO> getEnableProductCategoryList(ProductCategoryListReqVO listReqVO) {
+        return productCategoryMapper.selectList(listReqVO);
+    }
+
+    @Override
+    public List<ProductCategoryDO> getEnableProductCategoryList() {
+        return productCategoryMapper.selectListByStatus(CommonStatusEnum.ENABLE.getStatus());
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 0ff02e66f..ea4afb2e7 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -15,7 +15,7 @@ import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
-import cn.iocoder.yudao.module.product.service.category.CategoryService;
+import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
 import org.springframework.stereotype.Service;
@@ -42,7 +42,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     private ProductSpuMapper ProductSpuMapper;
 
     @Resource
-    private CategoryService categoryService;
+    private ProductCategoryService categoryService;
 
     @Resource
     private ProductSkuService productSkuService;
@@ -54,7 +54,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     @Transactional
     public Long createSpu(ProductSpuCreateReqVO createReqVO) {
         // 校验分类
-        categoryService.validatedCategoryById(createReqVO.getCategoryId());
+        categoryService.validateProductCategory(createReqVO.getCategoryId());
         // 校验SKU
         List<ProductSkuCreateReqVO> skuCreateReqList = createReqVO.getSkus();
         productSkuService.validateSkus(skuCreateReqList);
@@ -78,7 +78,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         // 校验 spu 是否存在
         this.validateSpuExists(updateReqVO.getId());
         // 校验分类
-        categoryService.validatedCategoryById(updateReqVO.getCategoryId());
+        categoryService.validateProductCategory(updateReqVO.getCategoryId());
         // 校验SKU
         List<ProductSkuCreateReqVO> skuCreateReqList = updateReqVO.getSkus();
         productSkuService.validateSkus(skuCreateReqList);
@@ -142,7 +142,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
                 Long parentId = spuVO.getCategoryId();
                 categoryArray.addFirst(parentId);
                 while (parentId != 0) {
-                    parentId = categoryService.getCategory(parentId).getParentId();
+                    parentId = categoryService.getProductCategory(parentId).getParentId();
                     if (parentId > 0) {
                         categoryArray.addFirst(parentId);
                     }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImplTest.java
deleted file mode 100644
index 34384201b..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImplTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package cn.iocoder.yudao.module.product.service.category;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.CategoryCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.CategoryExportReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.CategoryPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.CategoryUpdateReqVO;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.CategoryDO;
-import cn.iocoder.yudao.module.product.dal.mysql.category.CategoryMapper;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.annotation.Import;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.CATEGORY_NOT_EXISTS;
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * {@link CategoryServiceImpl} 的单元测试类
- *
- * @author 芋道源码
- */
-@Import(CategoryServiceImpl.class)
-public class CategoryServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private CategoryServiceImpl categoryService;
-
-    @Resource
-    private CategoryMapper categoryMapper;
-
-    @Test
-    public void testCreateCategory_success() {
-        // 准备参数
-        CategoryCreateReqVO reqVO = randomPojo(CategoryCreateReqVO.class);
-
-        // 调用
-        Long categoryId = categoryService.createCategory(reqVO);
-        // 断言
-        assertNotNull(categoryId);
-        // 校验记录的属性是否正确
-        CategoryDO category = categoryMapper.selectById(categoryId);
-        assertPojoEquals(reqVO, category);
-    }
-
-    @Test
-    public void testUpdateCategory_success() {
-        // mock 数据
-        CategoryDO dbCategory = randomPojo(CategoryDO.class);
-        categoryMapper.insert(dbCategory);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        CategoryUpdateReqVO reqVO = randomPojo(CategoryUpdateReqVO.class, o -> {
-            o.setId(dbCategory.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        categoryService.updateCategory(reqVO);
-        // 校验是否更新正确
-        CategoryDO category = categoryMapper.selectById(reqVO.getId()); // 获取最新的
-        assertPojoEquals(reqVO, category);
-    }
-
-    @Test
-    public void testUpdateCategory_notExists() {
-        // 准备参数
-        CategoryUpdateReqVO reqVO = randomPojo(CategoryUpdateReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> categoryService.updateCategory(reqVO), CATEGORY_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteCategory_success() {
-        // mock 数据
-        CategoryDO dbCategory = randomPojo(CategoryDO.class);
-        categoryMapper.insert(dbCategory);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbCategory.getId();
-
-        // 调用
-        categoryService.deleteCategory(id);
-        // 校验数据不存在了
-        assertNull(categoryMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteCategory_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> categoryService.deleteCategory(id), CATEGORY_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetCategoryPage() {
-        // mock 数据
-        CategoryDO dbCategory = randomPojo(CategoryDO.class, o -> { // 等会查询到
-            o.setParentId(null);
-            o.setName(null);
-            o.setIcon(null);
-            o.setBannerUrl(null);
-            o.setSort(null);
-            o.setDescription(null);
-            o.setStatus(null);
-            o.setCreateTime(null);
-        });
-        categoryMapper.insert(dbCategory);
-        // 测试 pid 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setParentId(null)));
-        // 测试 name 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setName(null)));
-        // 测试 icon 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setIcon(null)));
-        // 测试 bannerUrl 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setBannerUrl(null)));
-        // 测试 sort 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setSort(null)));
-        // 测试 description 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setDescription(null)));
-        // 测试 status 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setStatus(null)));
-        // 测试 createTime 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setCreateTime(null)));
-        // 准备参数
-        CategoryPageReqVO reqVO = new CategoryPageReqVO();
-        reqVO.setName(null);
-        reqVO.setStatus(null);
-        reqVO.setCreateTime(null);
-
-        // 调用
-        PageResult<CategoryDO> pageResult = categoryService.getCategoryPage(reqVO);
-        // 断言
-        assertEquals(1, pageResult.getTotal());
-        assertEquals(1, pageResult.getList().size());
-        assertPojoEquals(dbCategory, pageResult.getList().get(0));
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetCategoryList() {
-        // mock 数据
-        CategoryDO dbCategory = randomPojo(CategoryDO.class, o -> { // 等会查询到
-            o.setParentId(null);
-            o.setName(null);
-            o.setIcon(null);
-            o.setBannerUrl(null);
-            o.setSort(null);
-            o.setDescription(null);
-            o.setStatus(null);
-            o.setCreateTime(null);
-        });
-        categoryMapper.insert(dbCategory);
-        // 测试 pid 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setParentId(null)));
-        // 测试 name 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setName(null)));
-        // 测试 icon 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setIcon(null)));
-        // 测试 bannerUrl 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setBannerUrl(null)));
-        // 测试 sort 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setSort(null)));
-        // 测试 description 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setDescription(null)));
-        // 测试 status 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setStatus(null)));
-        // 测试 createTime 不匹配
-        categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setCreateTime(null)));
-        // 准备参数
-        CategoryExportReqVO reqVO = new CategoryExportReqVO();
-        reqVO.setName(null);
-        reqVO.setStatus(null);
-        reqVO.setCreateTime(null);
-
-        // 调用
-        List<CategoryDO> list = categoryService.getCategoryList(reqVO);
-        // 断言
-        assertEquals(1, list.size());
-        assertPojoEquals(dbCategory, list.get(0));
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
new file mode 100644
index 000000000..7fc3e2a22
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
@@ -0,0 +1,126 @@
+package cn.iocoder.yudao.module.product.service.category;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
+import cn.iocoder.yudao.module.product.dal.mysql.category.ProductCategoryMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_CATEGORY_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * {@link ProductCategoryServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(ProductCategoryServiceImpl.class)
+public class ProductCategoryServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private ProductCategoryServiceImpl productCategoryService;
+
+    @Resource
+    private ProductCategoryMapper productCategoryMapper;
+
+    @Test
+    public void testCreateCategory_success() {
+        // 准备参数
+        ProductCategoryCreateReqVO reqVO = randomPojo(ProductCategoryCreateReqVO.class);
+        // mock 父类
+        ProductCategoryDO parentProductCategory = randomPojo(ProductCategoryDO.class, o -> o.setId(reqVO.getParentId()));
+        productCategoryMapper.insert(parentProductCategory);
+
+        // 调用
+        Long categoryId = productCategoryService.createProductCategory(reqVO);
+        // 断言
+        assertNotNull(categoryId);
+        // 校验记录的属性是否正确
+        ProductCategoryDO category = productCategoryMapper.selectById(categoryId);
+        assertPojoEquals(reqVO, category);
+    }
+
+    @Test
+    public void testUpdateCategory_success() {
+        // mock 数据
+        ProductCategoryDO dbCategory = randomPojo(ProductCategoryDO.class);
+        productCategoryMapper.insert(dbCategory);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        ProductCategoryUpdateReqVO reqVO = randomPojo(ProductCategoryUpdateReqVO.class, o -> {
+            o.setId(dbCategory.getId()); // 设置更新的 ID
+        });
+        // mock 父类
+        ProductCategoryDO parentProductCategory = randomPojo(ProductCategoryDO.class, o -> o.setId(reqVO.getParentId()));
+        productCategoryMapper.insert(parentProductCategory);
+
+        // 调用
+        productCategoryService.updateProductCategory(reqVO);
+        // 校验是否更新正确
+        ProductCategoryDO category = productCategoryMapper.selectById(reqVO.getId()); // 获取最新的
+        assertPojoEquals(reqVO, category);
+    }
+
+    @Test
+    public void testUpdateCategory_notExists() {
+        // 准备参数
+        ProductCategoryUpdateReqVO reqVO = randomPojo(ProductCategoryUpdateReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> productCategoryService.updateProductCategory(reqVO), PRODUCT_CATEGORY_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteCategory_success() {
+        // mock 数据
+        ProductCategoryDO dbCategory = randomPojo(ProductCategoryDO.class);
+        productCategoryMapper.insert(dbCategory);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbCategory.getId();
+
+        // 调用
+        productCategoryService.deleteProductCategory(id);
+        // 校验数据不存在了
+        assertNull(productCategoryMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteCategory_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> productCategoryService.deleteProductCategory(id), PRODUCT_CATEGORY_NOT_EXISTS);
+    }
+
+    @Test
+    public void testGetCategoryList() {
+        // mock 数据
+        ProductCategoryDO dbCategory = randomPojo(ProductCategoryDO.class, o -> { // 等会查询到
+            o.setName("奥特曼");
+        });
+        productCategoryMapper.insert(dbCategory);
+        // 测试 name 不匹配
+        productCategoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setName("奥特块")));
+        // 准备参数
+        ProductCategoryListReqVO reqVO = new ProductCategoryListReqVO();
+        reqVO.setName("特曼");
+
+        // 调用
+        List<ProductCategoryDO> list = productCategoryService.getEnableProductCategoryList(reqVO);
+        // 断言
+        assertEquals(1, list.size());
+        assertPojoEquals(dbCategory, list.get(0));
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml b/yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml
new file mode 100644
index 000000000..3a2079cdc
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml
@@ -0,0 +1,50 @@
+spring:
+  main:
+    lazy-initialization: true # 开启懒加载，加快速度
+    banner-mode: off # 单元测试，禁用 Banner
+
+--- #################### 数据库相关配置 ####################
+
+spring:
+  # 数据源配置项
+  datasource:
+    name: ruoyi-vue-pro
+    url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写
+    driver-class-name: org.h2.Driver
+    username: sa
+    password:
+    druid:
+      async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度
+      initial-size: 1 # 单元测试，配置为 1，提升启动速度
+  sql:
+    init:
+      schema-locations: classpath:/sql/create_tables.sql
+
+  # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
+  redis:
+    host: 127.0.0.1 # 地址
+    port: 16379 # 端口（单元测试，使用 16379 端口）
+    database: 0 # 数据库索引
+
+mybatis-plus:
+  lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试
+  type-aliases-package: ${yudao.info.base-package}.module.*.dal.dataobject
+
+--- #################### 定时任务相关配置 ####################
+
+--- #################### 配置中心相关配置 ####################
+
+--- #################### 服务保障相关配置 ####################
+
+# Lock4j 配置项（单元测试，禁用 Lock4j）
+
+# Resilience4j 配置项
+
+--- #################### 监控相关配置 ####################
+
+--- #################### 芋道相关配置 ####################
+
+# 芋道配置项，设置当前项目所有自定义的配置
+yudao:
+  info:
+    base-package: cn.iocoder.yudao
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/resources/logback.xml b/yudao-module-mall/yudao-module-product-biz/src/test/resources/logback.xml
new file mode 100644
index 000000000..daf756bff
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/resources/logback.xml
@@ -0,0 +1,4 @@
+<configuration>
+    <!-- 引用 Spring Boot 的 logback 基础配置 -->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+</configuration>
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql b/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
index 94f0b7937..7b0e3e414 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
@@ -2,8 +2,7 @@ CREATE TABLE IF NOT EXISTS "product_category" (
     "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY,
     "parent_id" bigint(20) NOT NULL,
     "name" varchar(255) NOT NULL,
-    "icon" varchar(100),
-    "banner_url" varchar(255) NOT NULL,
+    "pic_url" varchar(255) NOT NULL,
     "sort" int(11) NOT NULL,
     "description" varchar(1024) NOT NULL,
     "status" tinyint(4) NOT NULL,
@@ -12,7 +11,6 @@ CREATE TABLE IF NOT EXISTS "product_category" (
     "updater" varchar(64) DEFAULT '',
     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     "deleted" bit NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint(20) NOT NULL,
     PRIMARY KEY ("id")
 ) COMMENT '商品分类';
 
@@ -29,6 +27,5 @@ CREATE TABLE IF NOT EXISTS "product_brand" (
     "updater" varchar(64) DEFAULT '',
     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     "deleted" bit NOT NULL DEFAULT FALSE,
-    "tenant_id" bigint(20) NOT NULL,
     PRIMARY KEY ("id")
 ) COMMENT '品牌';

From 969c3877641eeecf77c7395b7981bb006b8d2f13 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 Jul 2022 20:28:01 +0800
Subject: [PATCH 07/56] =?UTF-8?q?mall=EF=BC=9A=E5=AE=8C=E5=96=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=E7=9A=84=E7=AE=A1=E7=90=86=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/mall.sql                    |  20 +--
 .../app/category/AppCategoryController.java   |   2 -
 .../category/vo/AppCategoryListRespVO.java    |  13 +-
 .../src/api/mall/product/category.js          |  33 +----
 .../src/views/mall/product/brand/index.vue    |   4 +-
 .../src/views/mall/product/category/index.vue | 140 ++++--------------
 .../src/views/mall/product/spu/index.vue      |  12 +-
 7 files changed, 48 insertions(+), 176 deletions(-)

diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql
index 9493c3bcf..e8a29fb0d 100644
--- a/sql/optional/mall/mall.sql
+++ b/sql/optional/mall/mall.sql
@@ -20,25 +20,6 @@ SET NAMES utf8mb4;
 -- ----------------------------
 -- Table structure for product_category
 -- ----------------------------
-DROP TABLE IF EXISTS `product_category`;
-CREATE TABLE `product_category`
-(
-    `id`          bigint       NOT NULL AUTO_INCREMENT COMMENT '分类编号',
-    `parent_id`   bigint       NOT NULL COMMENT '父分类编号',
-    `name`        varchar(255) NOT NULL COMMENT '分类名称',
-    `icon`        varchar(100) NOT NULL DEFAULT '#' COMMENT '分类图标',
-    `banner_url`  varchar(255) NOT NULL COMMENT '分类图片',
-    `sort`        int                   DEFAULT '0' COMMENT '分类排序',
-    `description` varchar(1024)         DEFAULT NULL COMMENT '分类描述',
-    `status`      tinyint      NOT NULL COMMENT '开启状态',
-    `creator`     varchar(64)           DEFAULT '' COMMENT '创建者',
-    `create_time` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`     varchar(64)           DEFAULT '' COMMENT '更新者',
-    `update_time` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`     bit(1)       NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`   bigint       NOT NULL DEFAULT '0' COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB COMMENT='商品分类';
 
 -- ----------------------------
 -- Table structure for product_brand
@@ -83,6 +64,7 @@ INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `pa
 VALUES ('分类删除', 'product:category:delete', 3, 4, @parentId, '', '', '', 0);
 INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
 VALUES ('分类导出', 'product:category:export', 3, 5, @parentId, '', '', '', 0);
+
 -- 品牌管理 菜单 SQL
 INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
 VALUES ('品牌管理', '', 2, 1, 2001, 'brand', '', 'mall/product/brand/index', 0);
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
index 508059ae7..5300c9c67 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
@@ -35,6 +35,4 @@ public class AppCategoryController {
         return success(CategoryConvert.INSTANCE.convertList03(list));
     }
 
-
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
index e50c53e4d..9ed47f9d7 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel(value = "App - 商品分类 列表 Request VO", description = "参数和 CategoryBaseVO 是一致的")
+@ApiModel(value = "App - 商品分类 Response VO")
 public class AppCategoryListRespVO {
 
     @ApiModelProperty(value = "分类编号", required = true, example = "2")
@@ -22,17 +22,8 @@ public class AppCategoryListRespVO {
     @NotBlank(message = "分类名称不能为空")
     private String name;
 
-    @ApiModelProperty(value = "分类图标")
-    @NotBlank(message = "分类图标不能为空")
-    private String icon;
-
     @ApiModelProperty(value = "分类图片", required = true)
     @NotBlank(message = "分类图片不能为空")
-    private String bannerUrl;
+    private String picUrl;
 
-    @ApiModelProperty(value = "分类排序", required = true, example = "1")
-    private Integer sort;
-
-    @ApiModelProperty(value = "分类描述", required = true, example = "描述")
-    private String description;
 }
diff --git a/yudao-ui-admin/src/api/mall/product/category.js b/yudao-ui-admin/src/api/mall/product/category.js
index bd825034d..4b8754b5a 100644
--- a/yudao-ui-admin/src/api/mall/product/category.js
+++ b/yudao-ui-admin/src/api/mall/product/category.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 创建商品分类
-export function createCategory(data) {
+export function createProductCategory(data) {
   return request({
     url: '/product/category/create',
     method: 'post',
@@ -10,7 +10,7 @@ export function createCategory(data) {
 }
 
 // 更新商品分类
-export function updateCategory(data) {
+export function updateProductCategory(data) {
   return request({
     url: '/product/category/update',
     method: 'put',
@@ -19,7 +19,7 @@ export function updateCategory(data) {
 }
 
 // 删除商品分类
-export function deleteCategory(id) {
+export function deleteProductCategory(id) {
   return request({
     url: '/product/category/delete?id=' + id,
     method: 'delete'
@@ -27,37 +27,18 @@ export function deleteCategory(id) {
 }
 
 // 获得商品分类
-export function getCategory(id) {
+export function getProductCategory(id) {
   return request({
     url: '/product/category/get?id=' + id,
     method: 'get'
   })
 }
 
-// 获得商品分类
-export function listCategory(query) {
+// 获得商品分类列表
+export function getProductCategoryList(query) {
   return request({
-    url: '/product/category/listByQuery',
+    url: '/product/category/list',
     method: 'get',
     params: query
   })
 }
-
-// 获得商品分类分页
-export function getCategoryPage(query) {
-  return request({
-    url: '/product/category/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出商品分类 Excel
-export function exportCategoryExcel(query) {
-  return request({
-    url: '/product/category/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
diff --git a/yudao-ui-admin/src/views/mall/product/brand/index.vue b/yudao-ui-admin/src/views/mall/product/brand/index.vue
index b0c3c97b8..0dd249561 100644
--- a/yudao-ui-admin/src/views/mall/product/brand/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/brand/index.vue
@@ -118,7 +118,7 @@ import {
   getBrandPage,
   updateBrand
 } from "@/api/mall/product/brand";
-import {listCategory} from "@/api/mall/product/category";
+import {getProductCategoryList} from "@/api/mall/product/category";
 import ImageUpload from '@/components/ImageUpload';
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -194,7 +194,7 @@ export default {
     },
     /** 查询分类下拉树结构 */
     getTreeselect() {
-      listCategory().then(response => {
+      getProductCategoryList().then(response => {
         this.categoryOptions = [];
         const menu = {id: 0, name: '商品分类', children: []};
         menu.children = this.handleTree(response.data, "id", "pid");
diff --git a/yudao-ui-admin/src/views/mall/product/category/index.vue b/yudao-ui-admin/src/views/mall/product/category/index.vue
index 41ed4c020..615c44328 100644
--- a/yudao-ui-admin/src/views/mall/product/category/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/category/index.vue
@@ -6,12 +6,6 @@
       <el-form-item label="分类名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入分类名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="开启状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -28,27 +22,16 @@
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   :loading="exportLoading"
-                   v-hasPermi="['product:category:export']">导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-if="refreshTable" v-loading="loading" :data="list"  row-key="id" :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column label="分类名称" align="center" prop="name"/>
-      <el-table-column label="分类图标" align="center" prop="icon">
+      <el-table-column label="分类名称" prop="name"/>
+      <el-table-column label="分类图片" align="center" prop="picUrl">
         <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
-        </template>
-      </el-table-column>
-      <el-table-column label="分类图片" align="center" prop="bannerUrl">
-        <template slot-scope="scope">
-          <img v-if="scope.row.bannerUrl" :src="scope.row.bannerUrl" alt="分类图片" class="img-height"/>
+          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="分类图片" style="height: 100px"/>
         </template>
       </el-table-column>
       <el-table-column label="分类排序" align="center" prop="sort"/>
@@ -78,32 +61,22 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="上级分类" prop="parentId">
-          <Treeselect v-model="form.parentId" :options="parentCategoryOptions" :normalizer="normalizer"
-                      :show-count="true"
-                      placeholder="上级分类"/>
+          <el-select v-model="form.parentId" placeholder="请选择上级分类" clearable size="small">
+            <el-option :key="0" label="顶级分类" :value="0"/>
+            <el-option v-for="item in list.filter(v => v.parentId === 0)" :key="item.id" :label="item.name" :value="item.id"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="分类名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入分类名称"/>
         </el-form-item>
-        <el-form-item label="分类图标" prop="icon">
-          <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
-            <IconSelect ref="iconSelect" @selected="iconSelected"/>
-            <el-input slot="reference" v-model="form.icon" placeholder="点击选择分类图标" readonly>
-              <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon"
-                        style="height: 32px;width: 16px;"/>
-              <i v-else slot="prefix" class="el-icon-search el-input__icon"/>
-            </el-input>
-          </el-popover>
-        </el-form-item>
         <el-form-item label="分类图片" prop="bannerUrl">
-          <ImageUpload v-model="form.bannerUrl" :limit="1"/>
+          <ImageUpload v-model="form.picUrl" :limit="1" :is-show-tip="false" />
+          <div v-if="form.parentId === 0" style="font-size: 10px">推荐 200x100 图片分辨率</div>
+          <div v-else style="font-size: 10px">推荐 100x100 图片分辨率</div>
         </el-form-item>
         <el-form-item label="分类排序" prop="sort">
           <el-input-number v-model="form.sort" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="分类描述">
-          <editor v-model="form.description" :min-height="192"/>
-        </el-form-item>
         <el-form-item label="开启状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
@@ -111,6 +84,9 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="分类描述">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入分类描述" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -122,34 +98,31 @@
 
 <script>
 import {
-  createCategory,
-  deleteCategory,
+  createProductCategory,
+  deleteProductCategory,
   exportCategoryExcel,
-  getCategory,
-  listCategory,
-  updateCategory
+  getProductCategory,
+  getProductCategoryList,
+  updateProductCategory
 } from "@/api/mall/product/category";
 import Editor from '@/components/Editor';
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
 import ImageUpload from '@/components/ImageUpload';
+import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
   name: "Category",
   components: {
-    Editor, Treeselect, IconSelect, ImageUpload
+    Editor, Treeselect, ImageUpload
   },
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
-      // 总条数
-      total: 0,
       // 商品分类列表
       list: [],
       // 商品分类树选项
@@ -164,10 +137,7 @@ export default {
       refreshTable: true,
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
         name: null,
-        status: null,
       },
       // 表单参数
       form: {},
@@ -175,8 +145,8 @@ export default {
       rules: {
         parentId: [{required: true, message: "请选择上级分类", trigger: "blur"}],
         name: [{required: true, message: "分类名称不能为空", trigger: "blur"}],
-        icon: [{required: true, message: "分类图标不能为空", trigger: "blur"}],
-        bannerUrl: [{required: true, message: "分类图片不能为空", trigger: "blur"}],
+        picUrl: [{required: true, message: "分类图片不能为空", trigger: "blur"}],
+        sort: [{required: true, message: "分类排序不能为空", trigger: "blur"}],
         status: [{required: true, message: "开启状态不能为空", trigger: "blur"}],
       }
     };
@@ -191,35 +161,11 @@ export default {
       // 处理查询参数
       let params = {...this.queryParams};
       // 执行查询
-      listCategory(params).then(response => {
+      getProductCategoryList(params).then(response => {
         this.list = this.handleTree(response.data, "id", "parentId");
         this.loading = false;
       });
     },
-    // 选择图标
-    iconSelected(name) {
-      this.form.icon = name;
-    },
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.children
-      };
-    },
-    /** 查询分类下拉树结构 */
-    getTreeselect() {
-      listCategory().then(response => {
-        this.parentCategoryOptions = [];
-        const menu = {id: 0, name: '主分类', children: []};
-        menu.children = this.handleTree(response.data, "id", "parentId");
-        this.parentCategoryOptions.push(menu);
-      });
-    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -231,11 +177,10 @@ export default {
         id: undefined,
         parentId: undefined,
         name: undefined,
-        icon: undefined,
-        bannerUrl: undefined,
-        sort: undefined,
+        pirUrl: undefined,
+        sort: 0,
         description: undefined,
-        status: undefined,
+        status: CommonStatusEnum.ENABLE,
       };
       this.resetForm("form");
     },
@@ -260,16 +205,14 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getTreeselect();
       this.open = true;
       this.title = "添加商品分类";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.getTreeselect();
       const id = row.id;
-      getCategory(id).then(response => {
+      getProductCategory(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改商品分类";
@@ -283,7 +226,7 @@ export default {
         }
         // 修改的提交
         if (this.form.id != null) {
-          updateCategory(this.form).then(response => {
+          updateProductCategory(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -291,7 +234,7 @@ export default {
           return;
         }
         // 添加的提交
-        createCategory(this.form).then(response => {
+        createProductCategory(this.form).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -302,36 +245,13 @@ export default {
     handleDelete(row) {
       const id = row.id;
       this.$modal.confirm('是否确认删除商品分类编号为"' + id + '"的数据项?').then(function () {
-        return deleteCategory(id);
+        return deleteProductCategory(id);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      // 执行导出
-      this.$modal.confirm('是否确认导出所有商品分类数据项?').then(() => {
-        this.exportLoading = true;
-        return exportCategoryExcel(params);
-      }).then(response => {
-        this.$download.excel(response, '商品分类.xls');
-        this.exportLoading = false;
-      }).catch(() => {
-      });
     }
   }
 };
 </script>
-
-<style scoped lang="scss">
-//
-.img-height {
-  height: 150px;
-}
-</style>
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 6be1aa888..5f5ca6d49 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -283,12 +283,12 @@
 <script>
 import {createSpu, updateSpu, deleteSpu, getSpu, getSpuPage, exportSpuExcel} from "@/api/mall/product/spu";
 import {
-  createCategory,
-  deleteCategory,
+  createProductCategory,
+  deleteProductCategory,
   exportCategoryExcel,
-  getCategory,
-  listCategory,
-  updateCategory
+  getProductCategory,
+  getProductCategoryList,
+  updateProductCategory
 } from "@/api/mall/product/category";
 import {
   createProperty,
@@ -585,7 +585,7 @@ export default {
     /** 查询分类 */
     getListCategory() {
       // 执行查询
-      listCategory().then(response => {
+      getProductCategoryList().then(response => {
         this.categoryList = this.handleTree(response.data, "id", "parentId");
 
       });

From efd49421298619d5828de9d29350f6015827c09c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 Jul 2022 21:24:05 +0800
Subject: [PATCH 08/56] =?UTF-8?q?mall=EF=BC=9A=E5=AE=8C=E5=96=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=E7=9A=84=20APP=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../category/ProductCategoryController.java   |  6 ++---
 .../app/category/AppCategoryController.java   |  8 +++---
 ...ListRespVO.java => AppCategoryRespVO.java} |  4 +--
 ...nvert.java => ProductCategoryConvert.java} |  8 +++---
 .../category/ProductCategoryDO.java           |  6 ++---
 .../category/ProductCategoryServiceImpl.java  |  6 ++---
 .../src/views/mall/product/category/index.vue | 26 +++++++++++++++----
 yudao-ui-app/pages/category/category.vue      |  6 ++---
 8 files changed, 43 insertions(+), 27 deletions(-)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/{AppCategoryListRespVO.java => AppCategoryRespVO.java} (90%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/{CategoryConvert.java => ProductCategoryConvert.java} (80%)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
index 1f519e40d..4467d392a 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCateg
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
-import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
+import cn.iocoder.yudao.module.product.convert.category.ProductCategoryConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
 import io.swagger.annotations.Api;
@@ -61,7 +61,7 @@ public class ProductCategoryController {
     @PreAuthorize("@ss.hasPermission('product:category:query')")
     public CommonResult<ProductCategoryRespVO> getProductCategory(@RequestParam("id") Long id) {
         ProductCategoryDO category = categoryService.getProductCategory(id);
-        return success(CategoryConvert.INSTANCE.convert(category));
+        return success(ProductCategoryConvert.INSTANCE.convert(category));
     }
 
     @GetMapping("/list")
@@ -70,7 +70,7 @@ public class ProductCategoryController {
     public CommonResult<List<ProductCategoryRespVO>> getProductCategoryList(@Valid ProductCategoryListReqVO treeListReqVO) {
         List<ProductCategoryDO> list = categoryService.getEnableProductCategoryList(treeListReqVO);
         list.sort(Comparator.comparing(ProductCategoryDO::getSort));
-        return success(CategoryConvert.INSTANCE.convertList(list));
+        return success(ProductCategoryConvert.INSTANCE.convertList(list));
     }
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
index 5300c9c67..1b5664b85 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
@@ -1,8 +1,8 @@
 package cn.iocoder.yudao.module.product.controller.app.category;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
-import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
+import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryRespVO;
+import cn.iocoder.yudao.module.product.convert.category.ProductCategoryConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
 import io.swagger.annotations.Api;
@@ -29,10 +29,10 @@ public class AppCategoryController {
 
     @GetMapping("/list")
     @ApiOperation("获得商品分类列表")
-    public CommonResult<List<AppCategoryListRespVO>> listByQuery() {
+    public CommonResult<List<AppCategoryRespVO>> getProductCategoryList() {
         List<ProductCategoryDO> list = categoryService.getEnableProductCategoryList();
         list.sort(Comparator.comparing(ProductCategoryDO::getSort));
-        return success(CategoryConvert.INSTANCE.convertList03(list));
+        return success(ProductCategoryConvert.INSTANCE.convertList03(list));
     }
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryRespVO.java
similarity index 90%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryRespVO.java
index 9ed47f9d7..e46a50cd3 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryListRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/vo/AppCategoryRespVO.java
@@ -8,8 +8,8 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel(value = "App - 商品分类 Response VO")
-public class AppCategoryListRespVO {
+@ApiModel(value = "用户 APP - 商品分类 Response VO")
+public class AppCategoryRespVO {
 
     @ApiModelProperty(value = "分类编号", required = true, example = "2")
     private Long id;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/ProductCategoryConvert.java
similarity index 80%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/ProductCategoryConvert.java
index 637c52976..ae01ca9d5 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/CategoryConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/category/ProductCategoryConvert.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.product.convert.category;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryListRespVO;
+import cn.iocoder.yudao.module.product.controller.app.category.vo.AppCategoryRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -16,9 +16,9 @@ import java.util.List;
  * @author 芋道源码
  */
 @Mapper
-public interface CategoryConvert {
+public interface ProductCategoryConvert {
 
-    CategoryConvert INSTANCE = Mappers.getMapper(CategoryConvert.class);
+    ProductCategoryConvert INSTANCE = Mappers.getMapper(ProductCategoryConvert.class);
 
     ProductCategoryDO convert(ProductCategoryCreateReqVO bean);
 
@@ -28,5 +28,5 @@ public interface CategoryConvert {
 
     List<ProductCategoryRespVO> convertList(List<ProductCategoryDO> list);
 
-    List<AppCategoryListRespVO> convertList03(List<ProductCategoryDO> list);
+    List<AppCategoryRespVO> convertList03(List<ProductCategoryDO> list);
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
index cb63f7563..93ec925a9 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
@@ -9,9 +9,9 @@ import lombok.*;
 /**
  * 商品分类 DO
  *
- * 商品分类一共两级：
+ * 商品分类一共两类：
  * 1）一级分类：{@link #parentId} 等于 0
- * 2）二级分类：{@link #parentId} 等于父分类
+ * 2）二级 + 三级分类：{@link #parentId} 不等于 0
  *
  * @author 芋道源码
  */
@@ -46,7 +46,7 @@ public class ProductCategoryDO extends BaseDO {
      * 分类图片
      *
      * 一级分类：推荐 200 x 100 分辨率
-     * 二级分类：推荐 100 x 100 分辨率
+     * 二级 + 三级分类：推荐 100 x 100 分辨率
      */
     private String picUrl;
     /**
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
index 65f61b323..95364f75a 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryUpdateReqVO;
-import cn.iocoder.yudao.module.product.convert.category.CategoryConvert;
+import cn.iocoder.yudao.module.product.convert.category.ProductCategoryConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.dal.mysql.category.ProductCategoryMapper;
 import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         validateParentProductCategory(createReqVO.getParentId());
 
         // 插入
-        ProductCategoryDO category = CategoryConvert.INSTANCE.convert(createReqVO);
+        ProductCategoryDO category = ProductCategoryConvert.INSTANCE.convert(createReqVO);
         productCategoryMapper.insert(category);
         // 返回
         return category.getId();
@@ -51,7 +51,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         validateParentProductCategory(updateReqVO.getParentId());
 
         // 更新
-        ProductCategoryDO updateObj = CategoryConvert.INSTANCE.convert(updateReqVO);
+        ProductCategoryDO updateObj = ProductCategoryConvert.INSTANCE.convert(updateReqVO);
         productCategoryMapper.updateById(updateObj);
     }
 
diff --git a/yudao-ui-admin/src/views/mall/product/category/index.vue b/yudao-ui-admin/src/views/mall/product/category/index.vue
index 615c44328..da600c589 100644
--- a/yudao-ui-admin/src/views/mall/product/category/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/category/index.vue
@@ -61,15 +61,15 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="上级分类" prop="parentId">
-          <el-select v-model="form.parentId" placeholder="请选择上级分类" clearable size="small">
-            <el-option :key="0" label="顶级分类" :value="0"/>
-            <el-option v-for="item in list.filter(v => v.parentId === 0)" :key="item.id" :label="item.name" :value="item.id"/>
-          </el-select>
+          <Treeselect v-model="form.parentId" :options="parentCategoryOptions" :normalizer="normalizer"
+                      :show-count="true"
+                      :defaultExpandLevel="1"
+                      placeholder="上级分类"/>
         </el-form-item>
         <el-form-item label="分类名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入分类名称"/>
         </el-form-item>
-        <el-form-item label="分类图片" prop="bannerUrl">
+        <el-form-item label="分类图片" prop="picUrl">
           <ImageUpload v-model="form.picUrl" :limit="1" :is-show-tip="false" />
           <div v-if="form.parentId === 0" style="font-size: 10px">推荐 200x100 图片分辨率</div>
           <div v-else style="font-size: 10px">推荐 100x100 图片分辨率</div>
@@ -164,6 +164,11 @@ export default {
       getProductCategoryList(params).then(response => {
         this.list = this.handleTree(response.data, "id", "parentId");
         this.loading = false;
+        // 属性下拉框
+        this.parentCategoryOptions = [];
+        const menu = {id: 0, name: '顶级分类', children: []};
+        menu.children = this.handleTree(response.data, "id", "parentId");
+        this.parentCategoryOptions.push(menu);
       });
     },
     /** 取消按钮 */
@@ -202,6 +207,17 @@ export default {
         this.refreshTable = true;
       });
     },
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
diff --git a/yudao-ui-app/pages/category/category.vue b/yudao-ui-app/pages/category/category.vue
index 70b993273..79092e91d 100644
--- a/yudao-ui-app/pages/category/category.vue
+++ b/yudao-ui-app/pages/category/category.vue
@@ -20,7 +20,7 @@
       <!-- 右侧分类内容 -->
       <scroll-view scroll-y="true" class="box-right">
         <view class="category-image">
-          <image :showLoading="true" :src="categoryList[currentIndex].bannerUrl" mode='widthFix' @click="click"></image>
+          <image :showLoading="true" :src="categoryList[currentIndex].picUrl" mode='widthFix' @click="click"></image>
         </view>
 
         <view class="sub-category-box" v-for="(item, index) in categoryList[currentIndex].children" :key="item.id">
@@ -33,8 +33,8 @@
             <u-grid col="3">
               <u-grid-item v-for="(subItem, subIndex) in item.children" :key="subItem.id">
                 <view class="sub-category-item" @click="handleCategory(item, subIndex)">
-                  <u-icon name="photo" :size="80" v-if="subItem.bannerUrl === null"></u-icon>
-                  <image :src="item.bannerUrl" v-if="subItem.bannerUrl != null" mode='widthFix' />
+                  <u-icon name="photo" :size="80" v-if="subItem.picUrl === null"></u-icon>
+                  <image :src="item.picUrl" v-if="subItem.picUrl != null" mode='widthFix' />
                   <text class="sub-category-title">{{ subItem.name }}</text>
                 </view>
               </u-grid-item>

From fa9823161e785c38bcf7d4edc910921d41a21699 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 Jul 2022 22:15:03 +0800
Subject: [PATCH 09/56] =?UTF-8?q?mall=EF=BC=9A=E5=AE=8C=E5=96=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=93=81=E7=89=8C=E7=9A=84=E5=89=8D=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/mall.sql                    |  58 ------
 .../product/enums/ErrorCodeConstants.java     |   2 +-
 ...oller.java => ProductBrandController.java} |  42 ++---
 .../admin/brand/vo/BrandExcelVO.java          |  45 -----
 .../admin/brand/vo/BrandExportReqVO.java      |  28 ---
 ...andBaseVO.java => ProductBrandBaseVO.java} |  18 +-
 ...eqVO.java => ProductBrandCreateReqVO.java} |   6 +-
 ...eReqVO.java => ProductBrandPageReqVO.java} |  17 +-
 ...andRespVO.java => ProductBrandRespVO.java} |  12 +-
 ...eqVO.java => ProductBrandUpdateReqVO.java} |   5 +-
 .../product/convert/brand/BrandConvert.java   |  34 ----
 .../convert/brand/ProductBrandConvert.java    |  33 ++++
 .../{BrandDO.java => ProductBrandDO.java}     |  11 +-
 .../product/dal/mysql/brand/BrandMapper.java  |  38 ----
 .../dal/mysql/brand/ProductBrandMapper.java   |  21 +++
 ...dService.java => ProductBrandService.java} |  34 ++--
 ...Impl.java => ProductBrandServiceImpl.java} |  47 +++--
 .../service/brand/BrandServiceImplTest.java   | 173 ------------------
 .../brand/ProductBrandServiceImplTest.java    | 132 +++++++++++++
 .../src/test/resources/sql/create_tables.sql  |   5 +-
 .../src/views/mall/product/brand/index.vue    |  90 ++-------
 .../src/views/mall/product/category/index.vue |   2 +-
 22 files changed, 287 insertions(+), 566 deletions(-)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/{BrandController.java => ProductBrandController.java} (60%)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExcelVO.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExportReqVO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/{BrandBaseVO.java => ProductBrandBaseVO.java} (66%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/{BrandCreateReqVO.java => ProductBrandCreateReqVO.java} (54%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/{BrandPageReqVO.java => ProductBrandPageReqVO.java} (69%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/{BrandRespVO.java => ProductBrandRespVO.java} (60%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/{BrandUpdateReqVO.java => ProductBrandUpdateReqVO.java} (75%)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/BrandConvert.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/ProductBrandConvert.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/{BrandDO.java => ProductBrandDO.java} (83%)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/BrandMapper.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/{BrandService.java => ProductBrandService.java} (52%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/{BrandServiceImpl.java => ProductBrandServiceImpl.java} (51%)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImplTest.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java

diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql
index e8a29fb0d..5dc572350 100644
--- a/sql/optional/mall/mall.sql
+++ b/sql/optional/mall/mall.sql
@@ -24,64 +24,6 @@ SET NAMES utf8mb4;
 -- ----------------------------
 -- Table structure for product_brand
 -- ----------------------------
-DROP TABLE IF EXISTS `product_brand`;
-CREATE TABLE `product_brand`
-(
-    `id`          bigint       NOT NULL AUTO_INCREMENT COMMENT '品牌编号',
-    `category_id` bigint       NOT NULL COMMENT '分类编号',
-    `name`        varchar(255) NOT NULL COMMENT '品牌名称',
-    `banner_url`  varchar(255) NOT NULL COMMENT '品牌图片',
-    `sort`        int                   DEFAULT '0' COMMENT '品牌排序',
-    `description` varchar(1024)         DEFAULT NULL COMMENT '品牌描述',
-    `status`      tinyint      NOT NULL COMMENT '状态',
-    `creator`     varchar(64)           DEFAULT '' COMMENT '创建者',
-    `create_time` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`     varchar(64)           DEFAULT '' COMMENT '更新者',
-    `update_time` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`     bit(1)       NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`   bigint       NOT NULL DEFAULT '0' COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB COMMENT='品牌';
-
--- TODO 父级菜单的 id 处理: 2000 、 2001
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES (2000, '商城', '', 1, 1, 0, '/mall', 'merchant', NULL, 0);
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES (2001, '商品', '', 1, 1, 2000, 'product', 'dict', NULL, 0);
--- 商品分类 菜单 SQL
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('分类管理', '', 2, 0, 2001, 'category', '', 'mall/product/category/index', 0);
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
--- 按钮 SQL
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('分类查询', 'product:category:query', 3, 1, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('分类创建', 'product:category:create', 3, 2, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('分类更新', 'product:category:update', 3, 3, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('分类删除', 'product:category:delete', 3, 4, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('分类导出', 'product:category:export', 3, 5, @parentId, '', '', '', 0);
-
--- 品牌管理 菜单 SQL
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('品牌管理', '', 2, 1, 2001, 'brand', '', 'mall/product/brand/index', 0);
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
--- 按钮 SQL
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('品牌查询', 'product:brand:query', 3, 1, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('品牌创建', 'product:brand:create', 3, 2, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('品牌更新', 'product:brand:update', 3, 3, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('品牌删除', 'product:brand:delete', 3, 4, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('品牌导出', 'product:brand:export', 3, 5, @parentId, '', '', '', 0);
-
 
 -- ----------------------------
 -- Table structure for market_activity
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
index d47bb7543..0c47d9406 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
@@ -17,7 +17,7 @@ public interface ErrorCodeConstants {
     ErrorCode PRODUCT_CATEGORY_DISABLED = new ErrorCode(1008001004, "商品分类({})已禁用，无法使用");
 
     // ========== 品牌相关编号 1008002000 ==========
-    ErrorCode BRAND_NOT_EXISTS = new ErrorCode(1008002000, "品牌不存在");
+    ErrorCode PRODUCT_BRAND_NOT_EXISTS = new ErrorCode(1008002000, "品牌不存在");
 
     // ========== 规格名称 1008003000 ==========
     ErrorCode PROPERTY_NOT_EXISTS = new ErrorCode(1008003000, "规格名称不存在");
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/BrandController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
similarity index 60%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/BrandController.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
index 0702d206c..14ffef881 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/BrandController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
@@ -5,9 +5,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-import cn.iocoder.yudao.module.product.convert.brand.BrandConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.brand.BrandDO;
-import cn.iocoder.yudao.module.product.service.brand.BrandService;
+import cn.iocoder.yudao.module.product.convert.brand.ProductBrandConvert;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import cn.iocoder.yudao.module.product.service.brand.ProductBrandService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -24,26 +24,26 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
-@Api(tags = "管理后台 - 品牌")
+@Api(tags = "管理后台 - 商品品牌")
 @RestController
 @RequestMapping("/product/brand")
 @Validated
-public class BrandController {
+public class ProductBrandController {
 
     @Resource
-    private BrandService brandService;
+    private ProductBrandService brandService;
 
     @PostMapping("/create")
     @ApiOperation("创建品牌")
     @PreAuthorize("@ss.hasPermission('product:brand:create')")
-    public CommonResult<Long> createBrand(@Valid @RequestBody BrandCreateReqVO createReqVO) {
-        return success(brandService.createBrand(createReqVO));
+    public CommonResult<Long> createBrand(@Valid @RequestBody ProductBrandCreateReqVO createReqVO) {
+        return success(brandService.createProductBrand(createReqVO));
     }
 
     @PutMapping("/update")
     @ApiOperation("更新品牌")
     @PreAuthorize("@ss.hasPermission('product:brand:update')")
-    public CommonResult<Boolean> updateBrand(@Valid @RequestBody BrandUpdateReqVO updateReqVO) {
+    public CommonResult<Boolean> updateBrand(@Valid @RequestBody ProductBrandUpdateReqVO updateReqVO) {
         brandService.updateBrand(updateReqVO);
         return success(true);
     }
@@ -61,29 +61,17 @@ public class BrandController {
     @ApiOperation("获得品牌")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:brand:query')")
-    public CommonResult<BrandRespVO> getBrand(@RequestParam("id") Long id) {
-        BrandDO brand = brandService.getBrand(id);
-        return success(BrandConvert.INSTANCE.convert(brand));
+    public CommonResult<ProductBrandRespVO> getBrand(@RequestParam("id") Long id) {
+        ProductBrandDO brand = brandService.getBrand(id);
+        return success(ProductBrandConvert.INSTANCE.convert(brand));
     }
 
     @GetMapping("/page")
     @ApiOperation("获得品牌分页")
     @PreAuthorize("@ss.hasPermission('product:brand:query')")
-    public CommonResult<PageResult<BrandRespVO>> getBrandPage(@Valid BrandPageReqVO pageVO) {
-        PageResult<BrandDO> pageResult = brandService.getBrandPage(pageVO);
-        return success(BrandConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/export-excel")
-    @ApiOperation("导出品牌 Excel")
-    @PreAuthorize("@ss.hasPermission('product:brand:export')")
-    @OperateLog(type = EXPORT)
-    public void exportBrandExcel(@Valid BrandExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<BrandDO> list = brandService.getBrandList(exportReqVO);
-        // 导出 Excel
-        List<BrandExcelVO> datas = BrandConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "品牌.xls", "数据", BrandExcelVO.class, datas);
+    public CommonResult<PageResult<ProductBrandRespVO>> getBrandPage(@Valid ProductBrandPageReqVO pageVO) {
+        PageResult<ProductBrandDO> pageResult = brandService.getBrandPage(pageVO);
+        return success(ProductBrandConvert.INSTANCE.convertPage(pageResult));
     }
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExcelVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExcelVO.java
deleted file mode 100644
index 261b69ea5..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExcelVO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-
-
-/**
- * 品牌 Excel VO
- *
- * @author 芋道源码
- */
-@Data
-public class BrandExcelVO {
-
-    @ExcelProperty("品牌编号")
-    private Long id;
-
-    @ExcelProperty("分类编号")
-    private Long categoryId;
-
-    @ExcelProperty("品牌名称")
-    private String name;
-
-    @ExcelProperty("品牌图片")
-    private String bannerUrl;
-
-    @ExcelProperty("品牌排序")
-    private Integer sort;
-
-    @ExcelProperty("品牌描述")
-    private String description;
-
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-    private Integer status;
-
-    @ExcelProperty("创建时间")
-    private Date createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExportReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExportReqVO.java
deleted file mode 100644
index 1385613a6..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExportReqVO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel(value = "管理后台 - 品牌 Excel 导出 Request VO", description = "参数和 BrandPageReqVO 是一致的")
-@Data
-public class BrandExportReqVO {
-
-    @ApiModelProperty(value = "分类编号", example = "1")
-    private Long categoryId;
-
-    @ApiModelProperty(value = "品牌名称", example = "芋道")
-    private String name;
-
-    @ApiModelProperty(value = "状态", example = "0")
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
similarity index 66%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandBaseVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
index 57c5a390c..3ad5d45ee 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
@@ -1,20 +1,16 @@
 package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 
 /**
-* 品牌 Base VO，提供给添加、修改、详细的子 VO 使用
+* 商品品牌 Base VO，提供给添加、修改、详细的子 VO 使用
 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
 */
 @Data
-public class BrandBaseVO {
-
-    @ApiModelProperty(value = "分类编号", required = true, example = "1")
-    @NotNull(message = "分类编号不能为空")
-    private Long categoryId;
+public class ProductBrandBaseVO {
 
     @ApiModelProperty(value = "品牌名称", required = true, example = "芋道")
     @NotNull(message = "品牌名称不能为空")
@@ -22,7 +18,7 @@ public class BrandBaseVO {
 
     @ApiModelProperty(value = "品牌图片", required = true)
     @NotNull(message = "品牌图片不能为空")
-    private String bannerUrl;
+    private String picUrl;
 
     @ApiModelProperty(value = "品牌排序", example = "1")
     private Integer sort;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandCreateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandCreateReqVO.java
similarity index 54%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandCreateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandCreateReqVO.java
index 3a6f844fb..74024929f 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandCreateReqVO.java
@@ -1,14 +1,12 @@
 package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.annotations.*;
-import javax.validation.constraints.*;
 
-@ApiModel("管理后台 - 品牌创建 Request VO")
+@ApiModel("管理后台 - 商品品牌创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class BrandCreateReqVO extends BrandBaseVO {
+public class ProductBrandCreateReqVO extends ProductBrandBaseVO {
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandPageReqVO.java
similarity index 69%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandPageReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandPageReqVO.java
index c706e51ca..8dae40244 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandPageReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandPageReqVO.java
@@ -1,21 +1,22 @@
 package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 品牌分页 Request VO")
+@ApiModel("管理后台 - 商品品牌分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class BrandPageReqVO extends PageParam {
-
-    @ApiModelProperty(value = "分类编号", example = "1")
-    private Long categoryId;
+public class ProductBrandPageReqVO extends PageParam {
 
     @ApiModelProperty(value = "品牌名称", example = "芋道")
     private String name;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandRespVO.java
similarity index 60%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandRespVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandRespVO.java
index 5e010b4d0..f577a6c26 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandRespVO.java
@@ -1,14 +1,18 @@
 package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.Date;
 
 @ApiModel("管理后台 - 品牌 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class BrandRespVO extends BrandBaseVO {
+public class ProductBrandRespVO extends ProductBrandBaseVO {
 
     @ApiModelProperty(value = "品牌编号", required = true, example = "1")
     private Long id;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandUpdateReqVO.java
similarity index 75%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandUpdateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandUpdateReqVO.java
index 287157f0e..54d610207 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandUpdateReqVO.java
@@ -1,15 +1,14 @@
 package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.annotations.*;
 import javax.validation.constraints.*;
 
-@ApiModel("管理后台 - 品牌更新 Request VO")
+@ApiModel("管理后台 - 商品品牌更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class BrandUpdateReqVO extends BrandBaseVO {
+public class ProductBrandUpdateReqVO extends ProductBrandBaseVO {
 
     @ApiModelProperty(value = "品牌编号", required = true, example = "1")
     @NotNull(message = "品牌编号不能为空")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/BrandConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/BrandConvert.java
deleted file mode 100644
index 316515603..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/BrandConvert.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.product.convert.brand;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.brand.BrandDO;
-
-/**
- * 品牌 Convert
- *
- * @author 芋道源码
- */
-@Mapper
-public interface BrandConvert {
-
-    BrandConvert INSTANCE = Mappers.getMapper(BrandConvert.class);
-
-    BrandDO convert(BrandCreateReqVO bean);
-
-    BrandDO convert(BrandUpdateReqVO bean);
-
-    BrandRespVO convert(BrandDO bean);
-
-    List<BrandRespVO> convertList(List<BrandDO> list);
-
-    PageResult<BrandRespVO> convertPage(PageResult<BrandDO> page);
-
-    List<BrandExcelVO> convertList02(List<BrandDO> list);
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/ProductBrandConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/ProductBrandConvert.java
new file mode 100644
index 000000000..a318e9128
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/brand/ProductBrandConvert.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.product.convert.brand;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 品牌 Convert
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface ProductBrandConvert {
+
+    ProductBrandConvert INSTANCE = Mappers.getMapper(ProductBrandConvert.class);
+
+    ProductBrandDO convert(ProductBrandCreateReqVO bean);
+
+    ProductBrandDO convert(ProductBrandUpdateReqVO bean);
+
+    ProductBrandRespVO convert(ProductBrandDO bean);
+
+    List<ProductBrandRespVO> convertList(List<ProductBrandDO> list);
+
+    PageResult<ProductBrandRespVO> convertPage(PageResult<ProductBrandDO> page);
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/BrandDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/ProductBrandDO.java
similarity index 83%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/BrandDO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/ProductBrandDO.java
index 2cbcee877..e2178d5c4 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/BrandDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/ProductBrandDO.java
@@ -6,9 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-// TODO @JeromeSoar：Product 前缀
 /**
- * 品牌 DO
+ * 商品品牌 DO
  *
  * @author 芋道源码
  */
@@ -19,17 +18,13 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class BrandDO extends BaseDO {
+public class ProductBrandDO extends BaseDO {
 
     /**
      * 品牌编号
      */
     @TableId
     private Long id;
-    /**
-     * 分类编号
-     */
-    private Long categoryId;
     /**
      * 品牌名称
      */
@@ -37,7 +32,7 @@ public class BrandDO extends BaseDO {
     /**
      * 品牌图片
      */
-    private String bannerUrl;
+    private String picUrl;
     /**
      * 品牌排序
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/BrandMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/BrandMapper.java
deleted file mode 100644
index cf7c5f69a..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/BrandMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.product.dal.mysql.brand;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.product.dal.dataobject.brand.BrandDO;
-import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-
-/**
- * 品牌 Mapper
- *
- * @author 芋道源码
- */
-@Mapper
-public interface BrandMapper extends BaseMapperX<BrandDO> {
-
-    default PageResult<BrandDO> selectPage(BrandPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<BrandDO>()
-                .eqIfPresent(BrandDO::getCategoryId, reqVO.getCategoryId())
-                .likeIfPresent(BrandDO::getName, reqVO.getName())
-                .eqIfPresent(BrandDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(BrandDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(BrandDO::getId));
-    }
-
-    default List<BrandDO> selectList(BrandExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<BrandDO>()
-                .eqIfPresent(BrandDO::getCategoryId, reqVO.getCategoryId())
-                .likeIfPresent(BrandDO::getName, reqVO.getName())
-                .eqIfPresent(BrandDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(BrandDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(BrandDO::getId));
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
new file mode 100644
index 000000000..e33884d1c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.product.dal.mysql.brand;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ProductBrandMapper extends BaseMapperX<ProductBrandDO> {
+
+    default PageResult<ProductBrandDO> selectPage(ProductBrandPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ProductBrandDO>()
+                .likeIfPresent(ProductBrandDO::getName, reqVO.getName())
+                .eqIfPresent(ProductBrandDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(ProductBrandDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ProductBrandDO::getId));
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/BrandService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
similarity index 52%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/BrandService.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
index 2cb356fed..6d54cd26f 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/BrandService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
@@ -1,17 +1,21 @@
 package cn.iocoder.yudao.module.product.service.brand;
 
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.brand.BrandDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
- * 品牌 Service 接口
+ * 商品品牌 Service 接口
  *
  * @author 芋道源码
  */
-public interface BrandService {
+public interface ProductBrandService {
 
     /**
      * 创建品牌
@@ -19,14 +23,14 @@ public interface BrandService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createBrand(@Valid BrandCreateReqVO createReqVO);
+    Long createProductBrand(@Valid ProductBrandCreateReqVO createReqVO);
 
     /**
      * 更新品牌
      *
      * @param updateReqVO 更新信息
      */
-    void updateBrand(@Valid BrandUpdateReqVO updateReqVO);
+    void updateBrand(@Valid ProductBrandUpdateReqVO updateReqVO);
 
     /**
      * 删除品牌
@@ -41,7 +45,7 @@ public interface BrandService {
      * @param id 编号
      * @return 品牌
      */
-    BrandDO getBrand(Long id);
+    ProductBrandDO getBrand(Long id);
 
     /**
      * 获得品牌列表
@@ -49,7 +53,7 @@ public interface BrandService {
      * @param ids 编号
      * @return 品牌列表
      */
-    List<BrandDO> getBrandList(Collection<Long> ids);
+    List<ProductBrandDO> getBrandList(Collection<Long> ids);
 
     /**
      * 获得品牌分页
@@ -57,14 +61,6 @@ public interface BrandService {
      * @param pageReqVO 分页查询
      * @return 品牌分页
      */
-    PageResult<BrandDO> getBrandPage(BrandPageReqVO pageReqVO);
-
-    /**
-     * 获得品牌列表, 用于 Excel 导出
-     *
-     * @param exportReqVO 查询条件
-     * @return 品牌列表
-     */
-    List<BrandDO> getBrandList(BrandExportReqVO exportReqVO);
+    PageResult<ProductBrandDO> getBrandPage(ProductBrandPageReqVO pageReqVO);
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
similarity index 51%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImpl.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
index dedda3ae2..8adfa71c3 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
@@ -1,19 +1,21 @@
 package cn.iocoder.yudao.module.product.service.brand;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
+import cn.iocoder.yudao.module.product.convert.brand.ProductBrandConvert;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import cn.iocoder.yudao.module.product.dal.mysql.brand.ProductBrandMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.brand.BrandDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import cn.iocoder.yudao.module.product.convert.brand.BrandConvert;
-import cn.iocoder.yudao.module.product.dal.mysql.brand.BrandMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_BRAND_NOT_EXISTS;
 
 /**
  * 品牌 Service 实现类
@@ -22,26 +24,26 @@ import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
-public class BrandServiceImpl implements BrandService {
+public class ProductBrandServiceImpl implements ProductBrandService {
 
     @Resource
-    private BrandMapper brandMapper;
+    private ProductBrandMapper brandMapper;
 
     @Override
-    public Long createBrand(BrandCreateReqVO createReqVO) {
+    public Long createProductBrand(ProductBrandCreateReqVO createReqVO) {
         // 插入
-        BrandDO brand = BrandConvert.INSTANCE.convert(createReqVO);
+        ProductBrandDO brand = ProductBrandConvert.INSTANCE.convert(createReqVO);
         brandMapper.insert(brand);
         // 返回
         return brand.getId();
     }
 
     @Override
-    public void updateBrand(BrandUpdateReqVO updateReqVO) {
+    public void updateBrand(ProductBrandUpdateReqVO updateReqVO) {
         // 校验存在
-        this.validateBrandExists(updateReqVO.getId());
+        validateBrandExists(updateReqVO.getId());
         // 更新
-        BrandDO updateObj = BrandConvert.INSTANCE.convert(updateReqVO);
+        ProductBrandDO updateObj = ProductBrandConvert.INSTANCE.convert(updateReqVO);
         brandMapper.updateById(updateObj);
     }
 
@@ -55,28 +57,23 @@ public class BrandServiceImpl implements BrandService {
 
     private void validateBrandExists(Long id) {
         if (brandMapper.selectById(id) == null) {
-            throw exception(BRAND_NOT_EXISTS);
+            throw exception(PRODUCT_BRAND_NOT_EXISTS);
         }
     }
 
     @Override
-    public BrandDO getBrand(Long id) {
+    public ProductBrandDO getBrand(Long id) {
         return brandMapper.selectById(id);
     }
 
     @Override
-    public List<BrandDO> getBrandList(Collection<Long> ids) {
+    public List<ProductBrandDO> getBrandList(Collection<Long> ids) {
         return brandMapper.selectBatchIds(ids);
     }
 
     @Override
-    public PageResult<BrandDO> getBrandPage(BrandPageReqVO pageReqVO) {
+    public PageResult<ProductBrandDO> getBrandPage(ProductBrandPageReqVO pageReqVO) {
         return brandMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public List<BrandDO> getBrandList(BrandExportReqVO exportReqVO) {
-        return brandMapper.selectList(exportReqVO);
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImplTest.java
deleted file mode 100644
index fc819e6b6..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImplTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package cn.iocoder.yudao.module.product.service.brand;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import javax.annotation.Resource;
-
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.brand.BrandDO;
-import cn.iocoder.yudao.module.product.dal.mysql.brand.BrandMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import javax.annotation.Resource;
-import org.springframework.context.annotation.Import;
-import java.util.*;
-
-import static cn.hutool.core.util.RandomUtil.*;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-/**
-* {@link BrandServiceImpl} 的单元测试类
-*
-* @author 芋道源码
-*/
-@Import(BrandServiceImpl.class)
-public class BrandServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private BrandServiceImpl brandService;
-
-    @Resource
-    private BrandMapper brandMapper;
-
-    @Test
-    public void testCreateBrand_success() {
-        // 准备参数
-        BrandCreateReqVO reqVO = randomPojo(BrandCreateReqVO.class);
-
-        // 调用
-        Long brandId = brandService.createBrand(reqVO);
-        // 断言
-        assertNotNull(brandId);
-        // 校验记录的属性是否正确
-        BrandDO brand = brandMapper.selectById(brandId);
-        assertPojoEquals(reqVO, brand);
-    }
-
-    @Test
-    public void testUpdateBrand_success() {
-        // mock 数据
-        BrandDO dbBrand = randomPojo(BrandDO.class);
-        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        BrandUpdateReqVO reqVO = randomPojo(BrandUpdateReqVO.class, o -> {
-            o.setId(dbBrand.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        brandService.updateBrand(reqVO);
-        // 校验是否更新正确
-        BrandDO brand = brandMapper.selectById(reqVO.getId()); // 获取最新的
-        assertPojoEquals(reqVO, brand);
-    }
-
-    @Test
-    public void testUpdateBrand_notExists() {
-        // 准备参数
-        BrandUpdateReqVO reqVO = randomPojo(BrandUpdateReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> brandService.updateBrand(reqVO), BRAND_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteBrand_success() {
-        // mock 数据
-        BrandDO dbBrand = randomPojo(BrandDO.class);
-        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbBrand.getId();
-
-        // 调用
-        brandService.deleteBrand(id);
-       // 校验数据不存在了
-       assertNull(brandMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteBrand_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> brandService.deleteBrand(id), BRAND_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetBrandPage() {
-       // mock 数据
-       BrandDO dbBrand = randomPojo(BrandDO.class, o -> { // 等会查询到
-           o.setCategoryId(null);
-           o.setName(null);
-           o.setStatus(null);
-           o.setCreateTime(null);
-       });
-       brandMapper.insert(dbBrand);
-       // 测试 categoryId 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCategoryId(null)));
-       // 测试 name 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setName(null)));
-       // 测试 status 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setStatus(null)));
-       // 测试 createTime 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(null)));
-       // 准备参数
-       BrandPageReqVO reqVO = new BrandPageReqVO();
-       reqVO.setCategoryId(null);
-       reqVO.setName(null);
-       reqVO.setStatus(null);
-       reqVO.setCreateTime((new Date[]{}));
-
-       // 调用
-       PageResult<BrandDO> pageResult = brandService.getBrandPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbBrand, pageResult.getList().get(0));
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetBrandList() {
-       // mock 数据
-       BrandDO dbBrand = randomPojo(BrandDO.class, o -> { // 等会查询到
-           o.setCategoryId(null);
-           o.setName(null);
-           o.setStatus(null);
-           o.setCreateTime(null);
-       });
-       brandMapper.insert(dbBrand);
-       // 测试 categoryId 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCategoryId(null)));
-       // 测试 name 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setName(null)));
-       // 测试 status 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setStatus(null)));
-       // 测试 createTime 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(null)));
-       // 准备参数
-       BrandExportReqVO reqVO = new BrandExportReqVO();
-       reqVO.setCategoryId(null);
-       reqVO.setName(null);
-       reqVO.setStatus(null);
-       reqVO.setCreateTime((new Date[]{}));
-
-       // 调用
-       List<BrandDO> list = brandService.getBrandList(reqVO);
-       // 断言
-       assertEquals(1, list.size());
-       assertPojoEquals(dbBrand, list.get(0));
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
new file mode 100644
index 000000000..68ca66922
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
@@ -0,0 +1,132 @@
+package cn.iocoder.yudao.module.product.service.brand;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import cn.iocoder.yudao.module.product.dal.mysql.brand.ProductBrandMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_BRAND_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+* {@link ProductBrandServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
+@Import(ProductBrandServiceImpl.class)
+public class ProductBrandServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private ProductBrandServiceImpl brandService;
+
+    @Resource
+    private ProductBrandMapper brandMapper;
+
+    @Test
+    public void testCreateBrand_success() {
+        // 准备参数
+        ProductBrandCreateReqVO reqVO = randomPojo(ProductBrandCreateReqVO.class);
+
+        // 调用
+        Long brandId = brandService.createProductBrand(reqVO);
+        // 断言
+        assertNotNull(brandId);
+        // 校验记录的属性是否正确
+        ProductBrandDO brand = brandMapper.selectById(brandId);
+        assertPojoEquals(reqVO, brand);
+    }
+
+    @Test
+    public void testUpdateBrand_success() {
+        // mock 数据
+        ProductBrandDO dbBrand = randomPojo(ProductBrandDO.class);
+        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        ProductBrandUpdateReqVO reqVO = randomPojo(ProductBrandUpdateReqVO.class, o -> {
+            o.setId(dbBrand.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        brandService.updateBrand(reqVO);
+        // 校验是否更新正确
+        ProductBrandDO brand = brandMapper.selectById(reqVO.getId()); // 获取最新的
+        assertPojoEquals(reqVO, brand);
+    }
+
+    @Test
+    public void testUpdateBrand_notExists() {
+        // 准备参数
+        ProductBrandUpdateReqVO reqVO = randomPojo(ProductBrandUpdateReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> brandService.updateBrand(reqVO), PRODUCT_BRAND_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteBrand_success() {
+        // mock 数据
+        ProductBrandDO dbBrand = randomPojo(ProductBrandDO.class);
+        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbBrand.getId();
+
+        // 调用
+        brandService.deleteBrand(id);
+       // 校验数据不存在了
+       assertNull(brandMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteBrand_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> brandService.deleteBrand(id), PRODUCT_BRAND_NOT_EXISTS);
+    }
+
+    @Test
+    public void testGetBrandPage() {
+       // mock 数据
+       ProductBrandDO dbBrand = randomPojo(ProductBrandDO.class, o -> { // 等会查询到
+           o.setName("芋道源码");
+           o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+           o.setCreateTime(buildTime(2022, 2, 1));
+       });
+       brandMapper.insert(dbBrand);
+       // 测试 name 不匹配
+       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setName("源码")));
+       // 测试 status 不匹配
+       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+       // 测试 createTime 不匹配
+       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(buildTime(2022, 3, 1))));
+       // 准备参数
+       ProductBrandPageReqVO reqVO = new ProductBrandPageReqVO();
+       reqVO.setName("芋道");
+       reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+       reqVO.setCreateTime((new Date[]{buildTime(2022, 1, 1), buildTime(2022, 2, 25)}));
+
+       // 调用
+       PageResult<ProductBrandDO> pageResult = brandService.getBrandPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbBrand, pageResult.getList().get(0));
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql b/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
index 7b0e3e414..37fc0ff21 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
@@ -16,9 +16,8 @@ CREATE TABLE IF NOT EXISTS "product_category" (
 
 CREATE TABLE IF NOT EXISTS "product_brand" (
     "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "category_id" bigint(20) NOT NULL,
     "name" varchar(255) NOT NULL,
-    "banner_url" varchar(255) NOT NULL,
+    "pic_url" varchar(255) NOT NULL,
     "sort" int(11),
     "description" varchar(1024),
     "status" tinyint(4) NOT NULL,
@@ -28,4 +27,4 @@ CREATE TABLE IF NOT EXISTS "product_brand" (
     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     "deleted" bit NOT NULL DEFAULT FALSE,
     PRIMARY KEY ("id")
-) COMMENT '品牌';
+) COMMENT '商品品牌';
diff --git a/yudao-ui-admin/src/views/mall/product/brand/index.vue b/yudao-ui-admin/src/views/mall/product/brand/index.vue
index 0dd249561..106080406 100644
--- a/yudao-ui-admin/src/views/mall/product/brand/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/brand/index.vue
@@ -26,25 +26,18 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['product:brand:create']">新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   :loading="exportLoading"
-                   v-hasPermi="['product:brand:export']">导出
-        </el-button>
+                   v-hasPermi="['product:brand:create']">新增</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="商品分类" align="center" prop="categoryId"/>
+      <el-table-column label="品牌编号" align="center" prop="id"/>
       <el-table-column label="品牌名称" align="center" prop="name"/>
-      <el-table-column label="品牌图片" align="center" prop="bannerUrl">
+      <el-table-column label="品牌图片" align="center" prop="picUrl">
         <template slot-scope="scope">
-          <img v-if="scope.row.bannerUrl" :src="scope.row.bannerUrl" alt="分类图片" class="img-height"/>
+          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="分类图片" style="height: 100px;" />
         </template>
       </el-table-column>
       <el-table-column label="品牌排序" align="center" prop="sort"/>
@@ -77,15 +70,11 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="商品分类" prop="categoryId">
-          <Treeselect v-model="form.categoryId" :options="categoryOptions" :normalizer="normalizer" :show-count="true"
-                      placeholder="请选择商品分类"/>
-        </el-form-item>
         <el-form-item label="品牌名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入品牌名称"/>
         </el-form-item>
-        <el-form-item label="品牌图片" prop="bannerUrl">
-          <imageUpload v-model="form.bannerUrl" :limit="1"/>
+        <el-form-item label="品牌图片" prop="picUrl">
+          <imageUpload v-model="form.picUrl" :limit="1"/>
         </el-form-item>
         <el-form-item label="品牌排序" prop="sort">
           <el-input v-model="form.sort" placeholder="请输入品牌排序"/>
@@ -113,20 +102,18 @@
 import {
   createBrand,
   deleteBrand,
-  exportBrandExcel,
   getBrand,
   getBrandPage,
   updateBrand
 } from "@/api/mall/product/brand";
-import {getProductCategoryList} from "@/api/mall/product/category";
 import ImageUpload from '@/components/ImageUpload';
-import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
-  name: "Brand",
+  name: "ProductBrand",
   components: {
-    ImageUpload, Treeselect,
+    ImageUpload
   },
   data() {
     return {
@@ -153,21 +140,18 @@ export default {
         status: null,
         createTime: []
       },
-      // 商品分类树选项
-      categoryOptions: [],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        categoryId: [{required: true, message: "分类编号不能为空", trigger: "blur"}],
         name: [{required: true, message: "品牌名称不能为空", trigger: "blur"}],
-        bannerUrl: [{required: true, message: "品牌图片不能为空", trigger: "blur"}],
+        picUrl: [{required: true, message: "品牌图片不能为空", trigger: "blur"}],
+        sort: [{required: true, message: "品牌排序不能为空", trigger: "blur"}],
         status: [{required: true, message: "状态不能为空", trigger: "change"}],
       }
     };
   },
   created() {
-    this.getTreeselect();
     this.getList();
   },
   methods: {
@@ -181,26 +165,6 @@ export default {
         this.loading = false;
       });
     },
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.children
-      };
-    },
-    /** 查询分类下拉树结构 */
-    getTreeselect() {
-      getProductCategoryList().then(response => {
-        this.categoryOptions = [];
-        const menu = {id: 0, name: '商品分类', children: []};
-        menu.children = this.handleTree(response.data, "id", "pid");
-        this.categoryOptions.push(menu);
-      });
-    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -210,12 +174,11 @@ export default {
     reset() {
       this.form = {
         id: undefined,
-        categoryId: undefined,
         name: undefined,
-        bannerUrl: undefined,
-        sort: undefined,
+        picUrl: undefined,
+        sort: 0,
         description: undefined,
-        status: undefined,
+        status: CommonStatusEnum.ENABLE,
       };
       this.resetForm("form");
     },
@@ -232,14 +195,12 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getTreeselect();
       this.open = true;
       this.title = "添加品牌";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.getTreeselect();
       const id = row.id;
       getBrand(id).then(response => {
         this.form = response.data;
@@ -280,30 +241,7 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      // 执行导出
-      this.$modal.confirm('是否确认导出所有品牌数据项?').then(() => {
-        this.exportLoading = true;
-        return exportBrandExcel(params);
-      }).then(response => {
-        this.$download.excel(response, "品牌.xls");
-        this.exportLoading = false;
-      }).catch(() => {
-      });
     }
   }
 };
 </script>
-
-<style scoped lang="scss">
-//
-.img-height {
-  height: 150px;
-}
-</style>
diff --git a/yudao-ui-admin/src/views/mall/product/category/index.vue b/yudao-ui-admin/src/views/mall/product/category/index.vue
index da600c589..fccadb81c 100644
--- a/yudao-ui-admin/src/views/mall/product/category/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/category/index.vue
@@ -113,7 +113,7 @@ import ImageUpload from '@/components/ImageUpload';
 import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
-  name: "Category",
+  name: "ProductCategory",
   components: {
     Editor, Treeselect, ImageUpload
   },

From 2340f09c68cfd38ef7eedfa811169f289a12c05f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 31 Jul 2022 02:19:18 +0800
Subject: [PATCH 10/56] =?UTF-8?q?mall=EF=BC=9A=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=20SPU=E3=80=81SKU=20=E7=9A=84=E8=A1=A8=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/mall.sql                    | 66 -------------------
 .../admin/sku/ProductSkuController.java       |  2 +-
 .../convert/sku/ProductSkuConvert.java        |  3 +-
 .../convert/spu/ProductSpuConvert.java        | 30 ++-------
 .../dal/dataobject/group/ProductGroupDO.java  | 32 +++++++++
 .../dataobject/{sku => spu}/ProductSkuDO.java |  2 +-
 .../dal/dataobject/spu/ProductSpuDO.java      | 59 ++++++++++++-----
 .../dal/mysql/sku/ProductSkuMapper.java       |  2 +-
 .../service/sku/ProductSkuService.java        |  2 +-
 .../service/sku/ProductSkuServiceImpl.java    |  2 +-
 .../service/spu/ProductSpuServiceImpl.java    |  2 +-
 .../service/sku/SkuServiceImplTest.java       |  7 +-
 12 files changed, 89 insertions(+), 120 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/{sku => spu}/ProductSkuDO.java (95%)

diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql
index 5dc572350..41c495a53 100644
--- a/sql/optional/mall/mall.sql
+++ b/sql/optional/mall/mall.sql
@@ -71,24 +71,6 @@ INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, com
 VALUES ('规格导出', 'product:property:export', 3, 5, @parentId, '', '', '', 0);
 
 
--- 商品菜单 SQL
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('商品管理', '', 2, 2, 2001, 'spu', '', 'mall/product/spu/index', 0);
-
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
-
--- 按钮 SQL
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('商品查询', 'product:spu:query', 3, 1, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('商品创建', 'product:spu:create', 3, 2, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('商品更新', 'product:spu:update', 3, 3, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('商品删除', 'product:spu:delete', 3, 4, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('商品导出', 'product:spu:export', 3, 5, @parentId, '', '', '', 0);
 
 
 -- 规格名称表
@@ -127,54 +109,6 @@ create table product_property_value
 ) comment '规格值' character set utf8mb4
                 collate utf8mb4_general_ci;
 
--- spu
-drop table if exists product_spu;
-create table product_spu
-(
-    id          bigint        NOT NULL AUTO_INCREMENT COMMENT '主键',
-    name        varchar(128) comment '商品名称',
-    sell_point  varchar(128)  not null comment '卖点',
-    description text          not null comment '描述',
-    category_id bigint        not null comment '分类id',
-    pic_urls    varchar(1024) not null default '' comment '商品主图地址\n     *\n     * 数组，以逗号分隔\n 最多上传15张',
-    sort        int           not null default 0 comment '排序字段',
-    like_count  int comment '点赞初始人数',
-    price       int comment '价格 单位使用：分',
-    quantity    int comment '库存数量',
-    status      bit(1) comment '上下架状态： 0 上架（开启） 1 下架（禁用）',
-    create_time datetime               default current_timestamp comment '创建时间',
-    update_time datetime               default current_timestamp on update current_timestamp comment '更新时间',
-    creator     varchar(64) comment '创建人',
-    updater     varchar(64) comment '更新人',
-    tenant_id   bigint        NOT NULL DEFAULT '0' COMMENT '租户编号',
-    deleted   bit(1)        NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    primary key (id)
-) comment '商品spu' character set utf8mb4
-                  collate utf8mb4_general_ci;
-
-
--- sku
-drop table if exists product_sku;
-create table product_sku
-(
-    id             bigint       NOT NULL AUTO_INCREMENT COMMENT '主键',
-    spu_id         bigint       not null comment 'spu编号',
-    properties     varchar(64)  not null comment '规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]',
-    price          int          not null DEFAULT -1 comment '销售价格，单位：分',
-    original_price int          not null DEFAULT -1 comment '原价， 单位： 分',
-    cost_price     int          not null DEFAULT -1 comment '成本价，单位： 分',
-    bar_code       varchar(64)  not null comment '条形码',
-    pic_url        VARCHAR(128) not null comment '图片地址',
-    status         tinyint comment '状态： 0-正常 1-禁用',
-    create_time    datetime              default current_timestamp comment '创建时间',
-    update_time    datetime              default current_timestamp on update current_timestamp comment '更新时间',
-    creator        varchar(64) comment '创建人',
-    updater        varchar(64) comment '更新人',
-    tenant_id      bigint       NOT NULL DEFAULT '0' COMMENT '租户编号',
-    deleted      bit(1)       NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    primary key (id)
-) comment '商品sku' character set utf8mb4
-                  collate utf8mb4_general_ci;
 
 
 ---Market-Banner管理SQL
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
index 132d68d94..e34fba089 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
index 232ce3178..a2904384f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
@@ -10,8 +10,7 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
-import org.springframework.util.StringUtils;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
 
 /**
  * 商品sku Convert
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
index 513e5e50b..30bc4a0fe 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
@@ -1,18 +1,14 @@
 package cn.iocoder.yudao.module.product.convert.spu;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Named;
-import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
-import org.springframework.util.StringUtils;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
 
 /**
  * 商品spu Convert
@@ -24,18 +20,12 @@ public interface ProductSpuConvert {
 
     ProductSpuConvert INSTANCE = Mappers.getMapper(ProductSpuConvert.class);
 
-    @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "translatePicUrlsFromStringList")
     ProductSpuDO convert(ProductSpuCreateReqVO bean);
 
-    @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "translatePicUrlsFromStringList")
     ProductSpuDO convert(SpuUpdateReqVO bean);
 
-    @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "tokenizeToStringArray")
     SpuRespVO convert(ProductSpuDO bean);
 
-    @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "tokenizeToStringArray")
-    SpuExcelVO convertToExcelVO(ProductSpuDO bean);
-
     List<SpuRespVO> convertList(List<ProductSpuDO> list);
 
     PageResult<SpuRespVO> convertPage(PageResult<ProductSpuDO> page);
@@ -44,16 +34,6 @@ public interface ProductSpuConvert {
 
     SpuPageReqVO convert(AppSpuPageReqVO bean);
 
-    @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "tokenizeToStringArray")
     AppSpuPageRespVO convertAppResp(ProductSpuDO list);
 
-    @Named("tokenizeToStringArray")
-    default List<String> translatePicUrlsArrayFromString(String picUrls) {
-        return Arrays.asList(StringUtils.tokenizeToStringArray(picUrls, ","));
-    }
-
-    @Named("translatePicUrlsFromStringList")
-    default String translatePicUrlsFromList(List<String> picUrls) {
-        return StringUtils.collectionToCommaDelimitedString(picUrls);
-    }
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
new file mode 100644
index 000000000..cf5adcf36
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.group;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 商品分组 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("product_group")
+@KeySequence("product_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductGroupDO extends BaseDO {
+
+    /**
+     * 商品分组编号，自增
+     */
+    @TableId
+    private Long id;
+
+    // TODO 芋艿：字段补全
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSkuDO.java
similarity index 95%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSkuDO.java
index 1ffaaeef2..cfa8a52bb 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSkuDO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.product.dal.dataobject.sku;
+package cn.iocoder.yudao.module.product.dal.dataobject.spu;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index 2da638077..e7c27514f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -1,13 +1,21 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.spu;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.group.ProductGroupDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
+import java.util.List;
+
 /**
- * 商品spu DO
+ * 商品 SPU DO
  *
  * @author 芋道源码
  */
@@ -22,7 +30,7 @@ import lombok.*;
 public class ProductSpuDO extends BaseDO {
 
     /**
-     * 主键
+     * 商品 SPU 编号，自增
      */
     @TableId
     private Long id;
@@ -31,41 +39,62 @@ public class ProductSpuDO extends BaseDO {
      */
     private String name;
     /**
-     * 卖点
+     * 商品卖点
      */
     private String sellPoint;
     /**
-     * 描述
+     * 商品详情
      */
     private String description;
     /**
-     * 分类id
+     * 商品分类编号
+     *
+     * 关联 {@link ProductCategoryDO#getId()}
      */
     private Long categoryId;
     /**
-     * 商品主图地址,* 数组，以逗号分隔,最多上传15张
+     * 商品品牌编号
+     *
+     * 关联 {@link ProductBrandDO#getId()}
      */
-    // TODO franky：List<String>。可以参考别的模块，怎么处理这种类型的哈
-    private String picUrls;
+    private Long brandId;
+    /**
+     * 商品分组编号数组
+     *
+     * 关联 {@link ProductGroupDO#getId()}
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Long> groupIds;
+    /**
+     * 商品图片地址数组
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> picUrls;
     /**
      * 排序字段
      */
     private Integer sort;
     /**
-     * 点赞初始人数
+     * 商品状态
+     *
+     * 枚举 {@link CommonStatusEnum}
      */
-    private Integer likeCount;
+    private Integer status;
     /**
-     * 价格 单位使用：分
+     * 价格，单位使用：分
+     *
+     * 基于其对应的 {@link ProductSkuDO#getPrice()} 最小值
      */
     private Integer price;
     /**
      * 库存数量
+     *
+     * 基于其对应的 {@link ProductSkuDO#getPrice()} 求和
      */
     private Integer quantity;
-    /**
-     * 上下架状态： 0 上架（开启） 1 下架（禁用）
-     */
-    private Boolean status;
+
+
+    // TODO 芋艿：配送方式：商家配送、商家自提
+    // TODO 芋艿：运费设置；如果选择了 “商家配送” 配送方式，则选择「运费设置」编号
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index 2f2ced33c..c3aa3c883 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExportReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index 0396506ef..e5e436804 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateR
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExportReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
 
 import javax.validation.Valid;
 import java.util.Collection;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 91a60929b..2bec682db 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPrope
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
 import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index ea4afb2e7..bd18abfd2 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
 import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
index 42eb96fd8..2f9631cbe 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
@@ -2,29 +2,24 @@ package cn.iocoder.yudao.module.product.service.sku;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
 
 import javax.annotation.Resource;
 
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
-import javax.annotation.Resource;
 import org.springframework.context.annotation.Import;
 import java.util.*;
 
-import static cn.hutool.core.util.RandomUtil.*;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
 
 /**
 * {@link ProductSkuServiceImpl} 的单元测试类

From 9577f9b17d68bc52a382a53783df5715988db113 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 31 Jul 2022 13:13:26 +0800
Subject: [PATCH 11/56] =?UTF-8?q?mall=EF=BC=9A=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=20Spu=E3=80=81Sku=E3=80=81Property=E3=80=81Group?=
 =?UTF-8?q?=E3=80=81Shop=20=E7=9A=84=E8=A1=A8=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enums/delivery/DeliveryModeEnum.java      |  37 ++++++
 .../enums/group/ProductGroupStyleEnum.java    |  38 ++++++
 .../admin/sku/ProductSkuController.java       |   2 +-
 .../convert/sku/ProductSkuConvert.java        |   2 +-
 .../category/ProductCategoryDO.java           |   7 ++
 .../delivery/DeliveryTemplateDO.java          |  30 +++++
 .../dataobject/group/ProductGroupBindDO.java  |  50 ++++++++
 .../dal/dataobject/group/ProductGroupDO.java  |  42 ++++++-
 .../property/ProductPropertyDO.java           |  13 +-
 .../property/ProductPropertyValueDO.java      |   9 +-
 .../product/dal/dataobject/shop/ShopDO.java   |  26 ++++
 .../dal/dataobject/sku/ProductSkuDO.java      | 112 ++++++++++++++++++
 .../dal/dataobject/spu/ProductSkuDO.java      |  64 ----------
 .../dal/dataobject/spu/ProductSpuDO.java      |  50 ++++++--
 .../dal/mysql/sku/ProductSkuMapper.java       |   2 +-
 .../service/sku/ProductSkuService.java        |   2 +-
 .../service/sku/ProductSkuServiceImpl.java    |   2 +-
 .../service/spu/ProductSpuServiceImpl.java    |   2 +-
 .../service/sku/SkuServiceImplTest.java       |   2 +-
 19 files changed, 401 insertions(+), 91 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryModeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/group/ProductGroupStyleEnum.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/delivery/DeliveryTemplateDO.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/shop/ShopDO.java
 create mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSkuDO.java

diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryModeEnum.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryModeEnum.java
new file mode 100644
index 000000000..4d9e89275
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryModeEnum.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.product.enums.delivery;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 配送方式枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum DeliveryModeEnum implements IntArrayValuable {
+
+    SHOP_DELIVERY(1, "商家配送"),
+    USER_PICK_UP(2, "用户自提");
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryModeEnum::getMode).toArray();
+
+    /**
+     * 配送方式
+     */
+    private final Integer mode;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/group/ProductGroupStyleEnum.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/group/ProductGroupStyleEnum.java
new file mode 100644
index 000000000..c5e55e8e4
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/group/ProductGroupStyleEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.product.enums.group;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 商品分组的样式枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum ProductGroupStyleEnum implements IntArrayValuable {
+
+    ONE(1, "每列一个"),
+    TWO(2, "每列两个"),
+    THREE(2, "每列三个"),;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ProductGroupStyleEnum::getStyle).toArray();
+
+    /**
+     * 列表样式
+     */
+    private final Integer style;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
index e34fba089..132d68d94 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
index a2904384f..2f6bda8bb 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
@@ -10,7 +10,7 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 
 /**
  * 商品sku Convert
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
index 93ec925a9..354266738 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.product.dal.dataobject.category;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -38,6 +39,12 @@ public class ProductCategoryDO extends BaseDO {
      * 父分类编号
      */
     private Long parentId;
+    /**
+     * 店铺编号
+     *
+     * 关联 {@link ShopDO#getId()}
+     */
+    private Long shopId;
     /**
      * 分类名称
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/delivery/DeliveryTemplateDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/delivery/DeliveryTemplateDO.java
new file mode 100644
index 000000000..70445dc01
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/delivery/DeliveryTemplateDO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.delivery;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 配送模板 SPU DO
+ *
+ * @author 芋道源码
+ */
+@TableName("delivery_template")
+@KeySequence("delivery_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeliveryTemplateDO extends BaseDO {
+
+    /**
+     * 编号，自增
+     */
+    @TableId
+    private Long id;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
new file mode 100644
index 000000000..34c8afeaf
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.group;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 商品分组的绑定 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("product_group_bind")
+@KeySequence("product_group_bind_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductGroupBindDO extends BaseDO {
+
+    /**
+     * 编号，自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 店铺编号
+     *
+     * 关联 {@link ShopDO#getId()}
+     */
+    private Long shopId;
+    /**
+     * 商品分组编号
+     *
+     * 关联 {@link ProductGroupDO#getId()}
+     */
+    private Long groupId;
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 {@link ProductSpuDO#getId()}
+     */
+    private Long spuId;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
index cf5adcf36..247abac1f 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
@@ -1,6 +1,9 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.group;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
+import cn.iocoder.yudao.module.product.enums.group.ProductGroupStyleEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,7 +29,42 @@ public class ProductGroupDO extends BaseDO {
      */
     @TableId
     private Long id;
-
-    // TODO 芋艿：字段补全
+    /**
+     * 店铺编号
+     *
+     * 关联 {@link ShopDO#getId()}
+     */
+    private Long shopId;
+    /**
+     * 分组名称
+     */
+    private String name;
+    /**
+     * 状态
+     *
+     * 枚举 {@link CommonStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 商品数量
+     */
+    private Integer count;
+    /**
+     * 排序
+     */
+    private Integer sort;
+    /**
+     * 风格，用于 APP 首页展示商品的样式
+     *
+     * 枚举 {@link ProductGroupStyleEnum}
+     */
+    private Integer style;
+    /**
+     * 是否默认
+     *
+     * true - 系统默认，不允许删除
+     * false - 自定义，允许删除
+     */
+    private Boolean defaulted;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
index 5255c36ed..df1a6544e 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.product.dal.dataobject.property;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -27,15 +28,23 @@ public class ProductPropertyDO extends BaseDO {
      */
     @TableId
     private Long id;
+    /**
+     * 店铺编号
+     *
+     * 关联 {@link ShopDO#getId()}
+     */
+    private Long shopId;
     /**
      * 规格名称
      */
     private String name;
     /**
-     * 状态： 0 开启 ，1 禁用
+     * 状态
      *
-     * {@link CommonStatusEnum}
+     * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
 
+    // TODO 芋艿：rule；规格属性 (发布商品时，和 SKU 关联)；规格参数(搜索商品时，与 Category 关联搜索)
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyValueDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyValueDO.java
index 0203939cc..007b95a4f 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyValueDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyValueDO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.property;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,9 +29,9 @@ public class ProductPropertyValueDO extends BaseDO {
     @TableId
     private Long id;
     /**
-     * 规格键 id
+     * 规格键编号
      *
-     * TODO @franky：加个 关联 {@link ProductPropertyDO#getId()} ，这样就能更好的知道
+     * 关联 {@link ProductPropertyDO#getId()}
      */
     private Long propertyId;
     /**
@@ -38,7 +39,9 @@ public class ProductPropertyValueDO extends BaseDO {
      */
     private String name;
     /**
-     * 状态： 1 开启 ，2 禁用
+     * 状态
+     *
+     * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/shop/ShopDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/shop/ShopDO.java
new file mode 100644
index 000000000..1c702da91
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/shop/ShopDO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.shop;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+// TODO 芋艿：待设计
+/**
+ * 店铺 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("shop")
+@KeySequence("shop_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopDO extends BaseDO {
+
+    private Long id;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
new file mode 100755
index 000000000..d1a976afc
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -0,0 +1,112 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.sku;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyValueDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
+
+import java.util.List;
+
+/**
+ * 商品 SKU DO
+ *
+ * @author 芋道源码
+ */
+@TableName("product_sku")
+@KeySequence("product_sku_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductSkuDO extends BaseDO {
+
+    /**
+     * 商品 SKU 编号，自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 商品 SKU 名字
+     */
+    private String name;
+    /**
+     * SPU 编号
+     *
+     * 关联 {@link ProductSpuDO#getId()}
+     */
+    private Long spuId;
+    /**
+     * 规格值数组，JSON 格式
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Property> properties;
+    /**
+     * 销售价格，单位：分
+     */
+    private Integer price;
+    /**
+     * 原价，单位：分
+     */
+    private Integer originalPrice;
+    /**
+     * SKU 的条形码
+     */
+    private String barCode;
+    /**
+     * 图片地址
+     */
+    private String picUrl;
+    /**
+     * SKU 状态
+     *
+     * 枚举 {@link CommonStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 购买中的库存
+     *
+     * 商品 SKU 被下单时，未付款的商品 SKU 数量
+     */
+    private Integer stocks;
+    /**
+     * 实际库存
+     */
+    private Integer actualStocks;
+    /**
+     * 商品重量，单位：kg 千克
+     */
+    private Double weight;
+    /**
+     * 商品体积，单位：m^3 平米
+     */
+    private Double volume;
+
+    @Data
+    public static class Property {
+
+        /**
+         * 属性编号
+         *
+         * 关联 {@link ProductPropertyDO#getId()}
+         */
+        private Long propertyId;
+        /**
+         * 属性值编号
+         *
+         * 关联 {@link ProductPropertyValueDO#getId()}
+         */
+        private Long valueId;
+
+    }
+
+}
+
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSkuDO.java
deleted file mode 100755
index cfa8a52bb..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSkuDO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.iocoder.yudao.module.product.dal.dataobject.spu;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-/**
- * 商品sku DO
- *
- * @author 芋道源码
- */
-@TableName("product_sku")
-@KeySequence("product_sku_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProductSkuDO extends BaseDO {
-
-    /**
-     * 主键
-     */
-    @TableId
-    private Long id;
-    /**
-     * spu编号
-     */
-    private Long spuId;
-    /**
-     * 规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]
-     */
-    // TODO franky：可以定义一个内部的 Property 类，然后 List<Property>
-    private String properties;
-    /**
-     * 销售价格，单位：分
-     */
-    private Integer price;
-    /**
-     * 原价，单位：分
-     */
-    private Integer originalPrice;
-    /**
-     * 成本价，单位： 分
-     */
-    private Integer costPrice;
-    /**
-     * 条形码
-     */
-    private String barCode;
-    /**
-     * 图片地址
-     */
-    private String picUrl;
-    /**
-     * 状态： 0-正常 1-禁用
-     */
-    private Integer status;
-
-}
-
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index e7c27514f..59f6b549f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -4,7 +4,10 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.group.ProductGroupDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.delivery.DeliveryTemplateDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.enums.delivery.DeliveryModeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -34,6 +37,16 @@ public class ProductSpuDO extends BaseDO {
      */
     @TableId
     private Long id;
+
+    /**
+     * 店铺编号
+     *
+     * 关联 {@link ShopDO#getId()}
+     */
+    private Long shopId;
+
+    // ========== 基本信息 =========
+
     /**
      * 商品名称
      */
@@ -58,13 +71,6 @@ public class ProductSpuDO extends BaseDO {
      * 关联 {@link ProductBrandDO#getId()}
      */
     private Long brandId;
-    /**
-     * 商品分组编号数组
-     *
-     * 关联 {@link ProductGroupDO#getId()}
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<Long> groupIds;
     /**
      * 商品图片地址数组
      */
@@ -80,6 +86,9 @@ public class ProductSpuDO extends BaseDO {
      * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
+
+    // ========== SKU 相关字段 =========
+
     /**
      * 价格，单位使用：分
      *
@@ -87,14 +96,29 @@ public class ProductSpuDO extends BaseDO {
      */
     private Integer price;
     /**
-     * 库存数量
+     * 总库存
      *
-     * 基于其对应的 {@link ProductSkuDO#getPrice()} 求和
+     * 基于其对应的 {@link ProductSkuDO#getActualStocks()} 求和
      */
-    private Integer quantity;
+    private Integer totalStocks;
+    /**
+     * 已销售数量
+     */
+    private Integer soldNum;
 
+    // ========== 物流相关字段 =========
 
-    // TODO 芋艿：配送方式：商家配送、商家自提
-    // TODO 芋艿：运费设置；如果选择了 “商家配送” 配送方式，则选择「运费设置」编号
+    /**
+     * 配送方式
+     *
+     * 枚举 {@link DeliveryModeEnum}
+     */
+    private Integer deliveryMode;
+    /**
+     * 配置模板编号
+     *
+     * 关联 {@link DeliveryTemplateDO#getId()}
+     */
+    private Long deliveryTemplateId;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index c3aa3c883..2f2ced33c 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExportReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index e5e436804..0396506ef 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateR
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExportReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 
 import javax.validation.Valid;
 import java.util.Collection;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 2bec682db..91a60929b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPrope
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
 import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index bd18abfd2..ea4afb2e7 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
 import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
index 2f9631cbe..27d5e140b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
@@ -8,7 +8,7 @@ import javax.annotation.Resource;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 

From 022e5b8519fbbd10ba39e6765f48baf0f85c577b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 31 Jul 2022 22:26:26 +0800
Subject: [PATCH 12/56] =?UTF-8?q?mall=EF=BC=9A=E5=AE=8C=E5=96=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E5=9D=97=E7=9A=84=E8=A1=A8=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductCommentAuditStatusEnum.java        |  38 ++++++
 .../comment/ProductCommentEvaluateEnum.java   |  38 ++++++
 .../category/ProductCategoryDO.java           |  13 +--
 .../dataobject/comment/ProductCommentDO.java  | 110 ++++++++++++++++++
 .../favorite/ProductFavoriteDO.java           |  43 +++++++
 .../dataobject/group/ProductGroupBindDO.java  |  13 +--
 .../dal/dataobject/group/ProductGroupDO.java  |  12 +-
 .../property/ProductPropertyDO.java           |  13 +--
 .../dataobject/search/ProductHotSearchDO.java |  44 +++++++
 .../dal/dataobject/spu/ProductSpuDO.java      |  13 +--
 .../dal/dataobject/address/AddressDO.java     |  17 +--
 .../dal/dataobject/user/MemberUserDO.java     |   6 +
 .../module/member/enums/AddressTypeEnum.java  |  30 -----
 .../module/member/enums/package-info.java     |   4 -
 14 files changed, 319 insertions(+), 75 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentAuditStatusEnum.java
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentEvaluateEnum.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java
 delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java
 delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/package-info.java

diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentAuditStatusEnum.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentAuditStatusEnum.java
new file mode 100644
index 000000000..276839daf
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentAuditStatusEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.product.enums.comment;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 商品评论的审批状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum ProductCommentAuditStatusEnum implements IntArrayValuable {
+
+    NONE(1, "待审核"),
+    APPROVE(2, "审批通过"),
+    REJECT(2, "审批不通过"),;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ProductCommentAuditStatusEnum::getStatus).toArray();
+
+    /**
+     * 审批状态
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentEvaluateEnum.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentEvaluateEnum.java
new file mode 100644
index 000000000..5a95f775c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentEvaluateEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.product.enums.comment;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 商品评论的评价枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum ProductCommentEvaluateEnum implements IntArrayValuable {
+
+    GOOD(1, "好评"),
+    BAD(2, "差评"),
+    MIDDLE(2, "中评"),;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ProductCommentEvaluateEnum::getEvaluate).toArray();
+
+    /**
+     * 评价
+     */
+    private final Integer evaluate;
+    /**
+     * 评价名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
index 354266738..1aade9b04 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.product.dal.dataobject.category;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -39,12 +38,12 @@ public class ProductCategoryDO extends BaseDO {
      * 父分类编号
      */
     private Long parentId;
-    /**
-     * 店铺编号
-     *
-     * 关联 {@link ShopDO#getId()}
-     */
-    private Long shopId;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
     /**
      * 分类名称
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
new file mode 100644
index 000000000..cd7d81aec
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
@@ -0,0 +1,110 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.comment;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
+import cn.iocoder.yudao.module.product.enums.comment.ProductCommentAuditStatusEnum;
+import cn.iocoder.yudao.module.product.enums.comment.ProductCommentEvaluateEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 商品评论 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("product_comment")
+@KeySequence("product_comment_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductCommentDO extends BaseDO {
+
+    /**
+     * 评论编号，主键自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 {@link ProductSpuDO#getId()}
+     */
+    private Long spuId;
+    /**
+     * 订单项编号
+     *
+     * 关联 OrderItemDO 的 id 编号
+     */
+    private Long orderItemId;
+
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 编号
+     */
+    private Long userId;
+    /**
+     * 用户 IP
+     */
+    private String userIp;
+    /**
+     * 是否匿名
+     */
+    private Boolean anonymous;
+    /**
+     * 评论内容
+     */
+    private String content;
+    /**
+     * 评论图片地址数组
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> picUrls;
+    /**
+     * 得分，0-5 分
+     */
+    private Integer score;
+    /**
+     * 评价
+     *
+     * 枚举 {@link ProductCommentEvaluateEnum}
+     */
+    private Integer evaluate;
+
+    /**
+     * 商家是否回复
+     */
+    private Boolean replied;
+    /**
+     * 商家回复内容
+     */
+    private String replyContent;
+    /**
+     * 商家回复时间
+     */
+    private Date replyTime;
+    /**
+     * 审核状态
+     *
+     * 枚举 {@link ProductCommentAuditStatusEnum}
+     */
+    private Integer auditStatus;
+
+    /**
+     * 有用的计数
+     *
+     * 其他用户看到评论时，可点击「有用」按钮
+     */
+    private Integer usefulCount;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java
new file mode 100644
index 000000000..6e00eaa6c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.favorite;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 商品收藏 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("product_favorite")
+@KeySequence("product_favorite_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductFavoriteDO extends BaseDO {
+
+    /**
+     * 编号，主键自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 编号
+     */
+    private Long userId;
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 {@link ProductSpuDO#getId()}
+     */
+    private Long spuId;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
index 34c8afeaf..209a7085c 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.group;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,12 +27,12 @@ public class ProductGroupBindDO extends BaseDO {
      */
     @TableId
     private Long id;
-    /**
-     * 店铺编号
-     *
-     * 关联 {@link ShopDO#getId()}
-     */
-    private Long shopId;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
     /**
      * 商品分组编号
      *
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
index 247abac1f..e942b957c 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
@@ -29,12 +29,12 @@ public class ProductGroupDO extends BaseDO {
      */
     @TableId
     private Long id;
-    /**
-     * 店铺编号
-     *
-     * 关联 {@link ShopDO#getId()}
-     */
-    private Long shopId;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
     /**
      * 分组名称
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
index df1a6544e..94bfc808c 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.product.dal.dataobject.property;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,12 +27,12 @@ public class ProductPropertyDO extends BaseDO {
      */
     @TableId
     private Long id;
-    /**
-     * 店铺编号
-     *
-     * 关联 {@link ShopDO#getId()}
-     */
-    private Long shopId;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
     /**
      * 规格名称
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java
new file mode 100644
index 000000000..c53f01aca
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.product.dal.dataobject.search;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 商品热搜关键字 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("product_hot_search")
+@KeySequence("product_hot_search_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductHotSearchDO extends BaseDO {
+
+    /**
+     * 编号，主键自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 关键字
+     */
+    private String name;
+    /**
+     * 内容
+     */
+    private String content;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index 59f6b549f..74b41d1ea 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.delivery.DeliveryTemplateDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.enums.delivery.DeliveryModeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -38,12 +37,12 @@ public class ProductSpuDO extends BaseDO {
     @TableId
     private Long id;
 
-    /**
-     * 店铺编号
-     *
-     * 关联 {@link ShopDO#getId()}
-     */
-    private Long shopId;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
 
     // ========== 基本信息 =========
 
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
index 546df00c6..97abb113f 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.member.dal.dataobject.address;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.member.enums.AddressTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -32,24 +31,28 @@ public class AddressDO extends BaseDO {
     /**
      * 收件人名称
      */
-    private String name;
+    private String receiver;
     /**
      * 手机号
      */
     private String mobile;
     /**
-     * 地区编码
+     * 地区编号
      */
-    private Integer areaCode;
+    private Integer areaId;
+    /**
+     * 邮编
+     */
+    private String postCode;
     /**
      * 收件详细地址
      */
     private String detailAddress;
     /**
-     * 地址类型
+     * 是否默认
      *
-     * 枚举 {@link AddressTypeEnum}
+     * true - 默认收件地址
      */
-    private Integer type;
+    private Boolean defaulted;
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
index 40391bfe3..a0bf946fe 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
@@ -69,4 +69,10 @@ public class MemberUserDO extends TenantBaseDO {
      */
     private Date loginDate;
 
+    // TODO 芋艿：name 真实名字；
+    // TODO 芋艿：email 邮箱；
+    // TODO 芋艿：gender 性别；
+    // TODO 芋艿：score 积分；
+    // TODO 芋艿：payPassword 支付密码；
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java
deleted file mode 100644
index 59465e495..000000000
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.member.enums;
-
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 用户收件地址的类型枚举
- */
-@Getter
-@AllArgsConstructor
-public enum AddressTypeEnum implements IntArrayValuable {
-
-    DEFAULT(1, "默认收件地址"),
-    NORMAL(2, "普通收件地址"), // 即非默认收件地址
-
-    ;
-
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(AddressTypeEnum::getType).toArray();
-
-    private final Integer type;
-    private final String desc;
-
-    @Override
-    public int[] array() {
-        return ARRAYS;
-    }
-}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/package-info.java
deleted file mode 100644
index 9e136937a..000000000
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 占位
- */
-package cn.iocoder.yudao.module.member.enums;

From 2b71a1588cbd104b65b77589ff7886948e55338d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 31 Jul 2022 22:36:06 +0800
Subject: [PATCH 13/56] =?UTF-8?q?mall=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=20trade=20=E4=BA=A4=E6=98=93=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-module-mall/pom.xml                     |  5 ++--
 .../yudao-module-product-biz/pom.xml          |  6 ++--
 .../yudao/module/product/package-info.java    |  9 +++---
 .../yudao-module-trade-api/pom.xml            | 26 +++++++++++++++++
 .../yudao-module-trade-biz/pom.xml            | 28 +++++++++++++++++++
 .../module/trade/dal/mysql/package-info.java  |  4 +++
 .../yudao/module/trade/package-info.java      |  8 ++++++
 7 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-trade-api/pom.xml
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/pom.xml
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/package-info.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/package-info.java

diff --git a/yudao-module-mall/pom.xml b/yudao-module-mall/pom.xml
index 866874852..29d5d2d2b 100644
--- a/yudao-module-mall/pom.xml
+++ b/yudao-module-mall/pom.xml
@@ -15,14 +15,15 @@
     <name>${project.artifactId}</name>
 
     <description>
-        market模块，主要实现营销相关功能
-        例如：营销活动、banner广告、优惠券、优惠码等功能。
+        商城大模块，由 product 商品、market 营销、trade 交易等组成
     </description>
     <modules>
         <module>yudao-module-market-api</module>
         <module>yudao-module-market-biz</module>
         <module>yudao-module-product-api</module>
         <module>yudao-module-product-biz</module>
+        <module>yudao-module-trade-api</module>
+        <module>yudao-module-trade-biz</module>
     </modules>
 
 </project>
diff --git a/yudao-module-mall/yudao-module-product-biz/pom.xml b/yudao-module-mall/yudao-module-product-biz/pom.xml
index a06f8937c..e4ffde317 100644
--- a/yudao-module-mall/yudao-module-product-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-product-biz/pom.xml
@@ -2,13 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cn.iocoder.boot</groupId>
         <artifactId>yudao-module-mall</artifactId>
         <version>${revision}</version>
     </parent>
-
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>yudao-module-product-biz</artifactId>
     <packaging>jar</packaging>
 
@@ -18,7 +17,6 @@
         例如：品牌、商品分类、spu、sku等功能。
     </description>
 
-
     <dependencies>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
@@ -64,4 +62,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java
index 4e80cc2bc..117f35931 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java
@@ -1,7 +1,8 @@
 /**
- * TODO
+ * trade 模块，主要实现交易相关功能
+ * 例如：订单、退款、购物车等功能。
  *
- * @author JeromeSoar
- * @since 2022-04-24
+ * 1. Controller URL：以 /trade/ 开头，避免和其它 Module 冲突
+ * 2. DataObject 表名：以 trade_ 开头，方便在数据库中区分
  */
-package cn.iocoder.yudao.module.product;
\ No newline at end of file
+package cn.iocoder.yudao.module.product;
diff --git a/yudao-module-mall/yudao-module-trade-api/pom.xml b/yudao-module-mall/yudao-module-trade-api/pom.xml
new file mode 100644
index 000000000..1299ad11d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-trade-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        trade 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/yudao-module-mall/yudao-module-trade-biz/pom.xml b/yudao-module-mall/yudao-module-trade-biz/pom.xml
new file mode 100644
index 000000000..282f5c996
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-trade-biz</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        trade 模块，主要实现交易相关功能
+        例如：订单、退款、购物车等功能。
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-trade-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/package-info.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/package-info.java
new file mode 100644
index 000000000..37e0ba7d6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 占位
+ */
+package cn.iocoder.yudao.module.trade.dal.mysql;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/package-info.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/package-info.java
new file mode 100644
index 000000000..393abea6a
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * product 模块，product 模块，主要实现商品相关功能
+ * 例如：品牌、商品分类、spu、sku等功能。
+ *
+ * 1. Controller URL：以 /product/ 开头，避免和其它 Module 冲突
+ * 2. DataObject 表名：以 product_ 开头，方便在数据库中区分
+ */
+package cn.iocoder.yudao.module.trade;

From 96e2a27d079bd1c54ac4de250827f1746510bab6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 1 Aug 2022 00:53:16 +0800
Subject: [PATCH 14/56] =?UTF-8?q?mall=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=20trade=20=E8=A1=A8=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao-module-product-biz/pom.xml          |   4 -
 .../dataobject/comment/ProductCommentDO.java  |   4 +-
 .../dal/dataobject/spu/ProductSpuDO.java      |   1 +
 .../enums/order/TradeOrderCloseTypeEnum.java  |  29 +++
 .../enums/order/TradeOrderStatusEnum.java     |  31 +++
 .../enums/refund/TradeRefundStatusEnum.java   |  29 +++
 .../enums/refund/TradeRefundTypeEnum.java     |  27 +++
 .../yudao-module-trade-biz/pom.xml            |  37 ++++
 .../trade/dal/dataobject/cart/CartItemDO.java |  90 ++++++++
 .../dataobject/order/OrderPreferentialDO.java |  49 +++++
 .../dal/dataobject/order/TradeOrderDO.java    | 202 ++++++++++++++++++
 .../dataobject/order/TradeOrderItemDO.java    | 125 +++++++++++
 .../dal/dataobject/refund/TradeRefundDO.java  | 154 +++++++++++++
 .../dal/dataobject/address/AddressDO.java     |   2 +-
 14 files changed, 777 insertions(+), 7 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCloseTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
 create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundStatusEnum.java
 create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java

diff --git a/yudao-module-mall/yudao-module-product-biz/pom.xml b/yudao-module-mall/yudao-module-product-biz/pom.xml
index e4ffde317..bb9a36f94 100644
--- a/yudao-module-mall/yudao-module-product-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-product-biz/pom.xml
@@ -29,10 +29,6 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
index cd7d81aec..88c57f579 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
@@ -41,11 +41,11 @@ public class ProductCommentDO extends BaseDO {
      */
     private Long spuId;
     /**
-     * 订单项编号
+     * 交易订单项编号
      *
      * 关联 OrderItemDO 的 id 编号
      */
-    private Long orderItemId;
+    private Long tradeOrderItemId;
 
     /**
      * 用户编号
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index 74b41d1ea..f9863f0f0 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.delivery.DeliveryTemplateDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.enums.delivery.DeliveryModeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCloseTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCloseTypeEnum.java
new file mode 100644
index 000000000..4fdaf9298
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCloseTypeEnum.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.trade.enums.order;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 交易订单 - 关闭类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum TradeOrderCloseTypeEnum {
+
+    PAY_TIMEOUT(10, "超时未支付"),
+    REFUND_CLOSE(20, "退款关闭"),
+    MEMBER_CANCEL(30, "买家取消"),
+    PAY_ON_DELIVERY(40, "已通过货到付款交易"),;
+
+    /**
+     * 关闭类型
+     */
+    private final Integer type;
+    /**
+     * 关闭类型名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
new file mode 100644
index 000000000..cd777e124
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.trade.enums.order;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 交易订单 - 状态
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum TradeOrderStatusEnum {
+
+    WAITING_PAYMENT(10, "待付款"),
+    WAIT_SHIPMENT(20, "待发货"),
+    ALREADY_SHIPMENT(30, "待收货"),
+    WAITING_COMMENT(40, "待评价"),
+    COMPLETED(50, "成功"),
+    CLOSED(60, "失败");
+
+    /**
+     * 状态值
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundStatusEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundStatusEnum.java
new file mode 100644
index 000000000..b272ac983
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundStatusEnum.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.trade.enums.refund;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 交易退款 - 状态
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum TradeRefundStatusEnum {
+
+    NONE(0, "未退款"),
+    AUDIT(10, "审核中"),
+    APPROVE(30, "已通过"),
+    REJECT(40, "不通过"),;
+
+    /**
+     * 状态值
+     */
+    private final Integer value;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundTypeEnum.java
new file mode 100644
index 000000000..f74b39bba
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundTypeEnum.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.trade.enums.refund;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 交易退款 - 申请类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum TradeRefundTypeEnum {
+
+    REFUND(10, "退款"),
+    RETURN_AND_REFUND(20, "退货退款");
+
+    /**
+     * 状态值
+     */
+    private final Integer type;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/pom.xml b/yudao-module-mall/yudao-module-trade-biz/pom.xml
index 282f5c996..ee95393a9 100644
--- a/yudao-module-mall/yudao-module-trade-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-trade-biz/pom.xml
@@ -23,6 +23,43 @@
             <artifactId>yudao-module-trade-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-product-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
new file mode 100644
index 000000000..7f49a968e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
@@ -0,0 +1,90 @@
+package cn.iocoder.yudao.module.trade.dal.dataobject.cart;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 购物车的商品信息 DO
+ */
+@TableName("trade_cart_item")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class CartItemDO extends BaseDO {
+
+    // ========= 基础字段 BEGIN =========
+
+    /**
+     * 编号，唯一自增
+     */
+    private Long id;
+    /**
+     * 是否选中
+     */
+    private Boolean selected;
+    /**
+     * 购物时间
+     */
+    private Date buyTime; // basket_date
+
+    // ========= 基础字段 END =========
+
+    // ========= 买家信息 BEGIN =========
+
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 编号
+     */
+    private Long userId;
+
+    // ========= 买家信息 END =========
+
+    // ========= 商品信息 BEGIN =========
+
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 ProductSpuDO 的 id 编号
+     */
+    private Long spuId;
+    /**
+     * 商品 SKU 编号
+     *
+     * 关联 ProductSkuDO 的 id 编号
+     */
+    private Long skuId;
+    /**
+     * 商品购买数量
+     */
+    private Integer stock;
+
+    // ========= 商品信息 END =========
+
+    // ========= 优惠信息 BEGIN =========
+
+//    /**
+//     * 商品营销活动编号
+//     */
+//    private Long activityId; // discount_id
+//    /**
+//     * 商品营销活动类型
+//     */
+//    private Integer activityType;
+
+    // ========= 优惠信息 END =========
+
+    // TODO 芋艿：distribution_card_no
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java
new file mode 100644
index 000000000..a5d6cd9c5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.trade.dal.dataobject.order;
+
+/**
+ * 订单优惠明细
+ *
+ * 可参考 https://jos.jd.com/apilist?apiGroupId=55&apiId=16757&apiName=jingdong.pop.order.coupondetail
+ */
+// TODO 芋艿 后续在完善
+@Deprecated
+public class OrderPreferentialDO {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+    /**
+     * 类型
+     *
+     * 1 - 促销活动
+     * 2 - 优惠劵
+     */
+    private Integer type;
+    // TODO 芋艿 优惠劵编号 or 促销活动编号
+    /**
+     * 订单编号
+     */
+    private Integer orderId;
+    /**
+     * 商品 SPU 编号
+     */
+    private Integer spuId;
+    /**
+     * 商品 SKU 编号
+     */
+    private Integer skuId;
+    /**
+     * 商品数量
+     */
+    private Integer quantity;
+    /**
+     * 传入时的价格
+     */
+    private Integer originTotal;
+    /**
+     * 总优惠价格
+     */
+    private Integer discountTotal;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
new file mode 100644
index 000000000..72db0bbc5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -0,0 +1,202 @@
+package cn.iocoder.yudao.module.trade.dal.dataobject.order;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.product.enums.delivery.DeliveryModeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderCloseTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.refund.TradeRefundStatusEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * 交易订单 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("trade_order")
+@KeySequence("trade_order_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeOrderDO extends BaseDO {
+
+    // ========== 订单基本信息 ==========
+    /**
+     * 订单编号，主键自增
+     */
+    private Integer id;
+    /**
+     * 订单流水号
+     *
+     * 例如说，1146347329394184195
+     */
+    private String sn;
+    // TODO 芋艿：order_type 订单类型
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 编号
+     */
+    private Long userId;
+    /**
+     * 订单状态
+     *
+     * 枚举 {@link TradeOrderStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 关闭类型
+     *
+     * 枚举 {@link TradeOrderCloseTypeEnum}
+     */
+    private Integer closeType;
+    // TODO 芋艿：要不要存储 prod_name 购买的商品名门？
+    /**
+     * 购买的商品数量
+     */
+    private Integer productCount;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 订单结束时间
+     *
+     * 即交易订单状态变成 {@link TradeOrderStatusEnum#COMPLETED} 或 {@link TradeOrderStatusEnum#CLOSED} 的时间
+     */
+    private Date endTime;
+
+    // ========== 价格 + 支付基本信息 ==========
+    /**
+     * 是否已支付
+     *
+     * true - 已经支付过
+     * false - 没有支付过
+     */
+    private Boolean payed;
+    /**
+     * 付款时间
+     */
+    private Date payTime;
+
+    // TODO 芋艿：delete_status 用户订单删除状态；0 - 未删除；1 - 回收站；2 - 永久删除
+
+    // ========== 价格 + 支付基本信息 ==========
+    /**
+     * 购买（商品）总金额，单位：分
+     */
+    private Integer buyPrice; // total
+    /**
+     * 优惠总金额，单位：分。
+     */
+    private Integer discountPrice; // reduce_amount
+    /**
+     * 物流金额 (分)
+     */
+    private Integer logisticsPrice; // freight_amount
+    /**
+     * 最终金额，单位：分
+     *
+     * buyPrice + logisticsPrice -  discountPrice = presentPrice
+     */
+    private Integer presentPrice; // actual_total
+    /**
+     * 实际已支付金额，单位：分
+     *
+     * 初始时，金额为 0 。等到支付成功后，会进行更新。
+     */
+    private Integer payPrice;
+    /**
+     * 退款金额，单位：分
+     *
+     * 注意，退款并不会影响 {@link #payPrice} 实际支付金额
+     * 也就说，一个订单最终产生多少金额的收入 = payPrice - refundPrice
+     */
+    @Deprecated
+    private Integer refundPrice;
+    /**
+     * 支付订单编号
+     *
+     * 对接 pay-module-biz 支付服务的支付订单编号，即 PayOrderDO 的 id 编号
+     */
+    private Long payOrderId;
+    /**
+     * 支付成功的支付渠道
+     */
+    private Integer payType;
+
+    // ========== 收件 + 物流基本信息 ==========
+    /**
+     * 配送方式
+     *
+     * 枚举 {@link DeliveryModeEnum}
+     */
+    private Integer deliveryMode;
+    /**
+     * 配置模板的编号
+     *
+     * 关联 DeliveryTemplateDO 的 id 编号
+     */
+    private Long deliveryTemplateId; // dvy_id
+    /**
+     * 物流公司单号
+     */
+    private String expressNo; // dvy_flow_id
+    /**
+     * 发货时间
+     */
+    private Date deliveryTime;
+    /**
+     * 收货时间
+     */
+    private Date receiveTime;
+    /**
+     * 收件人名称
+     */
+    private String receiverName;
+    /**
+     * 收件人手机
+     */
+    private String receiverMobile;
+    /**
+     * 收件人地区编号
+     */
+    private Integer receiverAreaId;
+    /**
+     * 收件人邮编
+     */
+    private Integer receiverPostCode;
+    /**
+     * 收件人详细地址
+     */
+    private String receiverDetailAddress;
+
+    // ========== 退款基本信息 ==========
+    /**
+     * 退款状态
+     *
+     * 枚举 {@link TradeRefundStatusEnum}
+     */
+    private Integer refundStatus;
+
+    // ========== 营销基本信息 ==========
+    /**
+     * 优惠劵编号
+     */
+    private Integer couponCardId;
+
+    // TODO 芋艿，这块还要结合营销和价格计算，在去优化下。
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
new file mode 100644
index 000000000..fd649b1f6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
@@ -0,0 +1,125 @@
+package cn.iocoder.yudao.module.trade.dal.dataobject.order;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 交易订单项 DO
+ *
+ * @author 芋道源码
+ */
+@TableName(value = "trade_order_item")
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class TradeOrderItemDO extends BaseDO {
+
+    // ========== 订单项基本信息 ==========
+    /**
+     * 编号
+     */
+    private Integer id;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 编号
+     */
+    private Long userId;
+    /**
+     * 订单编号
+     *
+     * 关联 {@link TradeOrderDO#getId()}
+     */
+    private Long orderId;
+
+    // ========== 商品基本信息 ==========
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 ProductSpuDO 的 id 编号
+     */
+    private Long spuId;
+    /**
+     * 商品 SKU 编号
+     *
+     * 关联 ProductSkuDO 的 id 编号
+     */
+    private Integer skuId;
+    /**
+     * 商品名称
+     */
+    private String name;
+    /**
+     * 商品图片
+     */
+    private String picUrl;
+    /**
+     * 购买数量
+     */
+    private Integer stock;
+    /**
+     * 是否评论
+     *
+     * false - 未评论
+     * true - 已评论
+     */
+    private Boolean commented;
+
+    // ========== 价格 + 支付基本信息 ==========
+    /**
+     * 原始单价，单位：分。
+     */
+    private Integer originPrice; // price
+    /**
+     * 购买单价，单位：分
+     */
+    private Integer buyPrice;
+    /**
+     * 最终单价，单位：分。
+     */
+    private Integer presentPrice;
+    /**
+     * 购买总金额，单位：分
+     *
+     * 用途类似 {@link #presentTotal}
+     */
+    private Integer buyTotal;
+    /**
+     * 优惠总金额，单位：分。
+     */
+    private Integer discountTotal;
+    /**
+     * 最终总金额，单位：分。
+     *
+     * 注意，presentPrice * stock 不一定等于 presentTotal 。
+     * 因为，存在无法整除的情况。
+     * 举个例子，presentPrice = 8.33 ，stock = 3 的情况，presentTotal 有可能是 24.99 ，也可能是 25 。
+     * 所以，需要存储一个该字段。
+     */
+    private Integer presentTotal; // product_total_amount
+    // 如上字段，举个例子：
+    // 假设购买三个，即 stock = 3 。
+    // originPrice = 15
+    // 使用限时折扣（单品优惠）8 折，buyPrice = 12
+    // 开始算总的价格
+    // buyTotal = buyPrice * stock = 12 * 3 = 36
+    // discountTotal ，假设有满减送（分组优惠）满 20 减 10 ，并且使用优惠劵满 1.01 减 1 ，则 discountTotal = 10 + 1 = 11
+    // presentTotal = buyTotal - discountTotal = 24 - 11 = 13
+    // 最终 presentPrice = presentTotal / stock = 13 / 3 = 4.33
+    /**
+     * 退款总金额，单位：分
+     */
+    private Integer refundTotal;
+
+    // TODO 芋艿：basket_date 加入购物车时间；
+    // TODO 芋艿：distribution_card_no 推广员使用的推销卡号
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
new file mode 100644
index 000000000..ce53e755d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
@@ -0,0 +1,154 @@
+package cn.iocoder.yudao.module.trade.dal.dataobject.refund;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import cn.iocoder.yudao.module.trade.enums.refund.TradeRefundStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.refund.TradeRefundTypeEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 交易退款，用于处理 {@link TradeOrderDO} 交易订单的退货换流程
+ */
+// TODO 芋艿：需要调整下每个字段的命名
+@TableName(value = "trade_refund")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class TradeRefundDO extends BaseDO {
+
+    /**
+     * 交易退款编号，主键自增
+     */
+    @Deprecated
+    private Long id;
+    /**
+     * 退款流水号
+     *
+     * 例如说，1146347329394184195
+     */
+    private String sn;
+    /**
+     * 退款状态
+     *
+     * 枚举 {@link TradeRefundStatusEnum}
+     */
+    private Integer status;
+//    /**
+//     * 店铺编号
+//     *
+//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
+//     */
+//    private Long shopId;
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 编号
+     */
+    private Long userId;
+    /**
+     * 用户手机
+     */
+    private String userMobile;
+    /**
+     * 申请类型
+     *
+     * 枚举 {@link TradeRefundTypeEnum}
+     */
+    private Integer type;
+    /**
+     * 用户售后说明
+     */
+    private String reasonMemo; // buyer_msg
+    /**
+     * 用户售后凭证图片的地址数组
+     *
+     * 数组，以逗号分隔
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> reasonPicUrls; // photo_files
+
+    // ========== 商家相关 ==========
+
+    /**
+     * 商家处理时间
+     */
+    private Date handleTime; // handel_time
+    /**
+     * 商家拒绝理由
+     */
+    private String rejectReasonMemo; // seller_msg
+
+    // ========== 交易订单相关 ==========
+    /**
+     * 交易订单编号
+     *
+     * 外键 {@link TradeOrderDO#getId()}
+     */
+    private Long tradeOrderId;
+    /**
+     * 交易订单项编号
+     *
+     * 关联 {@link TradeOrderItemDO#getId()}
+     * 如果全部退款，则该值设置为 0 即可
+     */
+    private Long tradeOrderItemId;
+    /**
+     * 商品 SKU 编号
+     */
+    @Deprecated
+    private Integer skuId;
+    /**
+     * 退货商品数量
+     */
+    private Integer stock; // goods_num
+
+    // ========== 退款相关 ==========
+    /**
+     * 退款金额，单位：分。
+     */
+    private Integer refundPrice; // refund_amount
+    /**
+     * 支付退款编号
+     *
+     * 对接 pay-module-biz 支付服务的退款订单编号，即 PayRefundDO 的 id 编号
+     */
+    private Long payRefundId;
+    // TODO 芋艿：看看是否有必要冗余，order_number、order_amount、flow_trade_no、out_refund_no、pay_type、return_money_sts、refund_time
+
+    // ========== 退货相关 ==========
+    /**
+     * 退货物流公司编号
+     *
+     * 关联 ExpressDO 的 id 编号
+     */
+    private Long returnExpressId; // express_name
+    /**
+     * 退货物流单号
+     */
+    private String returnExpressNo; // express_no
+    /**
+     * 退货时间
+     */
+    private Date returnDate; // ship_time
+
+    // ========== 收获相关 ==========
+
+    /**
+     * 收获备注
+     */
+    private String receiveMemo; // receive_message
+    /**
+     * 收货时间
+     */
+    private Date receiveDate; // receive_time
+
+}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
index 97abb113f..d470e8f90 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
@@ -31,7 +31,7 @@ public class AddressDO extends BaseDO {
     /**
      * 收件人名称
      */
-    private String receiver;
+    private String name;
     /**
      * 手机号
      */

From 4ce76e82fc4ae01c5f3ce979e20fa71dcb245fa9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 1 Aug 2022 22:49:51 +0800
Subject: [PATCH 15/56] =?UTF-8?q?mall=EF=BC=9A=E5=AE=8C=E5=96=84=E6=94=B6?=
 =?UTF-8?q?=E4=BB=B6=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sku/ProductSkuController.java       |  22 +---
 .../admin/spu/ProductSpuController.java       |  22 +---
 .../admin/spu/vo/ProductSpuBaseVO.java        |  11 +-
 .../controller/admin/spu/vo/SpuExcelVO.java   |  53 ----------
 .../admin/spu/vo/SpuExportReqVO.java          |  49 ---------
 .../app/spu/vo/AppSpuPageRespVO.java          |   2 +-
 .../convert/sku/ProductSkuConvert.java        |  35 ++----
 .../convert/spu/ProductSpuConvert.java        |   2 -
 .../dal/mysql/sku/ProductSkuMapper.java       |  16 +--
 .../dal/mysql/spu/ProductSpuMapper.java       |  26 +----
 .../service/sku/ProductSkuService.java        |   8 --
 .../service/sku/ProductSkuServiceImpl.java    |   5 -
 .../service/spu/ProductSpuService.java        |  21 ++--
 .../service/spu/ProductSpuServiceImpl.java    |   5 -
 .../service/sku/SkuServiceImplTest.java       |  84 +++------------
 .../spu/ProductSpuServiceImplTest.java        | 100 +++---------------
 .../trade/dal/dataobject/cart/CartItemDO.java |   7 +-
 .../member/enums/ErrorCodeConstants.java      |   1 -
 .../app/address/AppAddressController.http     |  24 ++---
 .../app/address/vo/AppAddressBaseVO.java      |  27 ++---
 .../dal/dataobject/address/AddressDO.java     |   2 +-
 .../dal/mysql/address/AddressMapper.java      |  54 ++--------
 .../service/address/AddressService.java       |  16 ++-
 .../service/address/AddressServiceImpl.java   |  92 +++++-----------
 .../address/AddressServiceImplTest.java       |  76 ++-----------
 .../src/test/resources/sql/create_tables.sql  |   8 +-
 26 files changed, 160 insertions(+), 608 deletions(-)
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExcelVO.java
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExportReqVO.java

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
index 132d68d94..ef6d8fcac 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
@@ -2,9 +2,10 @@ package cn.iocoder.yudao.module.product.controller.admin.sku;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
@@ -16,14 +17,11 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Api(tags = "管理后台 - 商品 sku")
 @RestController
@@ -84,16 +82,4 @@ public class ProductSkuController {
         return success(ProductSkuConvert.INSTANCE.convertPage(pageResult));
     }
 
-    @GetMapping("/export-excel")
-    @ApiOperation("导出商品sku Excel")
-    @PreAuthorize("@ss.hasPermission('product:sku:export')")
-    @OperateLog(type = EXPORT)
-    public void exportSkuExcel(@Valid ProductSkuExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<ProductSkuDO> list = ProductSkuService.getSkuList(exportReqVO);
-        // 导出 Excel
-        List<ProductSkuExcelVO> datas = ProductSkuConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "商品sku.xls", "数据", ProductSkuExcelVO.class, datas);
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
index 71bfa82bd..cfe393caf 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
@@ -2,9 +2,10 @@ package cn.iocoder.yudao.module.product.controller.admin.spu;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
@@ -16,14 +17,11 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Api(tags = "管理后台 - 商品spu")
 @RestController
@@ -83,16 +81,4 @@ public class ProductSpuController {
         return success(spuService.getSpuPage(pageVO));
     }
 
-    @GetMapping("/export-excel")
-    @ApiOperation("导出商品spu Excel")
-    @PreAuthorize("@ss.hasPermission('product:spu:export')")
-    @OperateLog(type = EXPORT)
-    public void exportSpuExcel(@Valid SpuExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<ProductSpuDO> list = spuService.getSpuList(exportReqVO);
-        // 导出 Excel
-        List<SpuExcelVO> datas = ProductSpuConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "商品spu.xls", "数据", SpuExcelVO.class, datas);
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
index 65a5f2a0e..e9c76805a 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
 * 商品spu Base VO，提供给添加、修改、详细的子 VO 使用
@@ -45,6 +46,6 @@ public class ProductSpuBaseVO {
     private Integer quantity;
 
     @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
-    private Boolean status;
+    private Integer status;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExcelVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExcelVO.java
deleted file mode 100755
index 9e90acd3d..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExcelVO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-
-/**
- * 商品spu Excel VO
- *
- * @author 芋道源码
- */
-@Data
-public class SpuExcelVO {
-
-    @ExcelProperty("主键")
-    private Integer id;
-
-    @ExcelProperty("商品名称")
-    private String name;
-
-    @ExcelProperty("卖点")
-    private String sellPoint;
-
-    @ExcelProperty("描述")
-    private String description;
-
-    @ExcelProperty("分类id")
-    private Long categoryId;
-
-    @ExcelProperty("商品主图地址,* 数组，以逗号分隔,最多上传15张")
-    private List<String> picUrls;
-
-    @ExcelProperty("排序字段")
-    private Integer sort;
-
-    @ExcelProperty("点赞初始人数")
-    private Integer likeCount;
-
-    @ExcelProperty("价格 单位使用：分")
-    private Integer price;
-
-    @ExcelProperty("库存数量")
-    private Integer quantity;
-
-    @ExcelProperty("上下架状态： 0 上架（开启） 1 下架（禁用）")
-    private Boolean status;
-
-    @ExcelProperty("创建时间")
-    private Date createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExportReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExportReqVO.java
deleted file mode 100755
index 29a3086a2..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExportReqVO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel(value = "管理后台 - 商品spu Excel 导出 Request VO", description = "参数和 SpuPageReqVO 是一致的")
-@Data
-public class SpuExportReqVO {
-
-    @ApiModelProperty(value = "商品名称")
-    private String name;
-
-    @ApiModelProperty(value = "卖点")
-    private String sellPoint;
-
-    @ApiModelProperty(value = "描述")
-    private String description;
-
-    @ApiModelProperty(value = "分类id")
-    private Long categoryId;
-
-    @ApiModelProperty(value = "商品主图地址,* 数组，以逗号分隔,最多上传15张")
-    private List<String> picUrls;
-
-    @ApiModelProperty(value = "排序字段")
-    private Integer sort;
-
-    @ApiModelProperty(value = "点赞初始人数")
-    private Integer likeCount;
-
-    @ApiModelProperty(value = "价格 单位使用：分")
-    private Integer price;
-
-    @ApiModelProperty(value = "库存数量")
-    private Integer quantity;
-
-    @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
-    private Boolean status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
index 0f77fd516..c0a0f0eb8 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
@@ -47,6 +47,6 @@ public class AppSpuPageRespVO  {
     private Integer quantity;
 
     @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
-    private Boolean status;
+    private Integer status;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
index 2f6bda8bb..e11f4785f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
@@ -1,16 +1,16 @@
 package cn.iocoder.yudao.module.product.convert.sku;
 
-import java.util.*;
-
-import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExcelVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+
+import java.util.List;
 
 /**
  * 商品sku Convert
@@ -22,18 +22,13 @@ public interface ProductSkuConvert {
 
     ProductSkuConvert INSTANCE = Mappers.getMapper(ProductSkuConvert.class);
 
-    @Mapping(source = "properties", target = "properties", qualifiedByName = "translateStringFromList")
     ProductSkuDO convert(ProductSkuCreateReqVO bean);
 
-    @Mapping(source = "properties", target = "properties", qualifiedByName = "translateStringFromList")
     ProductSkuDO convert(ProductSkuUpdateReqVO bean);
 
-    @Mapping(source = "properties", target = "properties", qualifiedByName = "tokenizeToBeanArray")
+    @Mapping(source = "properties", target = "properties")
     ProductSkuRespVO convert(ProductSkuDO bean);
 
-    @Mapping(source = "properties", target = "properties", qualifiedByName = "tokenizeToExcelBeanArray")
-    ProductSkuExcelVO convertToExcelVO(ProductSkuDO bean);
-
     List<ProductSkuRespVO> convertList(List<ProductSkuDO> list);
 
     List<ProductSkuDO> convertSkuDOList(List<ProductSkuCreateReqVO> list);
@@ -42,18 +37,4 @@ public interface ProductSkuConvert {
 
     List<ProductSkuExcelVO> convertList02(List<ProductSkuDO> list);
 
-    @Named("tokenizeToBeanArray")
-    default List<ProductSkuBaseVO.Property> translatePropertyArrayFromString(String properties) {
-        return JSONUtil.toList(properties, ProductSkuBaseVO.Property.class);
-    }
-
-    @Named("tokenizeToExcelBeanArray")
-    default List<ProductSkuExcelVO.Property> translateExcelPropertyArrayFromString(String properties) {
-        return JSONUtil.toList(properties, ProductSkuExcelVO.Property.class);
-    }
-
-    @Named("translateStringFromList")
-    default String translatePropertyStringFromList(List<ProductSkuBaseVO.Property> properties) {
-        return JSONUtil.toJsonStr(properties);
-    }
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
index 30bc4a0fe..e267ba185 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
@@ -30,8 +30,6 @@ public interface ProductSpuConvert {
 
     PageResult<SpuRespVO> convertPage(PageResult<ProductSpuDO> page);
 
-    List<SpuExcelVO> convertList02(List<ProductSpuDO> list);
-
     SpuPageReqVO convert(AppSpuPageReqVO bean);
 
     AppSpuPageRespVO convertAppResp(ProductSpuDO list);
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index 2f2ced33c..756636687 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.product.dal.mysql.sku;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExportReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -24,7 +23,7 @@ public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
                 .eqIfPresent(ProductSkuDO::getProperties, reqVO.getProperties())
                 .eqIfPresent(ProductSkuDO::getPrice, reqVO.getPrice())
                 .eqIfPresent(ProductSkuDO::getOriginalPrice, reqVO.getOriginalPrice())
-                .eqIfPresent(ProductSkuDO::getCostPrice, reqVO.getCostPrice())
+//                .eqIfPresent(ProductSkuDO::getCostPrice, reqVO.getCostPrice())
                 .eqIfPresent(ProductSkuDO::getBarCode, reqVO.getBarCode())
                 .eqIfPresent(ProductSkuDO::getPicUrl, reqVO.getPicUrl())
                 .eqIfPresent(ProductSkuDO::getStatus, reqVO.getStatus())
@@ -32,19 +31,6 @@ public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
                 .orderByDesc(ProductSkuDO::getId));
     }
 
-    default List<ProductSkuDO> selectList(ProductSkuExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<ProductSkuDO>()
-                .eqIfPresent(ProductSkuDO::getSpuId, reqVO.getSpuId())
-                .eqIfPresent(ProductSkuDO::getProperties, reqVO.getProperties())
-                .eqIfPresent(ProductSkuDO::getPrice, reqVO.getPrice())
-                .eqIfPresent(ProductSkuDO::getOriginalPrice, reqVO.getOriginalPrice())
-                .eqIfPresent(ProductSkuDO::getCostPrice, reqVO.getCostPrice())
-                .eqIfPresent(ProductSkuDO::getBarCode, reqVO.getBarCode())
-                .eqIfPresent(ProductSkuDO::getPicUrl, reqVO.getPicUrl())
-                .eqIfPresent(ProductSkuDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(ProductSkuDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ProductSkuDO::getId));
-    }
 
     // TODO @franky：方法名 selectList; 可以直接调用 selectList
     default List<ProductSkuDO> selectBySpuIds(List<Long> spuIds) {
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
index 72fb68b29..7487dd60c 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.product.dal.mysql.spu;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
 
 /**
  * 商品spu Mapper
@@ -25,25 +23,9 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
                 .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
                 .eqIfPresent(ProductSpuDO::getPicUrls, reqVO.getPicUrls())
                 .eqIfPresent(ProductSpuDO::getSort, reqVO.getSort())
-                .eqIfPresent(ProductSpuDO::getLikeCount, reqVO.getLikeCount())
+//                .eqIfPresent(ProductSpuDO::getLikeCount, reqVO.getLikeCount())
                 .eqIfPresent(ProductSpuDO::getPrice, reqVO.getPrice())
-                .eqIfPresent(ProductSpuDO::getQuantity, reqVO.getQuantity())
-                .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ProductSpuDO::getId));
-    }
-
-    default List<ProductSpuDO> selectList(SpuExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<ProductSpuDO>()
-                .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
-                .eqIfPresent(ProductSpuDO::getSellPoint, reqVO.getSellPoint())
-                .eqIfPresent(ProductSpuDO::getDescription, reqVO.getDescription())
-                .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
-                .eqIfPresent(ProductSpuDO::getPicUrls, reqVO.getPicUrls())
-                .eqIfPresent(ProductSpuDO::getSort, reqVO.getSort())
-                .eqIfPresent(ProductSpuDO::getLikeCount, reqVO.getLikeCount())
-                .eqIfPresent(ProductSpuDO::getPrice, reqVO.getPrice())
-                .eqIfPresent(ProductSpuDO::getQuantity, reqVO.getQuantity())
+//                .eqIfPresent(ProductSpuDO::getQuantity, reqVO.getQuantity())
                 .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ProductSpuDO::getId));
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index 0396506ef..1f5f191e1 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -64,14 +64,6 @@ public interface ProductSkuService {
      */
     PageResult<ProductSkuDO> getSkuPage(ProductSkuPageReqVO pageReqVO);
 
-    /**
-     * 获得商品sku列表, 用于 Excel 导出
-     *
-     * @param exportReqVO 查询条件
-     * @return 商品sku列表
-     */
-    List<ProductSkuDO> getSkuList(ProductSkuExportReqVO exportReqVO);
-
     /**
      * 对 sku 的组合的属性等进行合法性校验
      *
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 91a60929b..d15aa5c47 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -84,11 +84,6 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         return productSkuMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public List<ProductSkuDO> getSkuList(ProductSkuExportReqVO exportReqVO) {
-        return productSkuMapper.selectList(exportReqVO);
-    }
-
     // TODO @franky：这个方法，貌似实现的还是有点问题哈。例如说，throw 异常，后面还执行逻辑~
     // TODO @艿艿 咳咳，throw 那里我是偷懒省略了{}，哈哈，我加上，然后我调试下，在优化下
     @Override
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
index e66f93fd0..1cf9b79d4 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
@@ -1,12 +1,17 @@
 package cn.iocoder.yudao.module.product.service.spu;
 
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 商品spu Service 接口
@@ -61,14 +66,6 @@ public interface ProductSpuService {
      */
     PageResult<SpuRespVO> getSpuPage(SpuPageReqVO pageReqVO);
 
-    /**
-     * 获得商品spu列表, 用于 Excel 导出
-     *
-     * @param exportReqVO 查询条件
-     * @return 商品spu列表
-     */
-    List<ProductSpuDO> getSpuList(SpuExportReqVO exportReqVO);
-
     /**
      * 获得商品spu分页
      *
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index ea4afb2e7..49847f720 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -171,11 +171,6 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         return spuVOs;
     }
 
-    @Override
-    public List<ProductSpuDO> getSpuList(SpuExportReqVO exportReqVO) {
-        return ProductSpuMapper.selectList(exportReqVO);
-    }
-
     @Override
     public PageResult<AppSpuPageRespVO> getSpuPage(AppSpuPageReqVO pageReqVO) {
         PageResult<ProductSpuDO> productSpuDOPageResult = ProductSpuMapper.selectPage(ProductSpuConvert.INSTANCE.convert(pageReqVO));
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
index 27d5e140b..8cd086e81 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
@@ -1,24 +1,23 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
 
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
-import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import org.springframework.context.annotation.Import;
-import java.util.*;
-
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -107,7 +106,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
            o.setProperties(null);
            o.setPrice(null);
            o.setOriginalPrice(null);
-           o.setCostPrice(null);
+//           o.setCostPrice(null);
            o.setBarCode(null);
            o.setPicUrl(null);
            o.setStatus(null);
@@ -123,7 +122,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
        // 测试 originalPrice 不匹配
        ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setOriginalPrice(null)));
        // 测试 costPrice 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCostPrice(null)));
+//       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCostPrice(null)));
        // 测试 barCode 不匹配
        ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setBarCode(null)));
        // 测试 picUrl 不匹配
@@ -152,57 +151,4 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
        assertPojoEquals(dbSku, pageResult.getList().get(0));
     }
 
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetSkuList() {
-       // mock 数据
-       ProductSkuDO dbSku = randomPojo(ProductSkuDO.class, o -> { // 等会查询到
-           o.setSpuId(null);
-           o.setProperties(null);
-           o.setPrice(null);
-           o.setOriginalPrice(null);
-           o.setCostPrice(null);
-           o.setBarCode(null);
-           o.setPicUrl(null);
-           o.setStatus(null);
-           o.setCreateTime(null);
-       });
-       ProductSkuMapper.insert(dbSku);
-       // 测试 spuId 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSpuId(null)));
-       // 测试 properties 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setProperties(null)));
-       // 测试 price 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPrice(null)));
-       // 测试 originalPrice 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setOriginalPrice(null)));
-       // 测试 costPrice 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCostPrice(null)));
-       // 测试 barCode 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setBarCode(null)));
-       // 测试 picUrl 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPicUrl(null)));
-       // 测试 status 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setStatus(null)));
-       // 测试 createTime 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCreateTime(null)));
-       // 准备参数
-        ProductSkuExportReqVO reqVO = new ProductSkuExportReqVO();
-       reqVO.setSpuId(null);
-       reqVO.setProperties(null);
-       reqVO.setPrice(null);
-       reqVO.setOriginalPrice(null);
-       reqVO.setCostPrice(null);
-       reqVO.setBarCode(null);
-       reqVO.setPicUrl(null);
-       reqVO.setStatus(null);
-       reqVO.setCreateTime(null);
-
-       // 调用
-       List<ProductSkuDO> list = ProductSkuService.getSkuList(reqVO);
-       // 断言
-       assertEquals(1, list.size());
-       assertPojoEquals(dbSku, list.get(0));
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
index fae41788f..ef2372ac9 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
@@ -1,30 +1,25 @@
 package cn.iocoder.yudao.module.product.service.spu;
 
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import javax.annotation.Resource;
-
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import org.springframework.context.annotation.Import;
-import java.util.*;
 
-import static cn.hutool.core.util.RandomUtil.*;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
 
 /**
 * {@link ProductSpuServiceImpl} 的单元测试类
@@ -114,9 +109,9 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
            o.setCategoryId(null);
            o.setPicUrls(null);
            o.setSort(null);
-           o.setLikeCount(null);
+//           o.setLikeCount(null);
            o.setPrice(null);
-           o.setQuantity(null);
+//           o.setQuantity(null);
            o.setStatus(null);
            o.setCreateTime(null);
        });
@@ -134,11 +129,11 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
        // 测试 sort 不匹配
        ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setSort(null)));
        // 测试 likeCount 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setLikeCount(null)));
+//       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setLikeCount(null)));
        // 测试 price 不匹配
        ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null)));
        // 测试 quantity 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null)));
+//       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null)));
        // 测试 status 不匹配
        ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setStatus(null)));
        // 测试 createTime 不匹配
@@ -165,65 +160,4 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
        assertPojoEquals(dbSpu, pageResult.getList().get(0));
     }
 
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetSpuList() {
-       // mock 数据
-       ProductSpuDO dbSpu = randomPojo(ProductSpuDO.class, o -> { // 等会查询到
-           o.setName(null);
-           o.setSellPoint(null);
-           o.setDescription(null);
-           o.setCategoryId(null);
-           o.setPicUrls(null);
-           o.setSort(null);
-           o.setLikeCount(null);
-           o.setPrice(null);
-           o.setQuantity(null);
-           o.setStatus(null);
-           o.setCreateTime(null);
-       });
-       ProductSpuMapper.insert(dbSpu);
-       // 测试 name 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setName(null)));
-       // 测试 sellPoint 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setSellPoint(null)));
-       // 测试 description 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setDescription(null)));
-       // 测试 categoryId 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCategoryId(null)));
-       // 测试 picUrls 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPicUrls(null)));
-       // 测试 sort 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setSort(null)));
-       // 测试 likeCount 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setLikeCount(null)));
-       // 测试 price 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null)));
-       // 测试 quantity 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null)));
-       // 测试 status 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setStatus(null)));
-       // 测试 createTime 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCreateTime(null)));
-       // 准备参数
-       SpuExportReqVO reqVO = new SpuExportReqVO();
-       reqVO.setName(null);
-       reqVO.setSellPoint(null);
-       reqVO.setDescription(null);
-       reqVO.setCategoryId(null);
-       reqVO.setPicUrls(null);
-       reqVO.setSort(null);
-       reqVO.setLikeCount(null);
-       reqVO.setPrice(null);
-       reqVO.setQuantity(null);
-       reqVO.setStatus(null);
-       reqVO.setCreateTime(null);
-
-       // 调用
-       List<ProductSpuDO> list = spuService.getSpuList(reqVO);
-       // 断言
-       assertEquals(1, list.size());
-       assertPojoEquals(dbSpu, list.get(0));
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
index 7f49a968e..2eed29cf9 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
@@ -82,9 +82,14 @@ public class CartItemDO extends BaseDO {
 //     * 商品营销活动类型
 //     */
 //    private Integer activityType;
+    // TODO 芋艿：combination_id 拼团 ID
+    // TODO 芋艿：seckill_id 秒杀产品 ID
+    // TODO 芋艿：bargain_id 砍价 ID
 
     // ========= 优惠信息 END =========
 
-    // TODO 芋艿：distribution_card_no
+    // TODO 芋艿：distribution_card_no 推广员
+    // TODO 芋艿：is_pay 未购买、已购买
+    // TODO 芋艿：is_new 是否立即购买
 
 }
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
index 2fbb61c8b..1e77db1c8 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
@@ -22,6 +22,5 @@ public interface ErrorCodeConstants {
 
     // ========== 用户收件地址 1004004000 ==========
     ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在");
-    ErrorCode ADDRESS_FORBIDDEN = new ErrorCode(1004004001, "没有该操作权限");
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http
index 7f943448a..6bae7c7eb 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http
@@ -2,53 +2,53 @@
 POST {{appApi}}//member/address/create
 Content-Type: application/json
 tenant-id: {{appTenentId}}
-Authorization: Bearer 2510e2e4287346eb8e36353a55e27fd6
+Authorization: Bearer {{appToken}}
 
 {
-  "userId": "245",
   "name": "yunai",
   "mobile": "15601691300",
-  "areaCode": "610632",
+  "areaId": "610632",
+  "postCode": "200000",
   "detailAddress": "芋道源码 233 号 666 室",
-  "type": "1"
+  "defaulted": true
 }
 
 ### 请求 /update 接口 => 成功
 PUT {{appApi}}//member/address/update
 Content-Type: application/json
 tenant-id: {{appTenentId}}
-Authorization: Bearer 2510e2e4287346eb8e36353a55e27fd6
+Authorization: Bearer {{appToken}}
 
 {
   "id": "1",
-  "userId": "245",
   "name": "yunai888",
   "mobile": "15601691300",
-  "areaCode": "610632",
+  "areaId": "610632",
+  "postCode": "200000",
   "detailAddress": "芋道源码 233 号 666 室",
-  "type": "1"
+  "defaulted": false
 }
 
 ### 请求 /delete 接口 => 成功
 DELETE {{appApi}}//member/address/delete?id=2
 Content-Type: application/json
 tenant-id: {{appTenentId}}
-Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
+Authorization: Bearer {{appToken}}
 
 ### 请求 /get 接口 => 成功
 GET {{appApi}}//member/address/get?id=1
 Content-Type: application/json
 tenant-id: {{appTenentId}}
-Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
+Authorization: Bearer {{appToken}}
 
 ### 请求 /get-default 接口 => 成功
 GET {{appApi}}//member/address/get-default
 Content-Type: application/json
 tenant-id: {{appTenentId}}
-Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
+Authorization: Bearer {{appToken}}
 
 ### 请求 /list 接口 => 成功
 GET {{appApi}}//member/address/list
 Content-Type: application/json
 tenant-id: {{appTenentId}}
-Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
\ No newline at end of file
+Authorization: Bearer {{appToken}}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
index 81231a881..8cfbac7d2 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.member.controller.app.address.vo;
 
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.member.enums.AddressTypeEnum;
-import lombok.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
 * 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -21,17 +21,20 @@ public class AppAddressBaseVO {
     @NotNull(message = "手机号不能为空")
     private String mobile;
 
-    @ApiModelProperty(value = "地区编码", required = true)
-    @NotNull(message = "地区编码不能为空")
-    private Integer areaCode;
+    @ApiModelProperty(value = "地区编号", required = true)
+    @NotNull(message = "地区编号不能为空")
+    private Long areaId;
+
+    @ApiModelProperty(value = "邮编", required = true)
+    @NotEmpty(message = "邮编不能为空")
+    private String postCode;
 
     @ApiModelProperty(value = "收件详细地址", required = true)
     @NotNull(message = "收件详细地址不能为空")
     private String detailAddress;
 
-    @ApiModelProperty(value = "地址类型", required = true)
-    @NotNull(message = "地址类型不能为空")
-    @InEnum(AddressTypeEnum.class)
-    private Integer type;
+    @ApiModelProperty(value = "是否默认地址", required = true)
+    @NotNull(message = "是否默认地址不能为空")
+    private Boolean defaulted;
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
index d470e8f90..467432460 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
@@ -39,7 +39,7 @@ public class AddressDO extends BaseDO {
     /**
      * 地区编号
      */
-    private Integer areaId;
+    private Long areaId;
     /**
      * 邮编
      */
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
index fc02e5879..80f78d41f 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
@@ -1,64 +1,22 @@
 package cn.iocoder.yudao.module.member.dal.mysql.address;
 
-
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
-import cn.iocoder.yudao.module.member.enums.AddressTypeEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-/**
- * 用户收件地址 Mapper
- *
- * @author 芋道源码
- */
 @Mapper
 public interface AddressMapper extends BaseMapperX<AddressDO> {
 
-    /**
-     * 获取当前地址 根据id和userId
-     * @param userId
-     * @param id
-     * @return
-     */
-    default AddressDO getAddressByIdAndUserId(Long userId, Long id) {
-        QueryWrapperX<AddressDO> queryWrapperX = new QueryWrapperX<>();
-        queryWrapperX.eq("user_id", userId).eq("id", id);
-        return selectList(queryWrapperX).stream().findFirst().orElse(null);
+    default AddressDO selectByIdAndUserId(Long id, Long userId) {
+        return selectOne(AddressDO::getId, id, AddressDO::getUserId, userId);
     }
 
-    /**
-     * 获取地址列表
-     * @param userId
-     * @param type
-     * @return
-     */
-    default List<AddressDO> selectListByUserIdAndType(Long userId, Integer type) {
-        QueryWrapperX<AddressDO> queryWrapperX = new QueryWrapperX<AddressDO>().eq("user_id", userId)
-                .eqIfPresent("type", type);
-        return selectList(queryWrapperX);
-    }
-
-    /**
-     * 获取默认地址
-     * @param userId
-     * @return
-     */
-    default AddressDO getDefaultUserAddress(Long userId) {
-        List<AddressDO> addressDOList = selectListByUserIdAndType(userId, AddressTypeEnum.DEFAULT.getType());
-        return addressDOList.stream().findFirst().orElse(null);
-    }
-
-    /**
-     * 获取默认地址
-     * @param id
-     * @param addressTypeEnum
-     * @return
-     */
-    default int updateTypeById(Long id, AddressTypeEnum addressTypeEnum) {
-       return updateById(new AddressDO().setId(id).setType(addressTypeEnum.getType()));
+    default List<AddressDO> selectListByUserIdAndDefaulted(Long userId, Boolean defaulted) {
+        return selectList(new LambdaQueryWrapperX<AddressDO>().eq(AddressDO::getUserId, userId)
+                .eqIfPresent(AddressDO::getDefaulted, defaulted));
     }
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
index e45b075fe..456a3d8ac 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
@@ -1,10 +1,11 @@
 package cn.iocoder.yudao.module.member.service.address;
 
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.member.controller.app.address.vo.*;
+import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
+import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 用户收件地址 Service 接口
@@ -55,5 +56,12 @@ public interface AddressService {
      */
     List<AddressDO> getAddressList(Long userId);
 
+    /**
+     * 获得用户默认的收件地址
+     *
+     * @param userId 用户编号
+     * @return 用户收件地址
+     */
     AddressDO getDefaultUserAddress(Long userId);
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
index a9cd91d59..bbcbbe592 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
@@ -1,23 +1,20 @@
 package cn.iocoder.yudao.module.member.service.address;
 
-import cn.iocoder.yudao.module.member.enums.AddressTypeEnum;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
+import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
+import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
+import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-import cn.iocoder.yudao.module.member.controller.app.address.vo.*;
-import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
-
-import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
-import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
+import javax.annotation.Resource;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ADDRESS_NOT_EXISTS;
 
 /**
  * 用户收件地址 Service 实现类
@@ -35,18 +32,11 @@ public class AddressServiceImpl implements AddressService {
     @Transactional(rollbackFor = Exception.class)
     public Long createAddress(Long userId, AppAddressCreateReqVO createReqVO) {
         // 如果添加的是默认收件地址，则将原默认地址修改为非默认
-        if (AddressTypeEnum.DEFAULT.getType().equals(createReqVO.getType())) {
-            //查询到一个，然后进行 update
-            List<AddressDO> addressDOs = selectListByUserIdAndType(userId, AddressTypeEnum.DEFAULT.getType());
-            AddressDO defaultUserAddress = addressMapper.getDefaultUserAddress(userId);
-            if (!CollectionUtils.isEmpty(addressDOs)) {
-                addressDOs.forEach(userAddressDO -> addressMapper.updateById(new AddressDO()
-                        .setId(userAddressDO.getId()).setType(AddressTypeEnum.NORMAL.getType())));
-            }
-            Optional.ofNullable(defaultUserAddress)
-                    //更新为非默认
-                    .ifPresent( u -> addressMapper.updateTypeById(u.getId(), AddressTypeEnum.NORMAL));
+        if (Boolean.TRUE.equals(createReqVO.getDefaulted())) {
+            List<AddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
+            addresses.forEach(address -> addressMapper.updateById(new AddressDO().setId(address.getId()).setDefaulted(false)));
         }
+
         // 插入
         AddressDO address = AddressConvert.INSTANCE.convert(createReqVO);
         address.setUserId(userId);
@@ -59,17 +49,15 @@ public class AddressServiceImpl implements AddressService {
     @Transactional(rollbackFor = Exception.class)
     public void updateAddress(Long userId, AppAddressUpdateReqVO updateReqVO) {
         // 校验存在,校验是否能够操作
-        check(userId, updateReqVO.getId());
+        validAddressExists(userId, updateReqVO.getId());
+
         // 如果修改的是默认收件地址，则将原默认地址修改为非默认
-        if (AddressTypeEnum.DEFAULT.getType().equals(updateReqVO.getType())) {
-            //获取默认地址
-            AddressDO defaultUserAddress = addressMapper.getDefaultUserAddress(userId);
-            Optional.ofNullable(defaultUserAddress)
-                    //排除当前地址
-                    .filter(u -> !u.getId().equals(updateReqVO.getId()))
-                    //更新为非默认
-                    .ifPresent( u -> addressMapper.updateTypeById(u.getId(), AddressTypeEnum.NORMAL));
+        if (Boolean.TRUE.equals(updateReqVO.getDefaulted())) {
+            List<AddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
+            addresses.stream().filter(u -> !u.getId().equals(updateReqVO.getId())) // 排除自己
+                    .forEach(address -> addressMapper.updateById(new AddressDO().setId(address.getId()).setDefaulted(false)));
         }
+
         // 更新
         AddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO);
         addressMapper.updateById(updateObj);
@@ -78,56 +66,32 @@ public class AddressServiceImpl implements AddressService {
     @Override
     public void deleteAddress(Long userId, Long id) {
         // 校验存在,校验是否能够操作
-        check(userId, id);
+        validAddressExists(userId, id);
         // 删除
         addressMapper.deleteById(id);
     }
 
-    /**
-     * 校验用户收件地址是不是属于该用户
-     *
-     * @param userId 用户编号
-     * @param userAddressId 用户收件地址
-     */
-    private void check(Long userId, Long userAddressId) {
-        AddressDO addressDO = getAddress(userId, userAddressId);
-        if(null == addressDO){
+    private void validAddressExists(Long userId, Long id) {
+        AddressDO addressDO = getAddress(userId, id);
+        if (addressDO == null) {
             throw exception(ADDRESS_NOT_EXISTS);
         }
-        if (!addressDO.getUserId().equals(userId)) {
-            throw exception(ADDRESS_FORBIDDEN);
-        }
     }
 
     @Override
     public AddressDO getAddress(Long userId, Long id) {
-        return addressMapper.getAddressByIdAndUserId(userId, id);
+        return addressMapper.selectByIdAndUserId(id, userId);
     }
 
     @Override
     public List<AddressDO> getAddressList(Long userId) {
-        return selectListByUserIdAndType(userId, null);
+        return addressMapper.selectListByUserIdAndDefaulted(userId, null);
     }
 
-    /**
-     * 获取默认地址
-     * @param userId
-     * @return
-     */
     @Override
     public AddressDO getDefaultUserAddress(Long userId) {
-        return addressMapper.getDefaultUserAddress(userId);
+        List<AddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
+        return CollUtil.getFirst(addresses);
     }
 
-    /**
-     * 根据类型获取地址列表
-     * @param userId
-     * @param type null则查询全部
-     * @return
-     */
-    public List<AddressDO> selectListByUserIdAndType(Long userId, Integer type) {
-        return addressMapper.selectListByUserIdAndType(userId, type);
-    }
-
-
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java b/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
index eefa2e13e..6ddf80a0e 100644
--- a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
+++ b/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
@@ -5,20 +5,18 @@ import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreate
 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
 import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
 
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ADDRESS_NOT_EXISTS;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
 * {@link AddressServiceImpl} 的单元测试类
@@ -40,7 +38,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
         AppAddressCreateReqVO reqVO = randomPojo(AppAddressCreateReqVO.class);
 
         // 调用
-        Long addressId = addressService.createAddress(getLoginUserId(), reqVO);
+        Long addressId = addressService.createAddress(randomLongId(), reqVO);
         // 断言
         assertNotNull(addressId);
         // 校验记录的属性是否正确
@@ -59,7 +57,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
         });
 
         // 调用
-        addressService.updateAddress(getLoginUserId(), reqVO);
+        addressService.updateAddress(dbAddress.getUserId(), reqVO);
         // 校验是否更新正确
         AddressDO address = addressMapper.selectById(reqVO.getId()); // 获取最新的
         assertPojoEquals(reqVO, address);
@@ -71,7 +69,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
         AppAddressUpdateReqVO reqVO = randomPojo(AppAddressUpdateReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> addressService.updateAddress(getLoginUserId(), reqVO), ADDRESS_NOT_EXISTS);
+        assertServiceException(() -> addressService.updateAddress(randomLongId(), reqVO), ADDRESS_NOT_EXISTS);
     }
 
     @Test
@@ -83,7 +81,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
         Long id = dbAddress.getId();
 
         // 调用
-        addressService.deleteAddress(getLoginUserId(), id);
+        addressService.deleteAddress(dbAddress.getUserId(), id);
        // 校验数据不存在了
        assertNull(addressMapper.selectById(id));
     }
@@ -94,67 +92,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> addressService.deleteAddress(getLoginUserId(), id), ADDRESS_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void ins() {
-       // mock 数据
-       AddressDO dbAddress = randomPojo(AddressDO.class, o -> { // 等会查询到
-           o.setUserId(null);
-           o.setName(null);
-           o.setMobile(null);
-           o.setAreaCode(null);
-           o.setDetailAddress(null);
-           o.setType(null);
-           o.setCreateTime(null);
-       });
-       addressMapper.insert(dbAddress);
-       // 测试 userId 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setUserId(null)));
-       // 测试 name 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setName(null)));
-       // 测试 mobile 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setMobile(null)));
-       // 测试 areaCode 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setAreaCode(null)));
-       // 测试 detailAddress 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setDetailAddress(null)));
-       // 测试 type 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setType(null)));
-       // 测试 createTime 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setCreateTime(null)));
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetAddressList() {
-       // mock 数据
-       AddressDO dbAddress = randomPojo(AddressDO.class, o -> { // 等会查询到
-           o.setUserId(null);
-           o.setName(null);
-           o.setMobile(null);
-           o.setAreaCode(null);
-           o.setDetailAddress(null);
-           o.setType(null);
-           o.setCreateTime(null);
-       });
-       addressMapper.insert(dbAddress);
-       // 测试 userId 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setUserId(null)));
-       // 测试 name 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setName(null)));
-       // 测试 mobile 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setMobile(null)));
-       // 测试 areaCode 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setAreaCode(null)));
-       // 测试 detailAddress 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setDetailAddress(null)));
-       // 测试 type 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setType(null)));
-       // 测试 createTime 不匹配
-       addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setCreateTime(null)));
+        assertServiceException(() -> addressService.deleteAddress(randomLongId(), id), ADDRESS_NOT_EXISTS);
     }
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql b/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
index 608a3bddf..b0347b058 100644
--- a/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
@@ -35,15 +35,15 @@ CREATE TABLE IF NOT EXISTS "member_address" (
     "user_id" bigint(20) NOT NULL,
     "name" varchar(10) NOT NULL,
     "mobile" varchar(20) NOT NULL,
-    "area_code" int(11) NOT NULL,
+    "area_id" bigint(20) NOT NULL,
+    "post_code" varchar(16) NOT NULL,
     "detail_address" varchar(250) NOT NULL,
-    "type" tinyint(4) NOT NULL,
+    "defaulted" bit NOT NULL,
     "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "creator" varchar(64) DEFAULT '',
     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     "deleted" bit NOT NULL DEFAULT FALSE,
     "updater" varchar(64) DEFAULT '',
-    "tenant_id" bigint(20) NOT NULL,
     PRIMARY KEY ("id")
-    ) COMMENT '用户收件地址';
+) COMMENT '用户收件地址';
 

From 75d2b9a19e6fe773610d644f06ec3bc747591d72 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 1 Aug 2022 23:02:14 +0800
Subject: [PATCH 16/56] =?UTF-8?q?mall=EF=BC=9A=E5=90=8C=E6=AD=A5=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=20SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/mall.sql | 399 +++++++++++++++++++++++++------------
 1 file changed, 277 insertions(+), 122 deletions(-)

diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql
index 41c495a53..e61b217e8 100644
--- a/sql/optional/mall/mall.sql
+++ b/sql/optional/mall/mall.sql
@@ -1,7 +1,7 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : 127.0.0.1
+ Source Server         : 127.0.0.1 MySQL
  Source Server Type    : MySQL
  Source Server Version : 80026
  Source Host           : localhost:3306
@@ -11,135 +11,290 @@
  Target Server Version : 80026
  File Encoding         : 65001
 
- Date: 05/02/2022 00:50:30
+ Date: 01/08/2022 23:01:36
 */
-SET
-FOREIGN_KEY_CHECKS = 0;
+
 SET NAMES utf8mb4;
-
--- ----------------------------
--- Table structure for product_category
--- ----------------------------
-
--- ----------------------------
--- Table structure for product_brand
--- ----------------------------
+SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
 -- Table structure for market_activity
 -- ----------------------------
 DROP TABLE IF EXISTS `market_activity`;
-CREATE TABLE `market_activity`
-(
-    `id`                    bigint      NOT NULL AUTO_INCREMENT COMMENT '活动编号',
-    `title`                 varchar(50) NOT NULL DEFAULT '' COMMENT '活动标题',
-    `activity_type`         tinyint(4) NOT NULL COMMENT '活动类型',
-    `status`                tinyint(4) NOT NULL DEFAULT '-1' COMMENT '活动状态',
-    `start_time`            datetime    NOT NULL COMMENT '开始时间',
-    `end_time`              datetime    NOT NULL COMMENT '结束时间',
-    `invalid_time`          datetime             DEFAULT NULL COMMENT '失效时间',
-    `delete_time`           datetime             DEFAULT NULL COMMENT '删除时间',
-    `time_limited_discount` varchar(2000)        DEFAULT NULL COMMENT '限制折扣字符串，使用 JSON 序列化成字符串存储',
-    `full_privilege`        varchar(2000)        DEFAULT NULL COMMENT '限制折扣字符串，使用 JSON 序列化成字符串存储',
-    `creator`               varchar(64)          DEFAULT '' COMMENT '创建者',
-    `create_time`           datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`               varchar(64)          DEFAULT '' COMMENT '更新者',
-    `update_time`           datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`               bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`             bigint      NOT NULL DEFAULT '0' COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销活动';
-
-
--- 规格菜单 SQL
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('规格管理', '', 2, 3, 2001, 'property', '', 'mall/product/property/index', 0);
-
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
-
--- 按钮 SQL
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('规格查询', 'product:property:query', 3, 1, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('规格创建', 'product:property:create', 3, 2, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('规格更新', 'product:property:update', 3, 3, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('规格删除', 'product:property:delete', 3, 4, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('规格导出', 'product:property:export', 3, 5, @parentId, '', '', '', 0);
-
-
-
-
--- 规格名称表
-drop table if exists product_property;
-create table product_property
-(
-    id          bigint NOT NULL AUTO_INCREMENT comment '主键',
-    name        varchar(64) comment '规格名称',
-    status      tinyint comment '状态： 0 开启 ，1 禁用',
-    create_time datetime        default current_timestamp comment '创建时间',
-    update_time datetime        default current_timestamp on update current_timestamp comment '更新时间',
-    creator     varchar(64) comment '创建人',
-    updater     varchar(64) comment '更新人',
-    tenant_id   bigint NOT NULL DEFAULT '0' COMMENT '租户编号',
-    deleted   bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    primary key (id),
-    key         idx_name ( name (32)) comment '规格名称索引'
-) comment '规格名称' character set utf8mb4
-                 collate utf8mb4_general_ci;
-
--- 规格值表
-drop table if exists product_property_value;
-create table product_property_value
-(
-    id          bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-    property_id bigint comment '规格键id',
-    name        varchar(128) comment '规格值名字',
-    status      tinyint comment '状态： 1 开启 ，2 禁用',
-    create_time datetime        default current_timestamp comment '创建时间',
-    update_time datetime        default current_timestamp on update current_timestamp comment '更新时间',
-    creator     varchar(64) comment '创建人',
-    updater     varchar(64) comment '更新人',
-    tenant_id   bigint NOT NULL DEFAULT '0' COMMENT '租户编号',
-    deleted   bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    primary key (id)
-) comment '规格值' character set utf8mb4
-                collate utf8mb4_general_ci;
-
-
-
----Market-Banner管理SQL
-drop table if exists market_banner;
-CREATE TABLE `market_banner` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Banner编号',
-  `title` varchar(64) NOT NULL DEFAULT '' COMMENT 'Banner标题',
-  `pic_url` varchar(255) NOT NULL COMMENT '图片URL',
-  `status` tinyint(4) NOT NULL DEFAULT '-1' COMMENT '活动状态',
-  `url` varchar(255) NOT NULL COMMENT '跳转地址',
-  `creator` varchar(64) DEFAULT '' COMMENT '创建者',
+CREATE TABLE `market_activity`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '活动编号',
+  `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '活动标题',
+  `activity_type` tinyint NOT NULL COMMENT '活动类型',
+  `status` tinyint NOT NULL DEFAULT -1 COMMENT '活动状态',
+  `start_time` datetime NOT NULL COMMENT '开始时间',
+  `end_time` datetime NOT NULL COMMENT '结束时间',
+  `invalid_time` datetime NULL DEFAULT NULL COMMENT '失效时间',
+  `delete_time` datetime NULL DEFAULT NULL COMMENT '删除时间',
+  `time_limited_discount` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '限制折扣字符串，使用 JSON 序列化成字符串存储',
+  `full_privilege` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '限制折扣字符串，使用 JSON 序列化成字符串存储',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `updater` varchar(64) DEFAULT '' COMMENT '更新者',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-  `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
-  `sort` tinyint(4) DEFAULT NULL COMMENT '排序',
-  `memo` varchar(255) DEFAULT NULL COMMENT '描述',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='Banner管理';
--- 菜单 SQL
-INSERT INTO `system_menu`(`id`,`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES (2002, 'Banner管理', '', 2, 1, 2000, 'brand', '', 'mall/market/banner/index', 0);
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
--- 按钮 SQL
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('Banner查询', 'market:banner:query', 3, 1, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('Banner创建', 'market:banner:create', 3, 2, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('Banner更新', 'market:banner:update', 3, 3, @parentId, '', '', '', 0);
-INSERT INTO `system_menu`(`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES ('Banner删除', 'market:banner:delete', 3, 4, @parentId, '', '', '', 0);
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '促销活动';
+
+-- ----------------------------
+-- Records of market_activity
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for market_banner
+-- ----------------------------
+DROP TABLE IF EXISTS `market_banner`;
+CREATE TABLE `market_banner`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'Banner编号',
+  `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT 'Banner标题',
+  `pic_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '图片URL',
+  `status` tinyint NOT NULL DEFAULT -1 COMMENT '活动状态',
+  `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '跳转地址',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  `sort` tinyint NULL DEFAULT NULL COMMENT '排序',
+  `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '描述',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'Banner管理';
+
+-- ----------------------------
+-- Records of market_banner
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for member_address
+-- ----------------------------
+DROP TABLE IF EXISTS `member_address`;
+CREATE TABLE `member_address`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '收件地址编号',
+  `user_id` bigint NOT NULL COMMENT '用户编号',
+  `name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '收件人名称',
+  `mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '手机号',
+  `area_id` bigint NOT NULL COMMENT '地区编码',
+  `post_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '邮编',
+  `detail_address` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '收件详细地址',
+  `defaulted` bit(1) NOT NULL COMMENT '是否默认',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_userId`(`user_id` ASC) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户收件地址';
+
+-- ----------------------------
+-- Records of member_address
+-- ----------------------------
+BEGIN;
+INSERT INTO `member_address` (`id`, `user_id`, `name`, `mobile`, `area_id`, `post_code`, `detail_address`, `defaulted`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (21, 1, 'yunai', '15601691300', 610632, '200000', '芋道源码 233 号 666 室', b'1', '1', '2022-08-01 22:46:35', '1', '2022-08-01 22:46:35', b'0', 1);
+COMMIT;
+
+-- ----------------------------
+-- Table structure for product_brand
+-- ----------------------------
+DROP TABLE IF EXISTS `product_brand`;
+CREATE TABLE `product_brand`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '品牌编号',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '品牌名称',
+  `pic_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '品牌图片',
+  `sort` int NULL DEFAULT 0 COMMENT '品牌排序',
+  `description` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '品牌描述',
+  `status` tinyint NOT NULL COMMENT '状态',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商品品牌';
+
+-- ----------------------------
+-- Records of product_brand
+-- ----------------------------
+BEGIN;
+INSERT INTO `product_brand` (`id`, `name`, `pic_url`, `sort`, `description`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '苹果', 'http://test.yudao.iocoder.cn/e3726713fa56db5717c78c011762fcc7a251db12735c3581470638b8e1fa17e2.jpeg', 0, '是上市', 0, '1', '2022-07-30 22:12:18', '1', '2022-07-30 22:13:55', b'0', 1);
+COMMIT;
+
+-- ----------------------------
+-- Table structure for product_category
+-- ----------------------------
+DROP TABLE IF EXISTS `product_category`;
+CREATE TABLE `product_category`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '分类编号',
+  `parent_id` bigint NOT NULL COMMENT '父分类编号',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '分类名称',
+  `pic_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '分类图片',
+  `sort` int NULL DEFAULT 0 COMMENT '分类排序',
+  `description` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '分类描述',
+  `status` tinyint NOT NULL COMMENT '开启状态',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商品分类';
+
+-- ----------------------------
+-- Records of product_category
+-- ----------------------------
+BEGIN;
+INSERT INTO `product_category` (`id`, `parent_id`, `name`, `pic_url`, `sort`, `description`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 0, '电脑办公', 'http://test.yudao.iocoder.cn/122d548e1b3cd5dec72fe8075c6977a70f9cc13541a684ab3685f1b5df42f6bd.jpeg', 1, '1234', 0, '1', '2022-07-30 16:36:35', '1', '2022-07-30 20:27:16', b'0', 1), (2, 1, '笔记本', 'http://test.yudao.iocoder.cn/72713ac7b947600a019a18786ed0e6562e8692e253dbd35110a0a85c2469bbec.jpg', 1, '<p>测试一下</p>', 0, '1', '2022-07-30 16:38:09', '1', '2022-07-30 16:38:09', b'0', 1), (3, 1, '游戏本', 'http://test.yudao.iocoder.cn/287c50dd9f5f575f57329a0c57b2095be6d1aeba83867b905fe549f54a296feb.jpg', 2, '<p>测试一下</p>', 0, '1', '2022-07-30 16:39:09', '1', '2022-07-30 20:26:59', b'0', 1), (4, 0, '手机', 'http://test.yudao.iocoder.cn/e1b63900c78dbb661b3e383960cee5cfea7e1dd2fb22cff2e317ff025faaf8b2.jpeg', 2, '<p>123</p>', 0, '1', '2022-07-30 16:40:00', '1', '2022-07-30 16:40:09', b'0', 1), (5, 4, '5G手机', 'http://test.yudao.iocoder.cn/3af6557ac7def6423f046f5b2e920b644793420b466959aaa996a2e19068bbde.jpeg', 1, '<p><br></p>', 0, '1', '2022-07-30 16:43:00', '1', '2022-07-30 16:43:00', b'0', 1), (6, 4, '游戏手机', 'http://test.yudao.iocoder.cn/964fe9ccd1710d64ede261dc36d231918a017641986c15293c367f9f66d94d05.jpeg', 2, NULL, 0, '1', '2022-07-30 16:43:44', '1', '2022-07-30 16:43:44', b'0', 1), (7, 5, '厉害的 5G 手机', 'http://test.yudao.iocoder.cn/b287122f277838e8de368769b96217918605743bc45f3a29bda3cc7359dc66e1.png', 0, '123', 0, '1', '2022-07-30 20:38:09', '1', '2022-07-30 20:38:09', b'0', 1);
+COMMIT;
+
+-- ----------------------------
+-- Table structure for product_property
+-- ----------------------------
+DROP TABLE IF EXISTS `product_property`;
+CREATE TABLE `product_property`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规格名称',
+  `status` tinyint NULL DEFAULT NULL COMMENT '状态： 0 开启 ，1 禁用',
+  `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_name`(`name`(32) ASC) USING BTREE COMMENT '规格名称索引'
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '规格名称';
+
+-- ----------------------------
+-- Records of product_property
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for product_property_value
+-- ----------------------------
+DROP TABLE IF EXISTS `product_property_value`;
+CREATE TABLE `product_property_value`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `property_id` bigint NULL DEFAULT NULL COMMENT '规格键id',
+  `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规格值名字',
+  `status` tinyint NULL DEFAULT NULL COMMENT '状态： 1 开启 ，2 禁用',
+  `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '规格值';
+
+-- ----------------------------
+-- Records of product_property_value
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for product_sku
+-- ----------------------------
+DROP TABLE IF EXISTS `product_sku`;
+CREATE TABLE `product_sku`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `spu_id` bigint NOT NULL COMMENT 'spu编号',
+  `properties` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]',
+  `price` int NOT NULL DEFAULT -1 COMMENT '销售价格，单位：分',
+  `original_price` int NOT NULL DEFAULT -1 COMMENT '原价， 单位： 分',
+  `cost_price` int NOT NULL DEFAULT -1 COMMENT '成本价，单位： 分',
+  `bar_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '条形码',
+  `pic_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '图片地址',
+  `status` tinyint NULL DEFAULT NULL COMMENT '状态： 0-正常 1-禁用',
+  `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品sku';
+
+-- ----------------------------
+-- Records of product_sku
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for product_spu
+-- ----------------------------
+DROP TABLE IF EXISTS `product_spu`;
+CREATE TABLE `product_spu`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称',
+  `sell_point` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '卖点',
+  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '描述',
+  `category_id` bigint NOT NULL COMMENT '分类id',
+  `pic_urls` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '商品主图地址\n     *\n     * 数组，以逗号分隔\n 最多上传15张',
+  `sort` int NOT NULL DEFAULT 0 COMMENT '排序字段',
+  `like_count` int NULL DEFAULT NULL COMMENT '点赞初始人数',
+  `price` int NULL DEFAULT NULL COMMENT '价格 单位使用：分',
+  `quantity` int NULL DEFAULT NULL COMMENT '库存数量',
+  `status` bit(1) NULL DEFAULT NULL COMMENT '上下架状态： 0 上架（开启） 1 下架（禁用）',
+  `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品spu';
+
+-- ----------------------------
+-- Records of product_spu
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2000, '商品中心', '', 1, 60, 0, '/product', 'merchant', NULL, 0, b'1', b'1', '', '2022-07-29 15:53:53', '1', '2022-07-30 22:26:19', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2002, '商品分类', '', 2, 2, 2000, 'category', 'dict', 'mall/product/category/index', 0, b'1', b'1', '', '2022-07-29 15:53:53', '1', '2022-07-30 22:23:37', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2003, '分类查询', 'product:category:query', 3, 1, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2004, '分类创建', 'product:category:create', 3, 2, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2005, '分类更新', 'product:category:update', 3, 3, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2006, '分类删除', 'product:category:delete', 3, 4, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2007, '分类导出', 'product:category:export', 3, 5, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-30 13:52:13', b'1');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2008, '商品品牌', '', 2, 1, 2000, 'brand', 'dashboard', 'mall/product/brand/index', 0, b'1', b'1', '', '2022-07-30 13:52:44', '1', '2022-07-30 22:23:43', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2009, '品牌查询', 'product:brand:query', 3, 1, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2010, '品牌创建', 'product:brand:create', 3, 2, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2011, '品牌更新', 'product:brand:update', 3, 3, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2012, '品牌删除', 'product:brand:delete', 3, 4, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2013, '品牌导出', 'product:brand:export', 3, 5, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 14:15:00', b'1');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2014, '商品管理', '', 2, 0, 2000, 'spu', 'link', 'mall/product/spu/index', 0, b'1', b'1', '', '2022-07-30 14:22:58', '1', '2022-07-30 22:26:35', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2015, '商品查询', 'product:spu:query', 3, 1, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2016, '商品创建', 'product:spu:create', 3, 2, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2017, '商品更新', 'product:spu:update', 3, 3, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2018, '商品删除', 'product:spu:delete', 3, 4, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2019, '规格管理', '', 2, 3, 2000, 'property', '', 'mall/product/property/index', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-08-01 14:55:35', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2020, '规格查询', 'product:property:query', 3, 1, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-08-01 14:55:35', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2021, '规格创建', 'product:property:create', 3, 2, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-08-01 14:55:35', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2022, '规格更新', 'product:property:update', 3, 3, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-08-01 14:55:35', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2023, '规格删除', 'product:property:delete', 3, 4, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-08-01 14:55:35', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2024, '规格导出', 'product:property:export', 3, 5, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-08-01 14:55:35', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2025, 'Banner管理', '', 2, 1, 2000, 'brand', '', 'mall/market/banner/index', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2026, 'Banner查询', 'market:banner:query', 3, 1, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2027, 'Banner创建', 'market:banner:create', 3, 2, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2028, 'Banner更新', 'market:banner:update', 3, 3, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2029, 'Banner删除', 'market:banner:delete', 3, 4, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');

From 55bc9b061638d453ae7f340a14861dfcc1df8824 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Wed, 3 Aug 2022 15:55:32 +0800
Subject: [PATCH 17/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/main.js b/yudao-ui-admin/src/main.js
index 680b14585..2ce318cc0 100644
--- a/yudao-ui-admin/src/main.js
+++ b/yudao-ui-admin/src/main.js
@@ -16,7 +16,7 @@ import './permission' // permission control
 import './tongji' // 百度统计
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/infra/config";
-import { parseTime, resetForm, handleTree} from "@/utils/ruoyi";
+import { parseTime, resetForm, handleTree, addBeginAndEndTime} from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
@@ -35,6 +35,7 @@ Vue.prototype.getDictDatas2 = getDictDatas2
 Vue.prototype.getDictDataLabel = getDictDataLabel
 Vue.prototype.DICT_TYPE = DICT_TYPE
 Vue.prototype.handleTree = handleTree
+Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)

From f5037015da0b1239057e6fc0ffba1fa1b9da8081 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 3 Aug 2022 22:30:18 +0800
Subject: [PATCH 18/56] =?UTF-8?q?mall=EF=BC=9A=E4=BC=98=E5=8C=96=20spu?=
 =?UTF-8?q?=E3=80=81sku=20=E7=9A=84=E8=A1=A8=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/sku/ProductSkuDO.java      | 13 +++++++
 .../dal/dataobject/spu/ProductSpuDO.java      | 35 +++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index d1a976afc..ebddbd1aa 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -57,6 +57,10 @@ public class ProductSkuDO extends BaseDO {
      * 原价，单位：分
      */
     private Integer originalPrice;
+    /**
+     * 成本价，单位：分
+     */
+    private Integer costPrice;
     /**
      * SKU 的条形码
      */
@@ -108,5 +112,14 @@ public class ProductSkuDO extends BaseDO {
 
     }
 
+    // TODO ========== 待定字段：yv =========
+    // TODO brokerage：一级返佣
+    // TODO brokerage_two：二级返佣
+    // TODO pink_price：拼团价
+    // TODO pink_stock：拼团库存
+    // TODO seckill_price：秒杀价
+    // TODO seckill_stock：秒杀库存
+    // TODO integral：需要积分
+
 }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index f9863f0f0..8a0b19c22 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.delivery.DeliveryTemplateDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.enums.delivery.DeliveryModeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -101,10 +100,17 @@ public class ProductSpuDO extends BaseDO {
      * 基于其对应的 {@link ProductSkuDO#getActualStocks()} 求和
      */
     private Integer totalStocks;
+
+    // ========== 统计相关字段 =========
+
     /**
-     * 已销售数量
+     * 已销售数量（真实）
      */
-    private Integer soldNum;
+    private Integer soldCount;
+    /**
+     * 浏览量
+     */
+    private Integer visitCount;
 
     // ========== 物流相关字段 =========
 
@@ -121,4 +127,27 @@ public class ProductSpuDO extends BaseDO {
      */
     private Long deliveryTemplateId;
 
+    // TODO ========== 待定字段：yv =========
+    // TODO bar_code 条形码
+    // TODO vip_price 会员价格
+    // TODO postage 邮费
+    // TODO is_postage 是否包邮
+    // TODO unit_name 单位
+    // TODO is_new 商户是否代理
+    // TODO give_integral 获得积分
+    // TODO is_integral 是开启积分兑换
+    // TODO integral 所需积分
+    // TODO is_seckill 秒杀状态
+    // TODO is_bargain 砍价状态
+    // TODO ficti 虚拟销量
+    // TODO code_path 产品二维码地址
+    // TODO is_sub 是否分佣
+
+    // TODO ↓↓ 芋艿 ↓↓ 看起来走分组更合适？
+    // TODO is_hot 是否热卖
+    // TODO is_benefit 是否优惠
+    // TODO is_best 是否精品
+    // TODO is_new 是否新品
+    // TODO is_good 是否优品推荐
+
 }

From fd4cf0c7f7a0422f76adbac8322ed96c8f7921de Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 3 Aug 2022 23:48:56 +0800
Subject: [PATCH 19/56] =?UTF-8?q?mall=EF=BC=9A=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=E7=9A=84=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trade/dal/dataobject/cart/CartItemDO.java |  5 +++
 .../dal/dataobject/order/TradeOrderDO.java    | 31 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
index 2eed29cf9..5722882ce 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
@@ -88,8 +88,13 @@ public class CartItemDO extends BaseDO {
 
     // ========= 优惠信息 END =========
 
+    // TODO 待确定字段：mf
     // TODO 芋艿：distribution_card_no 推广员
     // TODO 芋艿：is_pay 未购买、已购买
     // TODO 芋艿：is_new 是否立即购买
 
+    // TODO 待确定字段: yv
+    // TODO isPay: 是否购买
+    // TODO isNew：是否立即购买
+
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index 72db0bbc5..c0daafa90 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -66,7 +66,7 @@ public class TradeOrderDO extends BaseDO {
     /**
      * 购买的商品数量
      */
-    private Integer productCount;
+    private Integer productCount; // total_num
     /**
      * 备注
      */
@@ -105,7 +105,7 @@ public class TradeOrderDO extends BaseDO {
     /**
      * 物流金额 (分)
      */
-    private Integer logisticsPrice; // freight_amount
+    private Integer logisticsPrice; // freight_amount; freight_price
     /**
      * 最终金额，单位：分
      *
@@ -199,4 +199,31 @@ public class TradeOrderDO extends BaseDO {
 
     // TODO 芋艿，这块还要结合营销和价格计算，在去优化下。
 
+    // TODO ========== 待定字段：yv =========
+    // TODO cart_id：购物车 id
+    // TODO total_postage：邮费
+    // TODO pay_postage：支付邮费
+    // TODO coupon_price：优惠劵金额；
+    // TODO refund_status：0 未退款；1 申请中；2 已退款
+    // TODO refund_reason_wap_img：退款图片
+    // TODO refund_reason_wap_explain：退款用户说明
+    // TODO refund_reason_time：退款时间
+    // TODO refund_reason_wap：前台退款原因
+    // TODO refund_reason：不退款的理由
+    // TODO refund_price：退款金额
+
+    // TODO gain_integral：消费赚取积分
+    // TODO use_integral：使用积分
+    // TODO pay_integral：实际支付积分
+    // TODO back_integral：给用户退了多少积分
+
+    // TODO combination_id：拼团产品id
+    // TODO pink_id：拼团id
+    // TODO seckill_id：秒杀产品ID
+    // TODO bargain_id：砍价id
+
+    // TODO cost：成本价
+    // TODO verify_code：核销码
+    // TODO store_id：门店id
+
 }

From c612487198cabea59bc7529bf1f375d5c6e8c5cf Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 4 Aug 2022 20:39:10 +0800
Subject: [PATCH 20/56] =?UTF-8?q?mall=EF=BC=9A=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=E7=9A=84=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/dal/dataobject/favorite/ProductFavoriteDO.java | 2 ++
 .../module/product/dal/dataobject/sku/ProductSkuDO.java    | 5 +++++
 .../module/product/dal/dataobject/spu/ProductSpuDO.java    | 5 +++++
 .../module/trade/dal/dataobject/order/TradeOrderDO.java    | 5 +++++
 .../trade/dal/dataobject/order/TradeOrderItemDO.java       | 7 +++++++
 5 files changed, 24 insertions(+)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java
index 6e00eaa6c..54d4b31ac 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java
@@ -40,4 +40,6 @@ public class ProductFavoriteDO extends BaseDO {
      */
     private Long spuId;
 
+    // TODO 芋艿：type 1 收藏；2 点赞
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index ebddbd1aa..cb5c8bc6a 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -121,5 +121,10 @@ public class ProductSkuDO extends BaseDO {
     // TODO seckill_stock：秒杀库存
     // TODO integral：需要积分
 
+    // TODO ========== 待定字段：cf =========
+    // TODO type 活动显示排序 0=默认 1=秒 2=砍价 3=拼团
+    // TODO quota 活动限购数量
+    // TODO quota_show 活动限购数量显示
+
 }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index 8a0b19c22..db68aedbc 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -150,4 +150,9 @@ public class ProductSpuDO extends BaseDO {
     // TODO is_new 是否新品
     // TODO is_good 是否优品推荐
 
+    // TODO ========== 待定字段：cf =========
+    // TODO source_link 淘宝京东1688类型
+    // TODO video_link 主图视频链接
+    // TODO activity 活动显示排序 0=默认 1=秒 2=砍价 3=拼团
+
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index c0daafa90..a73ddbde9 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -226,4 +226,9 @@ public class TradeOrderDO extends BaseDO {
     // TODO verify_code：核销码
     // TODO store_id：门店id
 
+    // TODO ========== 待定字段：cf =========
+    // TODO before_pay_price：改价前支付金额
+    // TODO is_alter_price：是否改价
+    // TODO type：订单类型:0-普通订单，1-视频号订单
+    // TODO out_trade_no：商户系统内部的订单号 String
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
index fd649b1f6..364698bb6 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
@@ -122,4 +122,11 @@ public class TradeOrderItemDO extends BaseDO {
 
     // TODO 芋艿：basket_date 加入购物车时间；
     // TODO 芋艿：distribution_card_no 推广员使用的推销卡号
+
+    // TODO 待确定：mf
+    // TODO give_integral：赠送积分
+    // TODO is_reply：是否评价，0-未评价，1-已评价
+    // TODO is_sub：是否单独分佣,0-否，1-是
+    // TODO vip_price：会员价
+    // TODO product_type：商品类型:0-普通，1-秒杀，2-砍价，3-拼团，4-视频号
 }

From 33a01e78bf99cd11a62236994aa1bb298ab09cea Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 4 Aug 2022 23:25:44 +0800
Subject: [PATCH 21/56] =?UTF-8?q?mall=EF=BC=9A=E4=BC=98=E5=8C=96=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=A1=A8=E7=9A=84=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductSpuSpecTypeEnum.java}              |  19 ++-
 .../enums/spu/ProductSpuStatusEnum.java       |  38 ++++++
 .../dal/dataobject/brand/ProductBrandDO.java  |   2 +
 .../category/ProductCategoryDO.java           |   2 +
 .../dataobject/comment/ProductCommentDO.java  |  51 +++++---
 .../dal/dataobject/sku/ProductSkuDO.java      |  14 +--
 .../dal/dataobject/spu/ProductSpuDO.java      | 118 +++++++++++++-----
 7 files changed, 179 insertions(+), 65 deletions(-)
 rename yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/{comment/ProductCommentEvaluateEnum.java => spu/ProductSpuSpecTypeEnum.java} (54%)
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/spu/ProductSpuStatusEnum.java

diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentEvaluateEnum.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/spu/ProductSpuSpecTypeEnum.java
similarity index 54%
rename from yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentEvaluateEnum.java
rename to yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/spu/ProductSpuSpecTypeEnum.java
index 5a95f775c..30ece744d 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/comment/ProductCommentEvaluateEnum.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/spu/ProductSpuSpecTypeEnum.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.product.enums.comment;
+package cn.iocoder.yudao.module.product.enums.spu;
 
 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
 import lombok.AllArgsConstructor;
@@ -7,26 +7,25 @@ import lombok.Getter;
 import java.util.Arrays;
 
 /**
- * 商品评论的评价枚举
+ * 商品 SPU 规格类型
  *
  * @author 芋道源码
  */
 @Getter
 @AllArgsConstructor
-public enum ProductCommentEvaluateEnum implements IntArrayValuable {
+public enum ProductSpuSpecTypeEnum implements IntArrayValuable {
 
-    GOOD(1, "好评"),
-    BAD(2, "差评"),
-    MIDDLE(2, "中评"),;
+    RECYCLE(1, "统一规格"),
+    DISABLE(2, "多规格");
 
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ProductCommentEvaluateEnum::getEvaluate).toArray();
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ProductSpuSpecTypeEnum::getType).toArray();
 
     /**
-     * 评价
+     * 规格
      */
-    private final Integer evaluate;
+    private final Integer type;
     /**
-     * 评价名
+     * 规格名
      */
     private final String name;
 
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/spu/ProductSpuStatusEnum.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/spu/ProductSpuStatusEnum.java
new file mode 100644
index 000000000..1757f1e49
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/spu/ProductSpuStatusEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.product.enums.spu;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 商品 SPU 状态
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum ProductSpuStatusEnum implements IntArrayValuable {
+
+    RECYCLE(-1, "回收站"),
+    DISABLE(0, "下架"),
+    ENABLE(1, "上架"),;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ProductSpuStatusEnum::getStyle).toArray();
+
+    /**
+     * 状态
+     */
+    private final Integer style;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/ProductBrandDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/ProductBrandDO.java
index e2178d5c4..9775f36a5 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/ProductBrandDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/brand/ProductBrandDO.java
@@ -48,4 +48,6 @@ public class ProductBrandDO extends BaseDO {
      */
     private Integer status;
 
+    // TODO 芋艿：firstLetter 首字母
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
index 1aade9b04..427bf3136 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
@@ -70,4 +70,6 @@ public class ProductCategoryDO extends BaseDO {
      */
     private Integer status;
 
+    // TODO 芋艿：is_recommend 是否首页推荐：1-是；0-否
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
index 88c57f579..30db12819 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.product.dal.dataobject.comment;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.enums.comment.ProductCommentAuditStatusEnum;
-import cn.iocoder.yudao.module.product.enums.comment.ProductCommentEvaluateEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -40,12 +39,24 @@ public class ProductCommentDO extends BaseDO {
      * 关联 {@link ProductSpuDO#getId()}
      */
     private Long spuId;
+    /**
+     * 交易订单编号
+     *
+     * 关联 TradeOrderDO 的 id 编号
+     */
+    private Long orderId;
     /**
      * 交易订单项编号
      *
-     * 关联 OrderItemDO 的 id 编号
+     * 关联 TradeOrderItemDO 的 id 编号
      */
-    private Long tradeOrderItemId;
+    private Long orderItemId;
+    /**
+     * 审核状态
+     *
+     * 枚举 {@link ProductCommentAuditStatusEnum}
+     */
+    private Integer auditStatus;
 
     /**
      * 用户编号
@@ -71,15 +82,29 @@ public class ProductCommentDO extends BaseDO {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> picUrls;
     /**
-     * 得分，0-5 分
-     */
-    private Integer score;
-    /**
-     * 评价
+     * 描述相符星级
      *
-     * 枚举 {@link ProductCommentEvaluateEnum}
+     * 1-5 星
      */
-    private Integer evaluate;
+    private Integer descriptionScore;
+    /**
+     * 商品评论星级
+     *
+     * 1-5 星
+     */
+    private Integer productScore;
+    /**
+     * 服务评论星级
+     *
+     * 1-5 星
+     */
+    private Integer serviceScore;
+    /**
+     * 物流评论星级
+     *
+     * 1-5 星
+     */
+    private Integer expressComment;
 
     /**
      * 商家是否回复
@@ -93,12 +118,6 @@ public class ProductCommentDO extends BaseDO {
      * 商家回复时间
      */
     private Date replyTime;
-    /**
-     * 审核状态
-     *
-     * 枚举 {@link ProductCommentAuditStatusEnum}
-     */
-    private Integer auditStatus;
 
     /**
      * 有用的计数
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index cb5c8bc6a..8984c71ce 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -54,9 +54,9 @@ public class ProductSkuDO extends BaseDO {
      */
     private Integer price;
     /**
-     * 原价，单位：分
+     * 市场价，单位：分
      */
-    private Integer originalPrice;
+    private Integer marketPrice;
     /**
      * 成本价，单位：分
      */
@@ -76,15 +76,9 @@ public class ProductSkuDO extends BaseDO {
      */
     private Integer status;
     /**
-     * 购买中的库存
-     *
-     * 商品 SKU 被下单时，未付款的商品 SKU 数量
+     * 库存
      */
-    private Integer stocks;
-    /**
-     * 实际库存
-     */
-    private Integer actualStocks;
+    private Integer stock;
     /**
      * 商品重量，单位：kg 千克
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index db68aedbc..34f7a9d02 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.spu;
 
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.delivery.DeliveryTemplateDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
-import cn.iocoder.yudao.module.product.enums.delivery.DeliveryModeEnum;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -21,7 +20,7 @@ import java.util.List;
  *
  * @author 芋道源码
  */
-@TableName("product_spu")
+@TableName(value = "product_spu", autoResultMap = true)
 @KeySequence("product_spu_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -50,6 +49,10 @@ public class ProductSpuDO extends BaseDO {
      * 商品名称
      */
     private String name;
+    /**
+     * 商品编码
+     */
+    private String code;
     /**
      * 商品卖点
      */
@@ -71,10 +74,19 @@ public class ProductSpuDO extends BaseDO {
      */
     private Long brandId;
     /**
-     * 商品图片地址数组
+     * 商品主图
+     */
+    private String bannerUrl;
+    /**
+     * 商品轮播图数组
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> picUrls;
+    /**
+     * 商品视频
+     */
+    private String videoUrl;
+
     /**
      * 排序字段
      */
@@ -82,53 +94,83 @@ public class ProductSpuDO extends BaseDO {
     /**
      * 商品状态
      *
-     * 枚举 {@link CommonStatusEnum}
+     * 枚举 {@link ProductSpuStatusEnum}
      */
     private Integer status;
 
     // ========== SKU 相关字段 =========
 
     /**
-     * 价格，单位使用：分
+     * 规格类型
+     *
+     * 枚举 {@link ProductSpuSpecTypeEnum}
+     */
+    private Integer specType;
+    /**
+     * 最小价格，单位使用：分
      *
      * 基于其对应的 {@link ProductSkuDO#getPrice()} 最小值
      */
-    private Integer price;
+    private Integer minPrice;
+    /**
+     * 最大价格，单位使用：分
+     *
+     * 基于其对应的 {@link ProductSkuDO#getPrice()} 最大值
+     */
+    private Integer maxPrice;
+    /**
+     * 市场价，单位使用：分
+     *
+     * 基于其对应的 {@link ProductSkuDO#getMarketPrice()} 最大值
+     */
+    private Integer marketPrice;
     /**
      * 总库存
      *
-     * 基于其对应的 {@link ProductSkuDO#getActualStocks()} 求和
+     * 基于其对应的 {@link ProductSkuDO#getStock()} 求和
      */
-    private Integer totalStocks;
+    private Integer totalStock;
+    /**
+     * 预警预存
+     */
+    private Integer warnStock;
+    /**
+     * 是否展示库存
+     */
+    private Boolean showStock;
 
     // ========== 统计相关字段 =========
 
     /**
-     * 已销售数量（真实）
+     * 商品销量
      */
-    private Integer soldCount;
+    private Integer salesCount;
     /**
-     * 浏览量
+     * 虚拟销量
      */
-    private Integer visitCount;
+    private Integer virtualSalesCount;
+    /**
+     * 商品点击量
+     */
+    private Integer clickCount;
 
     // ========== 物流相关字段 =========
 
-    /**
-     * 配送方式
-     *
-     * 枚举 {@link DeliveryModeEnum}
-     */
-    private Integer deliveryMode;
-    /**
-     * 配置模板编号
-     *
-     * 关联 {@link DeliveryTemplateDO#getId()}
-     */
-    private Long deliveryTemplateId;
+    // TODO 芋艿：稍后完善物流的字段
+//    /**
+//     * 配送方式
+//     *
+//     * 枚举 {@link DeliveryModeEnum}
+//     */
+//    private Integer deliveryMode;
+//    /**
+//     * 配置模板编号
+//     *
+//     * 关联 {@link DeliveryTemplateDO#getId()}
+//     */
+//    private Long deliveryTemplateId;
 
     // TODO ========== 待定字段：yv =========
-    // TODO bar_code 条形码
     // TODO vip_price 会员价格
     // TODO postage 邮费
     // TODO is_postage 是否包邮
@@ -139,7 +181,6 @@ public class ProductSpuDO extends BaseDO {
     // TODO integral 所需积分
     // TODO is_seckill 秒杀状态
     // TODO is_bargain 砍价状态
-    // TODO ficti 虚拟销量
     // TODO code_path 产品二维码地址
     // TODO is_sub 是否分佣
 
@@ -152,7 +193,26 @@ public class ProductSpuDO extends BaseDO {
 
     // TODO ========== 待定字段：cf =========
     // TODO source_link 淘宝京东1688类型
-    // TODO video_link 主图视频链接
     // TODO activity 活动显示排序 0=默认 1=秒 2=砍价 3=拼团
 
+    // TODO ========== 待定字段：lf =========
+
+    // TODO free_shipping_type：运费类型：1-包邮；2-统一运费；3-运费模板
+    // TODO free_shipping：统一运费金额
+    // TODO free_shipping_template_id：运费模板
+    // TODO is_commission：分销佣金：1-开启；0-不开启；first_ratio second_ratio three_ratio
+    // TODO is_share_bouns：区域股东分红：1-开启；0-不开启；region_ratio；shareholder_ratio
+
+    // TODO is_new：新品推荐：1-是；0-否
+    // TODO is_best：好物优选：1-是；0-否
+    // TODO is_like：猜你喜欢：1-是；0-否
+
+    // TODO is_team：是否开启拼团[0=否， 1=是]
+    // TODO is_integral：积分抵扣：1-开启；0-不开启
+    // TODO is_member：会员价：1-开启；0-不开启
+    // TODO give_integral_type：赠送积分类型：0-不赠送；1-赠送固定积分；2-按比例赠送积分
+    // TODO give_integral：赠送积分；
+
+    // TODO poster：商品自定义海报
+
 }

From cfde3dcacbbf4163f505169ed7f77777ad920d7d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 5 Aug 2022 00:28:40 +0800
Subject: [PATCH 22/56] =?UTF-8?q?mall=EF=BC=9A=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=E7=9A=84=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/common/enums/TerminalEnum.java  | 38 ++++++++++
 ...eryModeEnum.java => DeliveryTypeEnum.java} |  9 +--
 .../dal/dataobject/sku/ProductSkuDO.java      |  3 +
 .../order/TradeOrderItemRefundStatusEnum.java | 29 ++++++++
 .../TradeOrderRefundStatusEnum.java}          | 13 ++--
 .../enums/order/TradeOrderStatusEnum.java     | 11 ++-
 .../trade/enums/order/TradeOrderTypeEnum.java | 29 ++++++++
 .../dataobject/order/OrderPreferentialDO.java | 49 -------------
 .../dal/dataobject/order/TradeOrderDO.java    | 69 +++++++++++++------
 .../dataobject/order/TradeOrderItemDO.java    | 49 +++++++++++++
 .../dal/dataobject/refund/TradeRefundDO.java  |  6 +-
 11 files changed, 216 insertions(+), 89 deletions(-)
 create mode 100644 yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java
 rename yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/{DeliveryModeEnum.java => DeliveryTypeEnum.java} (71%)
 create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderItemRefundStatusEnum.java
 rename yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/{refund/TradeRefundStatusEnum.java => order/TradeOrderRefundStatusEnum.java} (51%)
 create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderTypeEnum.java
 delete mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java

diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java
new file mode 100644
index 000000000..7a9cd1ec6
--- /dev/null
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.framework.common.enums;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * 终端的枚举
+ *
+ * @author 芋道源码
+ */
+@RequiredArgsConstructor
+@Getter
+public enum TerminalEnum implements IntArrayValuable {
+
+    MINI_PROGRAM(1, "小程序"),
+    H5(2, "H5"),
+    IOS(3, "iOS"),
+    ANDROID(3, "安卓"),;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TerminalEnum::getTerminal).toArray();
+
+    /**
+     * 终端
+     */
+    private final Integer terminal;
+    /**
+     * 终端名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+}
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryModeEnum.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryTypeEnum.java
similarity index 71%
rename from yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryModeEnum.java
rename to yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryTypeEnum.java
index 4d9e89275..da322ff24 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryModeEnum.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/delivery/DeliveryTypeEnum.java
@@ -13,12 +13,13 @@ import java.util.Arrays;
  */
 @Getter
 @AllArgsConstructor
-public enum DeliveryModeEnum implements IntArrayValuable {
+public enum DeliveryTypeEnum implements IntArrayValuable {
 
-    SHOP_DELIVERY(1, "商家配送"),
-    USER_PICK_UP(2, "用户自提");
+    // TODO 芋艿：英文单词，需要再想下；
+    EXPRESS(1, "快递发货"),
+    USER(2, "用户自提"),;
 
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryModeEnum::getMode).toArray();
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryTypeEnum::getMode).toArray();
 
     /**
      * 配送方式
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index 8984c71ce..ccc3d4711 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -88,6 +88,9 @@ public class ProductSkuDO extends BaseDO {
      */
     private Double volume;
 
+    /**
+     * 商品属性
+     */
     @Data
     public static class Property {
 
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderItemRefundStatusEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderItemRefundStatusEnum.java
new file mode 100644
index 000000000..4d81ea9eb
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderItemRefundStatusEnum.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.trade.enums.order;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 交易订单项 - 退款状态
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum TradeOrderItemRefundStatusEnum {
+
+    NONE(0, "未申请退款"),
+    APPLY(1, "申请退款"),
+    WAIT(2, "等待退款"),
+    SUCCESS(3, "退款成功");
+
+    /**
+     * 状态值
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundStatusEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderRefundStatusEnum.java
similarity index 51%
rename from yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundStatusEnum.java
rename to yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderRefundStatusEnum.java
index b272ac983..50fd88b12 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/refund/TradeRefundStatusEnum.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderRefundStatusEnum.java
@@ -1,26 +1,25 @@
-package cn.iocoder.yudao.module.trade.enums.refund;
+package cn.iocoder.yudao.module.trade.enums.order;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 /**
- * 交易退款 - 状态
+ * 交易订单 - 退款状态
  *
  * @author Sin
  */
 @RequiredArgsConstructor
 @Getter
-public enum TradeRefundStatusEnum {
+public enum TradeOrderRefundStatusEnum {
 
     NONE(0, "未退款"),
-    AUDIT(10, "审核中"),
-    APPROVE(30, "已通过"),
-    REJECT(40, "不通过"),;
+    PART(1, "部分退款"),
+    ALL(2, "全部退款");
 
     /**
      * 状态值
      */
-    private final Integer value;
+    private final Integer status;
     /**
      * 状态名
      */
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
index cd777e124..6510e26cb 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
@@ -12,12 +12,11 @@ import lombok.RequiredArgsConstructor;
 @Getter
 public enum TradeOrderStatusEnum {
 
-    WAITING_PAYMENT(10, "待付款"),
-    WAIT_SHIPMENT(20, "待发货"),
-    ALREADY_SHIPMENT(30, "待收货"),
-    WAITING_COMMENT(40, "待评价"),
-    COMPLETED(50, "成功"),
-    CLOSED(60, "失败");
+    WAITING_PAYMENT(0, "待付款"),
+    WAIT_SHIPMENT(1, "待发货"),
+    ALREADY_SHIPMENT(2, "待收货"),
+    COMPLETED(3, "成功"),
+    CLOSED(4, "失败");
 
     /**
      * 状态值
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderTypeEnum.java
new file mode 100644
index 000000000..c10d0065a
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderTypeEnum.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.trade.enums.order;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 交易订单 - 类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum TradeOrderTypeEnum {
+
+    NORMAL(0, "普通订单"),
+    SECKILL(1, "秒杀订单"),
+    TEAM(2, "拼团订单"),
+    BARGAIN(3, "砍价订单");
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+    /**
+     * 类型名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java
deleted file mode 100644
index a5d6cd9c5..000000000
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/OrderPreferentialDO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.trade.dal.dataobject.order;
-
-/**
- * 订单优惠明细
- *
- * 可参考 https://jos.jd.com/apilist?apiGroupId=55&apiId=16757&apiName=jingdong.pop.order.coupondetail
- */
-// TODO 芋艿 后续在完善
-@Deprecated
-public class OrderPreferentialDO {
-
-    /**
-     * 编号
-     */
-    private Integer id;
-    /**
-     * 类型
-     *
-     * 1 - 促销活动
-     * 2 - 优惠劵
-     */
-    private Integer type;
-    // TODO 芋艿 优惠劵编号 or 促销活动编号
-    /**
-     * 订单编号
-     */
-    private Integer orderId;
-    /**
-     * 商品 SPU 编号
-     */
-    private Integer spuId;
-    /**
-     * 商品 SKU 编号
-     */
-    private Integer skuId;
-    /**
-     * 商品数量
-     */
-    private Integer quantity;
-    /**
-     * 传入时的价格
-     */
-    private Integer originTotal;
-    /**
-     * 总优惠价格
-     */
-    private Integer discountTotal;
-
-}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index a73ddbde9..175ebdc95 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.trade.dal.dataobject.order;
 
+import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.product.enums.delivery.DeliveryModeEnum;
+import cn.iocoder.yudao.module.product.enums.delivery.DeliveryTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderCloseTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
-import cn.iocoder.yudao.module.trade.enums.refund.TradeRefundStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -38,6 +40,18 @@ public class TradeOrderDO extends BaseDO {
      */
     private String sn;
     // TODO 芋艿：order_type 订单类型
+    /**
+     * 订单类型
+     *
+     * 枚举 {@link TradeOrderTypeEnum}
+     */
+    private Integer type;
+    /**
+     * 订单来源终端
+     *
+     * 枚举 {@link TerminalEnum}
+     */
+    private Integer terminal;
 //    /**
 //     * 店铺编号
 //     *
@@ -72,11 +86,13 @@ public class TradeOrderDO extends BaseDO {
      */
     private String remark;
     /**
-     * 订单结束时间
-     *
-     * 即交易订单状态变成 {@link TradeOrderStatusEnum#COMPLETED} 或 {@link TradeOrderStatusEnum#CLOSED} 的时间
+     * 确认收获时间
      */
-    private Date endTime;
+    private Date confirmTakeTime;
+    /**
+     * 订单取消时间
+     */
+    private Date cancelTime;
 
     // ========== 价格 + 支付基本信息 ==========
     /**
@@ -85,7 +101,7 @@ public class TradeOrderDO extends BaseDO {
      * true - 已经支付过
      * false - 没有支付过
      */
-    private Boolean payed;
+    private Boolean payed; // TODO payStatus 0 - 待付款；1 - 已付款；2 - 已退款
     /**
      * 付款时间
      */
@@ -118,14 +134,6 @@ public class TradeOrderDO extends BaseDO {
      * 初始时，金额为 0 。等到支付成功后，会进行更新。
      */
     private Integer payPrice;
-    /**
-     * 退款金额，单位：分
-     *
-     * 注意，退款并不会影响 {@link #payPrice} 实际支付金额
-     * 也就说，一个订单最终产生多少金额的收入 = payPrice - refundPrice
-     */
-    @Deprecated
-    private Integer refundPrice;
     /**
      * 支付订单编号
      *
@@ -141,9 +149,9 @@ public class TradeOrderDO extends BaseDO {
     /**
      * 配送方式
      *
-     * 枚举 {@link DeliveryModeEnum}
+     * 枚举 {@link DeliveryTypeEnum}
      */
-    private Integer deliveryMode;
+    private Integer deliveryType;
     /**
      * 配置模板的编号
      *
@@ -187,15 +195,22 @@ public class TradeOrderDO extends BaseDO {
     /**
      * 退款状态
      *
-     * 枚举 {@link TradeRefundStatusEnum}
+     * 枚举 {@link TradeOrderRefundStatusEnum}
      */
     private Integer refundStatus;
+    /**
+     * 退款金额，单位：分
+     *
+     * 注意，退款并不会影响 {@link #payPrice} 实际支付金额
+     * 也就说，一个订单最终产生多少金额的收入 = payPrice - refundPrice
+     */
+    private Integer refundPrice;
 
     // ========== 营销基本信息 ==========
     /**
      * 优惠劵编号
      */
-    private Integer couponCardId;
+    private Integer couponId;
 
     // TODO 芋艿，这块还要结合营销和价格计算，在去优化下。
 
@@ -229,6 +244,20 @@ public class TradeOrderDO extends BaseDO {
     // TODO ========== 待定字段：cf =========
     // TODO before_pay_price：改价前支付金额
     // TODO is_alter_price：是否改价
-    // TODO type：订单类型:0-普通订单，1-视频号订单
     // TODO out_trade_no：商户系统内部的订单号 String
+
+    // TODO ========== 待定字段：lf =========
+    // TODO integral_amount：积分抵扣金额
+    // TODO shipping_status：发货状态
+    // TODO shipping_time：最后新发货时间
+
+    // TODO ========== 待定字段：lf =========
+    // TODO settle_id：未结算
+    // TODO settle_amount：结算金额
+    // TODO use_integral：使用的积分
+    // TODO team_found_id: 拼团id
+    // TODO team_id: 拼团活动id
+    // TODO delivery_id: 发货单ID
+    // TODO attach_values: 附带的值(赠送时机，赠送积分成长值什么的)Json格式
+
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
index 364698bb6..6bdb7c6d4 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
@@ -1,11 +1,16 @@
 package cn.iocoder.yudao.module.trade.dal.dataobject.order;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemRefundStatusEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 交易订单项 DO
  *
@@ -54,6 +59,11 @@ public class TradeOrderItemDO extends BaseDO {
      * 关联 ProductSkuDO 的 id 编号
      */
     private Integer skuId;
+    /**
+     * 规格值数组，JSON 格式
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Property> properties;
     /**
      * 商品名称
      */
@@ -106,6 +116,14 @@ public class TradeOrderItemDO extends BaseDO {
      * 所以，需要存储一个该字段。
      */
     private Integer presentTotal; // product_total_amount
+
+    // ========== 退款基本信息 ==========
+    /**
+     * 退款状态
+     *
+     * 枚举 {@link TradeOrderItemRefundStatusEnum}
+     */
+    private Integer refundStatus;
     // 如上字段，举个例子：
     // 假设购买三个，即 stock = 3 。
     // originPrice = 15
@@ -120,6 +138,27 @@ public class TradeOrderItemDO extends BaseDO {
      */
     private Integer refundTotal;
 
+    /**
+     * 商品属性
+     */
+    @Data
+    public static class Property {
+
+        /**
+         * 属性编号
+         *
+         * 关联 ProductPropertyDO 的 id 编号
+         */
+        private Long propertyId;
+        /**
+         * 属性值编号
+         *
+         * 关联 ProductPropertyValueDO 的 id 编号
+         */
+        private Long valueId;
+
+    }
+
     // TODO 芋艿：basket_date 加入购物车时间；
     // TODO 芋艿：distribution_card_no 推广员使用的推销卡号
 
@@ -129,4 +168,14 @@ public class TradeOrderItemDO extends BaseDO {
     // TODO is_sub：是否单独分佣,0-否，1-是
     // TODO vip_price：会员价
     // TODO product_type：商品类型:0-普通，1-秒杀，2-砍价，3-拼团，4-视频号
+
+    // TODO 待确定：lf
+    // TODO integral_price：积分抵扣的金额
+    // TODO member_price：会员价格
+    // TODO is_member：是否为会员折扣;0-不是;1-是
+    // TODO member_discount：会员折扣(百分比)
+
+    // TODO goods_info 商品信息
+
+    // TODO integral_price：积分抵扣的金额
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
index ce53e755d..6c910df4c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.refund;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.iocoder.yudao.module.trade.enums.refund.TradeRefundStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
 import cn.iocoder.yudao.module.trade.enums.refund.TradeRefundTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 交易退款，用于处理 {@link TradeOrderDO} 交易订单的退货换流程
  */
-// TODO 芋艿：需要调整下每个字段的命名
+// TODO 芋艿：需要调整下每个字段的命名；未完全实现；
 @TableName(value = "trade_refund")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -39,7 +39,7 @@ public class TradeRefundDO extends BaseDO {
     /**
      * 退款状态
      *
-     * 枚举 {@link TradeRefundStatusEnum}
+     * 枚举 {@link TradeOrderRefundStatusEnum}
      */
     private Integer status;
 //    /**

From 10caa6e824c53b0741a93eb594e4585f857c001a Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Sat, 6 Aug 2022 11:15:28 +0800
Subject: [PATCH 23/56] =?UTF-8?q?fix(=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95):=20=E6=8E=A7=E5=88=B6=E5=8F=B0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/layout/components/Sidebar/SidebarItem.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-ui-admin/src/layout/components/Sidebar/SidebarItem.vue b/yudao-ui-admin/src/layout/components/Sidebar/SidebarItem.vue
index c4febee2d..7880cbba6 100644
--- a/yudao-ui-admin/src/layout/components/Sidebar/SidebarItem.vue
+++ b/yudao-ui-admin/src/layout/components/Sidebar/SidebarItem.vue
@@ -13,8 +13,8 @@
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
       <sidebar-item
-        v-for="child in item.children"
-        :key="child.path"
+        v-for="(child, index) in item.children"
+        :key="child.path + index"
         :is-nest="true"
         :item="child"
         :base-path="resolvePath(child.path)"

From face9cae76602ff4bfba88affc585199218e4163 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 6 Aug 2022 19:10:28 +0800
Subject: [PATCH 24/56] =?UTF-8?q?mall=EF=BC=9A=E8=B0=83=E6=95=B4=20trade?=
 =?UTF-8?q?=20=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../category/ProductCategoryDO.java           |   6 -
 .../dataobject/group/ProductGroupBindDO.java  |   6 -
 .../dal/dataobject/group/ProductGroupDO.java  |   7 -
 .../property/ProductPropertyDO.java           |   6 -
 .../dataobject/search/ProductHotSearchDO.java |   6 -
 .../dal/dataobject/spu/ProductSpuDO.java      |  12 +-
 .../dal/mysql/sku/ProductSkuMapper.java       |   2 +-
 .../dal/mysql/spu/ProductSpuMapper.java       |   2 +-
 .../service/sku/SkuServiceImplTest.java       |   4 +-
 .../spu/ProductSpuServiceImplTest.java        |   4 +-
 ...num.java => TradeOrderCancelTypeEnum.java} |   2 +-
 .../enums/order/TradeOrderStatusEnum.java     |   4 +-
 .../controller/app/cart/CartController.java   |  71 ++++++
 .../controller/app/cart/vo/CartDetailVO.java  | 211 ++++++++++++++++++
 .../app/order/AppTradeOrderController.http    |  31 +++
 .../app/order/AppTradeOrderController.java    |  61 +++++
 .../order/vo/AppTradeOrderCreateReqVO.java    |  50 +++++
 .../vo/AppTradeOrderGetCreateInfoRespVO.java  | 169 ++++++++++++++
 .../app/order/vo/TradeOrderItemRespVO.java    |  53 +++++
 .../app/order/vo/TradeOrderPageReqVO.java     |  17 ++
 .../app/order/vo/TradeOrderRespVO.java        |  70 ++++++
 .../app/refund/TradeRefundController.java     |   4 +
 .../module/trade/controller/package-info.java |   6 +
 .../trade/dal/dataobject/cart/CartItemDO.java |   6 -
 .../dal/dataobject/order/TradeOrderDO.java    | 125 ++++++-----
 .../dataobject/order/TradeOrderItemDO.java    |  76 ++++---
 .../dal/dataobject/refund/TradeRefundDO.java  |   6 -
 yudao-server/pom.xml                          |   5 +
 28 files changed, 881 insertions(+), 141 deletions(-)
 rename yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/{TradeOrderCloseTypeEnum.java => TradeOrderCancelTypeEnum.java} (93%)
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/CartController.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/CartDetailVO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderPageReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/refund/TradeRefundController.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/package-info.java

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
index 427bf3136..6671e9b44 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java
@@ -38,12 +38,6 @@ public class ProductCategoryDO extends BaseDO {
      * 父分类编号
      */
     private Long parentId;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
     /**
      * 分类名称
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
index 209a7085c..2e3b63e59 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupBindDO.java
@@ -27,12 +27,6 @@ public class ProductGroupBindDO extends BaseDO {
      */
     @TableId
     private Long id;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
     /**
      * 商品分组编号
      *
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
index e942b957c..605e8c38a 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/group/ProductGroupDO.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.product.dal.dataobject.group;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.shop.ShopDO;
 import cn.iocoder.yudao.module.product.enums.group.ProductGroupStyleEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -29,12 +28,6 @@ public class ProductGroupDO extends BaseDO {
      */
     @TableId
     private Long id;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
     /**
      * 分组名称
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
index 94bfc808c..608b248fe 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java
@@ -27,12 +27,6 @@ public class ProductPropertyDO extends BaseDO {
      */
     @TableId
     private Long id;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
     /**
      * 规格名称
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java
index c53f01aca..3d5cf9101 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/search/ProductHotSearchDO.java
@@ -34,11 +34,5 @@ public class ProductHotSearchDO extends BaseDO {
      * 内容
      */
     private String content;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index 34f7a9d02..456b231b8 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -36,13 +36,6 @@ public class ProductSpuDO extends BaseDO {
     @TableId
     private Long id;
 
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
-
     // ========== 基本信息 =========
 
     /**
@@ -215,4 +208,9 @@ public class ProductSpuDO extends BaseDO {
 
     // TODO poster：商品自定义海报
 
+    // TODO ========== 待定字段：laoji =========
+    // TODO productType 1 - 普通商品 2 - 预售商品；可能和 type 合并不错
+    // TODO productUnit 商品单位
+    // TODO extJson 扩展信息；例如说，预售商品的信息
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index 756636687..eff999be0 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -22,7 +22,7 @@ public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
                 .eqIfPresent(ProductSkuDO::getSpuId, reqVO.getSpuId())
                 .eqIfPresent(ProductSkuDO::getProperties, reqVO.getProperties())
                 .eqIfPresent(ProductSkuDO::getPrice, reqVO.getPrice())
-                .eqIfPresent(ProductSkuDO::getOriginalPrice, reqVO.getOriginalPrice())
+//                .eqIfPresent(ProductSkuDO::getOriginalPrice, reqVO.getOriginalPrice())
 //                .eqIfPresent(ProductSkuDO::getCostPrice, reqVO.getCostPrice())
                 .eqIfPresent(ProductSkuDO::getBarCode, reqVO.getBarCode())
                 .eqIfPresent(ProductSkuDO::getPicUrl, reqVO.getPicUrl())
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
index 7487dd60c..a1d919ef2 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
@@ -24,7 +24,7 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
                 .eqIfPresent(ProductSpuDO::getPicUrls, reqVO.getPicUrls())
                 .eqIfPresent(ProductSpuDO::getSort, reqVO.getSort())
 //                .eqIfPresent(ProductSpuDO::getLikeCount, reqVO.getLikeCount())
-                .eqIfPresent(ProductSpuDO::getPrice, reqVO.getPrice())
+//                .eqIfPresent(ProductSpuDO::getPrice, reqVO.getPrice())
 //                .eqIfPresent(ProductSpuDO::getQuantity, reqVO.getQuantity())
                 .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
index 8cd086e81..2902121e7 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
@@ -105,7 +105,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
            o.setSpuId(null);
            o.setProperties(null);
            o.setPrice(null);
-           o.setOriginalPrice(null);
+//           o.setOriginalPrice(null);
 //           o.setCostPrice(null);
            o.setBarCode(null);
            o.setPicUrl(null);
@@ -120,7 +120,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
        // 测试 price 不匹配
        ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPrice(null)));
        // 测试 originalPrice 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setOriginalPrice(null)));
+//       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setOriginalPrice(null)));
        // 测试 costPrice 不匹配
 //       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCostPrice(null)));
        // 测试 barCode 不匹配
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
index ef2372ac9..4aa0c0e68 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
@@ -110,7 +110,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
            o.setPicUrls(null);
            o.setSort(null);
 //           o.setLikeCount(null);
-           o.setPrice(null);
+//           o.setPrice(null);
 //           o.setQuantity(null);
            o.setStatus(null);
            o.setCreateTime(null);
@@ -131,7 +131,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
        // 测试 likeCount 不匹配
 //       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setLikeCount(null)));
        // 测试 price 不匹配
-       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null)));
+//       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null)));
        // 测试 quantity 不匹配
 //       ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null)));
        // 测试 status 不匹配
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCloseTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCancelTypeEnum.java
similarity index 93%
rename from yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCloseTypeEnum.java
rename to yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCancelTypeEnum.java
index 4fdaf9298..670651d4e 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCloseTypeEnum.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderCancelTypeEnum.java
@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
  */
 @RequiredArgsConstructor
 @Getter
-public enum TradeOrderCloseTypeEnum {
+public enum TradeOrderCancelTypeEnum {
 
     PAY_TIMEOUT(10, "超时未支付"),
     REFUND_CLOSE(20, "退款关闭"),
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
index 6510e26cb..fe0a85f3d 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderStatusEnum.java
@@ -15,8 +15,8 @@ public enum TradeOrderStatusEnum {
     WAITING_PAYMENT(0, "待付款"),
     WAIT_SHIPMENT(1, "待发货"),
     ALREADY_SHIPMENT(2, "待收货"),
-    COMPLETED(3, "成功"),
-    CLOSED(4, "失败");
+    COMPLETED(3, "已完成"),
+    CANCEL(4, "已关闭");
 
     /**
      * 状态值
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/CartController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/CartController.java
new file mode 100644
index 000000000..91e51dfd5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/CartController.java
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.trade.controller.app.cart;
+
+import io.swagger.annotations.Api;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "购物车 API")
+@RestController
+@RequestMapping("/cart")
+@Validated
+public class CartController {
+
+//    @Autowired
+//    private CartManager cartManager;
+//
+//    @PostMapping("add")
+//    @ApiOperation("添加商品到购物车")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "skuId", value = "商品 SKU 编号", required = true, example = "1"),
+//            @ApiImplicitParam(name = "quantity", value = "增加数量", required = true, example = "1024")
+//    })
+//    @RequiresAuthenticate
+//    public CommonResult<Boolean> addCartItem(@RequestParam("skuId") Integer skuId,
+//                                             @RequestParam("quantity") Integer quantity) {
+//        cartManager.addCartItem(UserSecurityContextHolder.getUserId(), skuId, quantity);
+//        return success(true);
+//    }
+//
+//    @GetMapping("sum-quantity")
+//    @ApiOperation("查询用户在购物车中的商品数量")
+//    @RequiresAuthenticate
+//    public CommonResult<Integer> sumCartItemQuantity() {
+//        return success(cartManager.sumCartItemQuantity(UserSecurityContextHolder.getUserId()));
+//    }
+//
+//    @GetMapping("/get-detail")
+//    @ApiOperation("查询用户的购物车的商品列表")
+//    @RequiresAuthenticate
+//    public CommonResult<CartDetailVO> getCartDetail() {
+//        return success(cartManager.getCartDetail(UserSecurityContextHolder.getUserId()));
+//    }
+//
+//    @PostMapping("update-quantity")
+//    @ApiOperation("更新购物车商品数量")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "skuId", value = "商品 SKU 编号", required = true, example = "1"),
+//            @ApiImplicitParam(name = "quantity", value = "增加数量", required = true, example = "1024")
+//    })
+//    @RequiresAuthenticate
+//    public CommonResult<Boolean> updateCartItemQuantity(@RequestParam("skuId") Integer skuId,
+//                                                        @RequestParam("quantity") Integer quantity) {
+//        cartManager.updateCartItemQuantity(UserSecurityContextHolder.getUserId(), skuId, quantity);
+//        return success(true);
+//    }
+//
+//    @PostMapping("update-selected")
+//    @ApiOperation("更新购物车商品是否选中")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "skuIds", value = "商品 SKU 编号数组", required = true, example = "1,3"),
+//            @ApiImplicitParam(name = "selected", value = "是否选中", required = true, example = "true")
+//    })
+//    @RequiresAuthenticate
+//    public CommonResult<Boolean> updateCartItemSelected(@RequestParam("skuIds") Set<Integer> skuIds,
+//                                                        @RequestParam("selected") Boolean selected) {
+//        cartManager.updateCartItemSelected(UserSecurityContextHolder.getUserId(), skuIds, selected);
+//        // 获得目前购物车明细
+//        return success(true);
+//    }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/CartDetailVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/CartDetailVO.java
new file mode 100644
index 000000000..403efbebe
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/CartDetailVO.java
@@ -0,0 +1,211 @@
+package cn.iocoder.yudao.module.trade.controller.app.cart.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "用户的购物车明细 Response VO") // TODO 芋艿：swagger 文档完善
+@Data
+@Accessors(chain = true)
+public class CartDetailVO {
+
+    /**
+     * 商品分组数组
+     */
+    private List<ItemGroup> itemGroups;
+    /**
+     * 费用
+     */
+    private Fee fee;
+
+    /**
+     * 商品分组
+     *
+     * 多个商品，参加同一个活动，从而形成分组。
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class ItemGroup {
+
+//        /**
+//         * 优惠活动
+//         */
+//        private PromotionActivityRespDTO activity; // TODO 芋艿，偷懒
+        /**
+         * 促销减少的金额
+         *
+         * 1. 若未参与促销活动，或不满足促销条件，返回 null
+         * 2. 该金额，已经分摊到每个 Item 的 discountTotal ，需要注意。
+         */
+        private Integer activityDiscountTotal;
+        /**
+         * 商品数组
+         */
+        private List<Sku> items;
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Sku {
+
+        // SKU 自带信息
+        /**
+         * sku 编号
+         */
+        private Integer id;
+        /**
+         * SPU 信息
+         */
+        private Spu spu;
+        /**
+         * 图片地址
+         */
+        private String picURL;
+//        /**
+//         * 规格值数组
+//         */
+//        private List<ProductAttrKeyValueRespVO> attrs; // TODO 后面改下
+        /**
+         * 价格，单位：分
+         */
+        private Integer price;
+        /**
+         * 库存数量
+         */
+        private Integer quantity;
+
+        // 非 SKU 自带信息
+
+        /**
+         * 购买数量
+         */
+        private Integer buyQuantity;
+        /**
+         * 是否选中
+         */
+        private Boolean selected;
+//        /**
+//         * 优惠活动
+//         */
+//        private PromotionActivityRespDTO activity; // TODO 芋艿，偷懒
+        /**
+         * 原始单价，单位：分。
+         */
+        private Integer originPrice;
+        /**
+         * 购买单价，单位：分
+         */
+        private Integer buyPrice;
+        /**
+         * 最终价格，单位：分。
+         */
+        private Integer presentPrice;
+        /**
+         * 购买总金额，单位：分
+         *
+         * 用途类似 {@link #presentTotal}
+         */
+        private Integer buyTotal;
+        /**
+         * 优惠总金额，单位：分。
+         */
+        private Integer discountTotal;
+        /**
+         * 最终总金额，单位：分。
+         *
+         * 注意，presentPrice * quantity 不一定等于 presentTotal 。
+         * 因为，存在无法整除的情况。
+         * 举个例子，presentPrice = 8.33 ，quantity = 3 的情况，presentTotal 有可能是 24.99 ，也可能是 25 。
+         * 所以，需要存储一个该字段。
+         */
+        private Integer presentTotal;
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Spu {
+
+        /**
+         * SPU 编号
+         */
+        private Integer id;
+
+        // ========== 基本信息 =========
+        /**
+         * SPU 名字
+         */
+        private String name;
+        /**
+         * 分类编号
+         */
+        private Integer cid;
+        /**
+         * 商品主图地址
+         *
+         * 数组，以逗号分隔
+         *
+         * 建议尺寸：800*800像素，你可以拖拽图片调整顺序，最多上传15张
+         */
+        private List<String> picUrls;
+
+    }
+
+    /**
+     * 费用（合计）
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class Fee {
+
+        /**
+         * 购买总价
+         */
+        private Integer buyTotal;
+        /**
+         * 优惠总价
+         *
+         * 注意，满多少元包邮，不算在优惠中。
+         */
+        private Integer discountTotal;
+        /**
+         * 邮费
+         */
+        private Integer postageTotal;
+        /**
+         * 最终价格
+         *
+         * 计算公式 = 总价 - 优惠总价 + 邮费
+         */
+        private Integer presentTotal;
+
+        public Fee() {
+        }
+
+        public Fee(Integer buyTotal, Integer discountTotal, Integer postageTotal, Integer presentTotal) {
+            this.buyTotal = buyTotal;
+            this.discountTotal = discountTotal;
+            this.postageTotal = postageTotal;
+            this.presentTotal = presentTotal;
+        }
+
+    }
+
+    /**
+     * 邮费信息 TODO 芋艿，未完成
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class Postage {
+
+        /**
+         * 需要满足多少钱，可以包邮。单位：分
+         */
+        private Integer threshold;
+
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
new file mode 100644
index 000000000..778e99029
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
@@ -0,0 +1,31 @@
+### /trade-order/confirm-create-order-info 基于商品，确认创建订单
+GET {{appApi}}/trade/order/get-create-info?items[0].skuId=1&items[0].count=1
+Authorization: Bearer {{user-access-token}}
+tenant-id: {{appTenentId}}
+
+### /trade-order/confirm-create-order-info-from-cart 基于购物车，确认创建订单
+GET {{shop-api-base-url}}/trade-order/confirm-create-order-info-from-cart
+Content-Type: application/x-www-form-urlencoded
+Authorization: Bearer {{user-access-token}}
+
+### /trade-order/confirm-create-order-info-from-cart 基于商品，创建订单
+POST {{shop-api-base-url}}/trade-order/create
+Content-Type: application/json
+Authorization: Bearer {{user-access-token}}
+
+{
+  "userAddressId": 19,
+  "remark": "我是备注",
+  "orderItems": [
+    {
+      "skuId": 3,
+      "quantity": 1
+    }
+  ]
+}
+
+### /trade-order/page 获得订单交易分页
+GET {{shop-api-base-url}}/trade-order/page?status=1&pageNo=1&pageSize=10
+Content-Type: application/x-www-form-urlencoded
+
+###
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
new file mode 100644
index 000000000..da027e1fa
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.trade.controller.app.order;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderGetCreateInfoRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.TradeOrderPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.TradeOrderRespVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Api(tags = "用户 App - 交易订单")
+@RestController
+@RequestMapping("/trade/order")
+@Validated
+@Slf4j
+public class AppTradeOrderController {
+
+    // TODO 在思考下；
+
+    @GetMapping("/get-create-info")
+    @ApiOperation("基于商品，确认创建订单")
+    @PreAuthenticated
+    public CommonResult<AppTradeOrderGetCreateInfoRespVO> getTradeOrderCreateInfo(AppTradeOrderCreateReqVO createReqVO) {
+//        return success(tradeOrderService.getOrderConfirmCreateInfo(UserSecurityContextHolder.getUserId(), skuId, quantity, couponCardId));
+        return null;
+    }
+
+    @PostMapping("/create")
+    @ApiOperation("创建订单")
+    @PreAuthenticated
+    public CommonResult<Integer> createTradeOrder(@RequestBody AppTradeOrderCreateReqVO createReqVO,
+                                                  HttpServletRequest servletRequest) {
+//        return success(tradeOrderService.createTradeOrder(UserSecurityContextHolder.getUserId(),
+//                HttpUtil.getIp(servletRequest), createReqVO));
+        return null;
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得交易订单")
+    @ApiImplicitParam(name = "tradeOrderId", value = "交易订单编号", required = true)
+    public CommonResult<TradeOrderRespVO> getTradeOrder(@RequestParam("tradeOrderId") Integer tradeOrderId) {
+//        return success(tradeOrderService.getTradeOrder(tradeOrderId));
+        return null;
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("获得订单交易分页")
+    public CommonResult<PageResult<TradeOrderRespVO>> pageTradeOrder(TradeOrderPageReqVO pageVO) {
+//        return success(tradeOrderService.pageTradeOrder(UserSecurityContextHolder.getUserId(), pageVO));
+        return null;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
new file mode 100644
index 000000000..85edde55d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.trade.controller.app.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@ApiModel(value = "用户 App - 交易订单创建 Request VO")
+@Data
+public class AppTradeOrderCreateReqVO {
+
+    @ApiModelProperty(name = "收件地址编号", required = true, example = "1")
+    @NotNull(message = "收件地址不能为空")
+    private Integer addressId;
+
+    @ApiModelProperty(name = "优惠劵编号", example = "1024")
+    private Integer couponId;
+
+    @ApiModelProperty(name = "备注", example = "1024")
+    private String remark;
+
+    @ApiModelProperty(name = "是否来自购物车", required = true, example = "true", notes = "true - 来自购物车；false - 立即购买")
+    @NotNull(message = "是否来自购物车不能为空")
+    private Boolean fromCart;
+
+    /**
+     * 订单商品项列表
+     */
+    @NotNull(message = "必须选择购买的商品")
+    private List<Item> items;
+
+    @ApiModel(value = "订单商品项")
+    @Data
+    public static class Item {
+
+        @ApiModelProperty(name = "商品 SKU 编号", required = true, example = "111")
+        @NotNull(message = "商品 SKU 编号不能为空")
+        private Integer skuId;
+
+        @ApiModelProperty(name = "商品 SKU 购买数量", required = true, example = "1024")
+        @NotNull(message = "商品 SKU 购买数量不能为空")
+        @Min(value = 1, message = "商品 SKU 购买数量必须大于 0")
+        private Integer count;
+
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
new file mode 100644
index 000000000..d0bf595f6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
@@ -0,0 +1,169 @@
+package cn.iocoder.yudao.module.trade.controller.app.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "用户 App - 订单获得创建信息 Response VO")
+@Data
+public class AppTradeOrderGetCreateInfoRespVO {
+
+    /**
+     * 商品分组数组
+     */
+    private List<ItemGroup> itemGroups;
+    /**
+     * 费用
+     */
+    private Fee fee;
+
+//    /**
+//     * 优惠劵列表 TODO 芋艿，后续改改
+//     */
+//    private List<CouponCardAvailableRespDTO> coupons;
+
+    @ApiModel(value = "商品分组", description = "多个商品，参加同一个活动，从而形成分组")
+    @Data
+    public static class ItemGroup {
+
+//        /**
+//         * 优惠活动
+//         */
+//        private PromotionActivityRespDTO activity; // TODO 芋艿，偷懒
+        /**
+         * 商品 SKU 数组
+         */
+        private List<Sku> items;
+
+    }
+
+    @ApiModel("商品 SKU")
+    @Data
+    public static class Sku {
+
+        // SKU 自带信息
+        @ApiModelProperty(value = "SKU 编号", required = true, example = "1024")
+        private Integer id;
+        /**
+         * SPU 信息
+         */
+        private Spu spu;
+        /**
+         * 图片地址
+         */
+        private String picURL;
+//        /**
+//         * 规格值数组
+//         */
+//        private List<ProductAttrKeyValueRespVO> attrs; // TODO 后面改下
+        /**
+         * 价格，单位：分
+         */
+        private Integer price;
+        /**
+         * 库存数量
+         */
+        private Integer stock;
+
+        // 非 SKU 自带信息
+
+        /**
+         * 购买数量
+         */
+        private Integer buyQuantity;
+//        /**
+//         * 优惠活动
+//         */
+//        private PromotionActivityRespDTO activity; // TODO 芋艿，偷懒
+        /**
+         * 原始单价，单位：分。
+         */
+        private Integer originPrice;
+        /**
+         * 购买单价，单位：分
+         */
+        private Integer buyPrice;
+        /**
+         * 最终价格，单位：分。
+         */
+        private Integer presentPrice;
+        /**
+         * 购买总金额，单位：分
+         *
+         * 用途类似 {@link #presentTotal}
+         */
+        private Integer buyTotal;
+        /**
+         * 优惠总金额，单位：分。
+         */
+        private Integer discountTotal;
+        /**
+         * 最终总金额，单位：分。
+         *
+         * 注意，presentPrice * quantity 不一定等于 presentTotal 。
+         * 因为，存在无法整除的情况。
+         * 举个例子，presentPrice = 8.33 ，quantity = 3 的情况，presentTotal 有可能是 24.99 ，也可能是 25 。
+         * 所以，需要存储一个该字段。
+         */
+        private Integer presentTotal;
+
+    }
+
+    @Data
+    public static class Spu {
+
+        /**
+         * SPU 编号
+         */
+        private Integer id;
+
+        // ========== 基本信息 =========
+        /**
+         * SPU 名字
+         */
+        private String name;
+        /**
+         * 分类编号
+         */
+        private Integer cid;
+        /**
+         * 商品主图地址
+         *
+         * 数组，以逗号分隔
+         *
+         * 建议尺寸：800*800像素，你可以拖拽图片调整顺序，最多上传15张
+         */
+        private List<String> picUrls;
+
+    }
+
+    @ApiModel("费用（合计）")
+    @Data
+    @AllArgsConstructor
+    public static class Fee {
+
+        @ApiModelProperty(value = "购买总价", required = true, example = "1024")
+        private Integer buyPrice;
+        /**
+         * 优惠总价
+         *
+         * 注意，满多少元包邮，不算在优惠中。
+         */
+        private Integer discountTotal;
+        /**
+         * 邮费
+         */
+        private Integer postageTotal;
+        /**
+         * 最终价格
+         *
+         * 计算公式 = 总价 - 优惠总价 + 邮费
+         */
+        private Integer presentTotal;
+
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
new file mode 100644
index 000000000..195f7330f
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.trade.controller.app.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel("交易订单项 Response VO")
+@Data
+public class TradeOrderItemRespVO {
+
+    @ApiModelProperty(value = "id自增长", required = true)
+    private Integer id;
+    @ApiModelProperty(value = "订单编号", required = true)
+    private Integer orderId;
+    @ApiModelProperty(value = "订单项状态", required = true)
+    private Integer status;
+    @ApiModelProperty(value = "商品 SKU 编号", required = true)
+    private Integer skuId;
+    @ApiModelProperty(value = "商品 SPU 编号", required = true)
+    private Integer spuId;
+    @ApiModelProperty(value = "商品名字", required = true)
+    private String skuName;
+    @ApiModelProperty(value = "图片名字", required = true)
+    private String skuImage;
+    @ApiModelProperty(value = "商品数量", required = true)
+    private Integer quantity;
+    @ApiModelProperty(value = "原始单价，单位：分", required = true)
+    private Integer originPrice;
+    @ApiModelProperty(value = "购买单价，单位：分", required = true)
+    private Integer buyPrice;
+    @ApiModelProperty(value = "最终价格，单位：分", required = true)
+    private Integer presentPrice;
+    @ApiModelProperty(value = "购买总金额，单位：分", required = true)
+    private Integer buyTotal;
+    @ApiModelProperty(value = "优惠总金额，单位：分", required = true)
+    private Integer discountTotal;
+    @ApiModelProperty(value = "最终总金额，单位：分", required = true)
+    private Integer presentTotal;
+    @ApiModelProperty(value = "退款总金额，单位：分", required = true)
+    private Integer refundTotal;
+    @ApiModelProperty(value = "物流id")
+    private Integer logisticsId;
+    @ApiModelProperty(value = "售后状态", required = true)
+    private Integer afterSaleStatus;
+    @ApiModelProperty(value = "售后订单编号")
+    private Integer afterSaleOrderId;
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderPageReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderPageReqVO.java
new file mode 100644
index 000000000..5c8b6c872
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderPageReqVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.trade.controller.app.order.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@ApiModel("交易订单分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TradeOrderPageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "订单状态", example = "1", notes = "参见 TradeOrderStatusEnum 枚举")
+    private Integer orderStatus;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
new file mode 100644
index 000000000..4b7ffa77c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.trade.controller.app.order.vo;
+
+import lombok.*;
+import io.swagger.annotations.*;
+import java.util.*;
+
+@ApiModel("订单交易 Response VO")
+@Data
+public class TradeOrderRespVO {
+
+    @ApiModelProperty(value = "订单编号", required = true)
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", required = true)
+    private Integer userId;
+    @ApiModelProperty(value = "订单单号", required = true)
+    private String orderNo;
+    @ApiModelProperty(value = "订单状态", required = true)
+    private Integer orderStatus;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    @ApiModelProperty(value = "订单结束时间")
+    private Date endTime;
+    @ApiModelProperty(value = "订单金额(总金额)，单位：分", required = true)
+    private Integer buyPrice;
+    @ApiModelProperty(value = "优惠总金额，单位：分", required = true)
+    private Integer discountPrice;
+    @ApiModelProperty(value = "物流金额，单位：分", required = true)
+    private Integer logisticsPrice;
+    @ApiModelProperty(value = "最终金额，单位：分", required = true)
+    private Integer presentPrice;
+    @ApiModelProperty(value = "支付金额，单位：分", required = true)
+    private Integer payPrice;
+    @ApiModelProperty(value = "退款金额，单位：分", required = true)
+    private Integer refundPrice;
+    @ApiModelProperty(value = "付款时间")
+    private Date payTime;
+    @ApiModelProperty(value = "支付订单编号")
+    private Integer payTransactionId;
+    @ApiModelProperty(value = "支付渠道")
+    private Integer payChannel;
+    @ApiModelProperty(value = "配送类型", required = true)
+    private Integer deliveryType;
+    @ApiModelProperty(value = "发货时间")
+    private Date deliveryTime;
+    @ApiModelProperty(value = "收货时间")
+    private Date receiveTime;
+    @ApiModelProperty(value = "收件人名称", required = true)
+    private String receiverName;
+    @ApiModelProperty(value = "手机号", required = true)
+    private String receiverMobile;
+    @ApiModelProperty(value = "地区编码", required = true)
+    private Integer receiverAreaCode;
+    @ApiModelProperty(value = "收件详细地址", required = true)
+    private String receiverDetailAddress;
+    @ApiModelProperty(value = "售后状态", required = true)
+    private Integer afterSaleStatus;
+    @ApiModelProperty(value = "优惠劵编号")
+    private Integer couponCardId;
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+    /**
+     * 订单项数组
+     *
+     * // TODO 芋艿，后续考虑怎么优化下，目前是内嵌了别的 dto
+     */
+    private List<TradeOrderItemRespVO> orderItems;
+
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/refund/TradeRefundController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/refund/TradeRefundController.java
new file mode 100644
index 000000000..aa419190e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/refund/TradeRefundController.java
@@ -0,0 +1,4 @@
+package cn.iocoder.yudao.module.trade.controller.app.refund;
+
+public class TradeRefundController {
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/package-info.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/package-info.java
new file mode 100644
index 000000000..aa2f99f35
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * 提供 RESTful API 给前端：
+ * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目
+ * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
+ */
+package cn.iocoder.yudao.module.trade.controller;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
index 5722882ce..b92ca8b54 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartItemDO.java
@@ -36,12 +36,6 @@ public class CartItemDO extends BaseDO {
 
     // ========= 买家信息 BEGIN =========
 
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
     /**
      * 用户编号
      *
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index 175ebdc95..38cc67a48 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.order;
 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.enums.delivery.DeliveryTypeEnum;
-import cn.iocoder.yudao.module.trade.enums.order.TradeOrderCloseTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderCancelTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
-import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -32,67 +32,68 @@ public class TradeOrderDO extends BaseDO {
     /**
      * 订单编号，主键自增
      */
-    private Integer id;
+    private Long id;
     /**
      * 订单流水号
      *
      * 例如说，1146347329394184195
      */
     private String sn;
-    // TODO 芋艿：order_type 订单类型
     /**
      * 订单类型
      *
      * 枚举 {@link TradeOrderTypeEnum}
      */
-    private Integer type;
+    private Integer type; // TODO order_promotion_type
     /**
      * 订单来源终端
      *
      * 枚举 {@link TerminalEnum}
      */
     private Integer terminal;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
     /**
      * 用户编号
      *
      * 关联 MemberUserDO 的 id 编号
      */
     private Long userId;
+    /**
+     * 用户 IP
+     */
+    private String userIp;
+    /**
+     * 用户备注
+     */
+    private String userRemark;
     /**
      * 订单状态
      *
      * 枚举 {@link TradeOrderStatusEnum}
      */
     private Integer status;
-    /**
-     * 关闭类型
-     *
-     * 枚举 {@link TradeOrderCloseTypeEnum}
-     */
-    private Integer closeType;
     // TODO 芋艿：要不要存储 prod_name 购买的商品名门？
     /**
      * 购买的商品数量
      */
     private Integer productCount; // total_num
     /**
-     * 备注
+     * 订单完成时间
      */
-    private String remark;
-    /**
-     * 确认收获时间
-     */
-    private Date confirmTakeTime;
+    private Date finishTime;
     /**
      * 订单取消时间
      */
     private Date cancelTime;
+    /**
+     * 取消类型
+     *
+     * 枚举 {@link TradeOrderCancelTypeEnum}
+     */
+    private Integer cancelType;
+    /**
+     * 商家备注
+     */
+    private String remark;
 
     // ========== 价格 + 支付基本信息 ==========
     /**
@@ -101,39 +102,33 @@ public class TradeOrderDO extends BaseDO {
      * true - 已经支付过
      * false - 没有支付过
      */
-    private Boolean payed; // TODO payStatus 0 - 待付款；1 - 已付款；2 - 已退款
+    private Boolean payed;
     /**
      * 付款时间
      */
     private Date payTime;
 
-    // TODO 芋艿：delete_status 用户订单删除状态；0 - 未删除；1 - 回收站；2 - 永久删除
-
     // ========== 价格 + 支付基本信息 ==========
     /**
      * 购买（商品）总金额，单位：分
      */
-    private Integer buyPrice; // total
+    private Integer buyPrice; // niu - goods_money；
     /**
-     * 优惠总金额，单位：分。
+     * 运费金额，单位：分
      */
-    private Integer discountPrice; // reduce_amount
-    /**
-     * 物流金额 (分)
-     */
-    private Integer logisticsPrice; // freight_amount; freight_price
+    private Integer deliveryPrice; // niu - delivery_money；
     /**
      * 最终金额，单位：分
      *
-     * buyPrice + logisticsPrice -  discountPrice = presentPrice
+     * presentPrice = buyPrice + deliveryPrice -  couponPrice - integralPrice - marketPrice
      */
-    private Integer presentPrice; // actual_total
+    private Integer presentPrice; // niu - order_money；
     /**
      * 实际已支付金额，单位：分
      *
      * 初始时，金额为 0 。等到支付成功后，会进行更新。
      */
-    private Integer payPrice;
+    private Integer payPrice; // niu - pay_money；
     /**
      * 支付订单编号
      *
@@ -148,10 +143,19 @@ public class TradeOrderDO extends BaseDO {
     // ========== 收件 + 物流基本信息 ==========
     /**
      * 配送方式
+     * 会员用户下单时，选择的配送方式
      *
      * 枚举 {@link DeliveryTypeEnum}
      */
     private Integer deliveryType;
+    /**
+     * 实际的配送方式
+     * 管理后台发货时，选择的配送方式
+     *
+     * 0 - 无需物流
+     * 枚举 {@link DeliveryTypeEnum}
+     */
+    private Integer actualDeliveryType; // like - shipping_status；
     /**
      * 配置模板的编号
      *
@@ -162,6 +166,13 @@ public class TradeOrderDO extends BaseDO {
      * 物流公司单号
      */
     private String expressNo; // dvy_flow_id
+    /**
+     * 发货状态
+     *
+     * true - 已发货
+     * false - 未发货
+     */
+    private Boolean deliveryStatus;
     /**
      * 发货时间
      */
@@ -210,26 +221,35 @@ public class TradeOrderDO extends BaseDO {
     /**
      * 优惠劵编号
      */
-    private Integer couponId;
-
-    // TODO 芋艿，这块还要结合营销和价格计算，在去优化下。
+    private Long couponId;
+    /**
+     * 优惠劵减免金额，单位：分
+     */
+    private Integer couponPrice; // niu - coupon_money；
+    /**
+     * 营销减免金额，单位：分
+     *
+     * 例如说：满减折扣
+     */
+    private Integer marketPrice; // niu - promotion_money；
+    /**
+     * 积分抵扣的金额，单位：分
+     */
+    private Integer integralPrice;
+    /**
+     * 使用的积分
+     */
+    private Integer useIntegral;
 
     // TODO ========== 待定字段：yv =========
     // TODO cart_id：购物车 id
-    // TODO total_postage：邮费
-    // TODO pay_postage：支付邮费
-    // TODO coupon_price：优惠劵金额；
-    // TODO refund_status：0 未退款；1 申请中；2 已退款
     // TODO refund_reason_wap_img：退款图片
     // TODO refund_reason_wap_explain：退款用户说明
     // TODO refund_reason_time：退款时间
     // TODO refund_reason_wap：前台退款原因
     // TODO refund_reason：不退款的理由
-    // TODO refund_price：退款金额
 
     // TODO gain_integral：消费赚取积分
-    // TODO use_integral：使用积分
-    // TODO pay_integral：实际支付积分
     // TODO back_integral：给用户退了多少积分
 
     // TODO combination_id：拼团产品id
@@ -246,18 +266,19 @@ public class TradeOrderDO extends BaseDO {
     // TODO is_alter_price：是否改价
     // TODO out_trade_no：商户系统内部的订单号 String
 
-    // TODO ========== 待定字段：lf =========
-    // TODO integral_amount：积分抵扣金额
-    // TODO shipping_status：发货状态
-    // TODO shipping_time：最后新发货时间
-
     // TODO ========== 待定字段：lf =========
     // TODO settle_id：未结算
     // TODO settle_amount：结算金额
-    // TODO use_integral：使用的积分
     // TODO team_found_id: 拼团id
     // TODO team_id: 拼团活动id
     // TODO delivery_id: 发货单ID
     // TODO attach_values: 附带的值(赠送时机，赠送积分成长值什么的)Json格式
 
+    // TODO ========== 待定字段：nf =========
+    // TODO delivery_code：整体提货编码
+
+    // TODO ========== 待定字段：niu =========
+    // TODO adjust_money '订单调整金额'
+    // TODO balance_money ''余额支付金额''
+
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
index 6bdb7c6d4..81961928e 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
@@ -26,13 +26,7 @@ public class TradeOrderItemDO extends BaseDO {
     /**
      * 编号
      */
-    private Integer id;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
+    private Long id;
     /**
      * 用户编号
      *
@@ -47,12 +41,6 @@ public class TradeOrderItemDO extends BaseDO {
     private Long orderId;
 
     // ========== 商品基本信息 ==========
-    /**
-     * 商品 SPU 编号
-     *
-     * 关联 ProductSpuDO 的 id 编号
-     */
-    private Long spuId;
     /**
      * 商品 SKU 编号
      *
@@ -75,7 +63,7 @@ public class TradeOrderItemDO extends BaseDO {
     /**
      * 购买数量
      */
-    private Integer stock;
+    private Integer count;
     /**
      * 是否评论
      *
@@ -85,37 +73,47 @@ public class TradeOrderItemDO extends BaseDO {
     private Boolean commented;
 
     // ========== 价格 + 支付基本信息 ==========
-    /**
-     * 原始单价，单位：分。
-     */
-    private Integer originPrice; // price
     /**
      * 购买单价，单位：分
+     *
+     * 对应 ProductSkuDO 的 price 字段
      */
-    private Integer buyPrice;
+    private Integer buyPrice; // like - original_price；niu - costPrice
     /**
      * 最终单价，单位：分。
      */
-    private Integer presentPrice;
+    private Integer presentPrice; // like - goods_price；niu - price
     /**
      * 购买总金额，单位：分
-     *
-     * 用途类似 {@link #presentTotal}
      */
-    private Integer buyTotal;
-    /**
-     * 优惠总金额，单位：分。
-     */
-    private Integer discountTotal;
+    private Integer buyTotal; // like - total_price；niu - 暂无
     /**
      * 最终总金额，单位：分。
      *
-     * 注意，presentPrice * stock 不一定等于 presentTotal 。
+     * 注意，presentPrice * count 不一定等于 presentTotal 。
      * 因为，存在无法整除的情况。
      * 举个例子，presentPrice = 8.33 ，stock = 3 的情况，presentTotal 有可能是 24.99 ，也可能是 25 。
      * 所以，需要存储一个该字段。
      */
-    private Integer presentTotal; // product_total_amount
+    private Integer presentTotal; // like -  total_pay_price；niu - goods_money
+
+    // ========== 营销基本信息 ==========
+    /**
+     * 优惠劵满减金额，单位：分
+     */
+    private Integer couponTotal; // like - discount_price；niu - coupon_money
+    /**
+     * 营销减免金额，单位：分
+     */
+    private Integer marketTotal; // like - discount_price；niu - promotion_money
+    /**
+     * 积分抵扣的金额，单位：分
+     */
+    private Integer integralTotal; // like - integral_price；niu - point_money
+    /**
+     * 使用的积分
+     */
+    private Integer useIntegral; // niu - use_point
 
     // ========== 退款基本信息 ==========
     /**
@@ -123,7 +121,7 @@ public class TradeOrderItemDO extends BaseDO {
      *
      * 枚举 {@link TradeOrderItemRefundStatusEnum}
      */
-    private Integer refundStatus;
+    private Integer refundStatus; // TODO 芋艿：可以考虑去查
     // 如上字段，举个例子：
     // 假设购买三个，即 stock = 3 。
     // originPrice = 15
@@ -178,4 +176,22 @@ public class TradeOrderItemDO extends BaseDO {
     // TODO goods_info 商品信息
 
     // TODO integral_price：积分抵扣的金额
+
+    // TODO 待确定：niu
+    // TODO is_virtual '是否是虚拟商品'
+    // TODO goods_class '商品种类(1.实物 2.虚拟3.卡券)'
+    // TODO adjust_money ''调整金额''
+
+    // TODO is_fenxiao 是否分销,
+    // TODO adjust_money 是否分销,
+
+    // TODO delivery_status '配送状态'
+    // TODO delivery_no ''配送单号''
+    // TODO gift_flag '赠品标识'
+    // TODO gift_flag '赠品标识'
+
+    // TODO refund_status '退款状态'
+    // TODO refund_type '退款状态'
+    // TODO 一堆退款字段
 }
+
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
index 6c910df4c..cd246a297 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
@@ -42,12 +42,6 @@ public class TradeRefundDO extends BaseDO {
      * 枚举 {@link TradeOrderRefundStatusEnum}
      */
     private Integer status;
-//    /**
-//     * 店铺编号
-//     *
-//     * 关联 {@link ShopDO#getId()} TODO 芋艿：多店铺，暂不考虑
-//     */
-//    private Long shopId;
     /**
      * 用户编号
      *
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index 55c91e2f8..c7090aa6e 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -51,6 +51,11 @@
             <artifactId>yudao-module-product-biz</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-trade-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <!-- 数据报表 -->
 <!--        <dependency>-->
 <!--            <groupId>cn.iocoder.boot</groupId>-->

From f0ee6467b3befb653dfebb6686cd29bfcd966151 Mon Sep 17 00:00:00 2001
From: wuxiran <wuxiran@outlook.com>
Date: Tue, 9 Aug 2022 11:50:46 +0800
Subject: [PATCH 25/56] =?UTF-8?q?mall:=E6=8F=90=E4=BA=A4=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8sql=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/coupon.sql | 85 ++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 sql/optional/mall/coupon.sql

diff --git a/sql/optional/mall/coupon.sql b/sql/optional/mall/coupon.sql
new file mode 100644
index 000000000..962d70ca6
--- /dev/null
+++ b/sql/optional/mall/coupon.sql
@@ -0,0 +1,85 @@
+DROP TABLE IF EXISTS `coupon`;
+CREATE TABLE `coupon`
+(
+    `id`                        bigint                                                         NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+    `type`                      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '优惠券类型 reward-满减 discount-折扣 random-随机',
+    `name`               varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NOT NULL COMMENT '优惠券名称',
+    `coupon_type_id`            bigint UNSIGNED                                                         DEFAULT 0 COMMENT '优惠券类型id',
+    `coupon_code`               varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '优惠券编码',
+    `member_id`                 bigint UNSIGNED                                                NOT NULL DEFAULT 0 COMMENT '领用人',
+    `use_order_id`              bigint UNSIGNED                                                NOT NULL DEFAULT 0 COMMENT '优惠券使用订单id',
+    `goods_type`                tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用',
+    `goods_ids`                 varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '适用商品id',
+    `at_least`                  decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '最小金额',
+    `money`                     decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '面额',
+    `discount`                  decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '1 =< 折扣 <= 9.9 当type为discount时需要添加',
+    `discount_limit`            decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '最多折扣金额 当type为discount时可选择性添加',
+    `whether_forbid_preference` tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用',
+    `whether_expire_notice`     tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '是否开启过期提醒0-不开启 1-开启',
+    `expire_notice_fixed_term`  int(11) UNSIGNED                                               NOT NULL DEFAULT 0 COMMENT '过期前N天提醒',
+    `whether_noticed`           tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '是否已提醒',
+    `state`                     tinyint(4) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '优惠券状态 1已领用（未使用） 2已使用 3已过期',
+    `get_type`                  tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取',
+    `fetch_time`                datetime                                                       NOT NULL DEFAULT 0 COMMENT '领取时间',
+    `use_time`                  datetime                                                       NOT NULL DEFAULT 0 COMMENT '使用时间',
+    `start_time`                datetime                                                       NOT NULL DEFAULT 0 COMMENT '可使用的开始时间',
+    `end_time`                  datetime                                                       NOT NULL DEFAULT 0 COMMENT '有效期结束时间',
+    `creator`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NULL     DEFAULT '' COMMENT '创建者',
+    `create_time`               datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NULL     DEFAULT '' COMMENT '更新者',
+    `update_time`               datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`                   bit(1)                                                         NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`                 bigint                                                         NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 119
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci COMMENT = '优惠券';
+
+DROP TABLE IF EXISTS `coupon_templete`;
+CREATE TABLE `coupon_templete`
+(
+    `id`                        bigint                                                       NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+    `type`                      varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '优惠券类型 reward-满减 discount-折扣 random-随机',
+    `name`               varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '优惠券名称',
+    `coupon_name_remark`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '名称备注',
+    `image`                     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '优惠券图片',
+    `count`                     int(11)                                                      NOT NULL DEFAULT 0 COMMENT '发放数量',
+    `lead_count`                int(11)                                                      NOT NULL DEFAULT 0 COMMENT '已领取数量',
+    `used_count`                int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '已使用数量',
+    `goods_type`                tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 1 COMMENT '适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用',
+    `product_ids`               varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '适用商品id',
+    `has_use_limit`             tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '使用门槛0-无门槛 1-有门槛',
+    `at_least`                  decimal(10, 2)                                               NOT NULL DEFAULT 0 COMMENT '满多少元使用 0代表无限制',
+    `money`                     decimal(10, 2)                                               NOT NULL DEFAULT 0 COMMENT '发放面额 当type为reward时需要添加',
+    `discount`                  decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '1 =< 折扣 <= 9.9 当type为discount时需要添加',
+    `discount_limit`            decimal(10, 2)                                               NOT NULL DEFAULT 0 COMMENT '最多折扣金额 当type为discount时可选择性添加',
+    `min_money`                 decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '最低金额 当type为radom时需要添加',
+    `max_money`                 decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '最大金额 当type为radom时需要添加',
+    `validity_type`             tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期',
+    `start_use_time`            int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '使用开始日期 过期类型1时必填',
+    `end_use_time`              int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '使用结束日期 过期类型1时必填',
+    `fixed_term`                int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效',
+    `whether_limitless`         tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否无限制0-否 1是',
+    `max_fetch`                 int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '每人最大领取个数',
+    `whether_expire_notice`     tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否开启过期提醒0-不开启 1-开启',
+    `expire_notice_fixed_term`  int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '过期前N天提醒',
+    `whether_forbid_preference` tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用',
+    `whether_show`              int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '是否显示',
+    `discount_order_money`      decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '订单的优惠总金额',
+    `order_money`               decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '用券总成交额',
+    `whether_forbidden`         tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否禁止发放0-否 1-是',
+    `order_goods_num`           int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '使用优惠券购买的商品数量',
+    `status`                    int(11)                                                      NOT NULL DEFAULT 0 COMMENT '状态（1进行中2已结束-1已关闭）',
+    `end_time`                  int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '有效日期结束时间',
+    `creator`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL     DEFAULT '' COMMENT '创建者',
+    `create_time`               datetime                                                     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL     DEFAULT '' COMMENT '更新者',
+    `update_time`               datetime                                                     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`                   bit(1)                                                       NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`                 bigint                                                       NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 119
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci COMMENT = '优惠券';
\ No newline at end of file

From d2a9a49dad93e0606aa92e20d81fc743e210d7bd Mon Sep 17 00:00:00 2001
From: wuxiran <wuxiran@outlook.com>
Date: Tue, 9 Aug 2022 19:47:59 +0800
Subject: [PATCH 26/56] =?UTF-8?q?mall:=E6=9B=B4=E6=96=B0=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E6=A8=A1=E6=9D=BFsql=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/coupon.sql | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sql/optional/mall/coupon.sql b/sql/optional/mall/coupon.sql
index 962d70ca6..4ab7b1ff9 100644
--- a/sql/optional/mall/coupon.sql
+++ b/sql/optional/mall/coupon.sql
@@ -3,7 +3,7 @@ CREATE TABLE `coupon`
 (
     `id`                        bigint                                                         NOT NULL AUTO_INCREMENT COMMENT '用户ID',
     `type`                      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '优惠券类型 reward-满减 discount-折扣 random-随机',
-    `name`               varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NOT NULL COMMENT '优惠券名称',
+    `name`                      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NOT NULL COMMENT '优惠券名称',
     `coupon_type_id`            bigint UNSIGNED                                                         DEFAULT 0 COMMENT '优惠券类型id',
     `coupon_code`               varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '优惠券编码',
     `member_id`                 bigint UNSIGNED                                                NOT NULL DEFAULT 0 COMMENT '领用人',
@@ -41,7 +41,7 @@ CREATE TABLE `coupon_templete`
 (
     `id`                        bigint                                                       NOT NULL AUTO_INCREMENT COMMENT '用户ID',
     `type`                      varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '优惠券类型 reward-满减 discount-折扣 random-随机',
-    `name`               varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '优惠券名称',
+    `name`                      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '优惠券名称',
     `coupon_name_remark`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '名称备注',
     `image`                     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '优惠券图片',
     `count`                     int(11)                                                      NOT NULL DEFAULT 0 COMMENT '发放数量',
@@ -57,8 +57,8 @@ CREATE TABLE `coupon_templete`
     `min_money`                 decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '最低金额 当type为radom时需要添加',
     `max_money`                 decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '最大金额 当type为radom时需要添加',
     `validity_type`             tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期',
-    `start_use_time`            int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '使用开始日期 过期类型1时必填',
-    `end_use_time`              int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '使用结束日期 过期类型1时必填',
+    `start_use_time`            datetime COMMENT '使用开始日期 过期类型1时必填',
+    `end_use_time`              datetime COMMENT '使用结束日期 过期类型1时必填',
     `fixed_term`                int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效',
     `whether_limitless`         tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否无限制0-否 1是',
     `max_fetch`                 int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '每人最大领取个数',
@@ -70,8 +70,8 @@ CREATE TABLE `coupon_templete`
     `order_money`               decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '用券总成交额',
     `whether_forbidden`         tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否禁止发放0-否 1-是',
     `order_goods_num`           int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '使用优惠券购买的商品数量',
-    `status`                    int(11)                                                      NOT NULL DEFAULT 0 COMMENT '状态（1进行中2已结束-1已关闭）',
-    `end_time`                  int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '有效日期结束时间',
+    `status`                    tinyint(11)                                                  NOT NULL DEFAULT 0 COMMENT '状态（1进行中2已结束-1已关闭）',
+    `end_time`                  datetime COMMENT '有效日期结束时间',
     `creator`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL     DEFAULT '' COMMENT '创建者',
     `create_time`               datetime                                                     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updater`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL     DEFAULT '' COMMENT '更新者',
@@ -82,4 +82,4 @@ CREATE TABLE `coupon_templete`
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 119
   CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_unicode_ci COMMENT = '优惠券';
\ No newline at end of file
+  COLLATE = utf8mb4_unicode_ci COMMENT = '优惠券模板';
\ No newline at end of file

From ac8f62a2be6a648776c16f5709a68cd9722bc99e Mon Sep 17 00:00:00 2001
From: wuxiran <wuxiran@outlook.com>
Date: Tue, 9 Aug 2022 22:10:48 +0800
Subject: [PATCH 27/56] =?UTF-8?q?mall:=E4=B8=8A=E4=BC=A0=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E7=94=9F=E6=88=90=E7=9A=84=E6=A8=A1=E6=9D=BF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-module-mall/pom.xml                     |   2 +
 .../yudao-module-coupon-api/pom.xml           |  28 ++++
 .../enums/ErrorCodeConstants.java             |  20 +++
 .../yudao-module-coupon-biz/pom.xml           |  63 +++++++
 .../admin/coupon/CouponController.java        | 100 +++++++++++
 .../admin/coupon/vo/CouponBaseVO.java         | 110 ++++++++++++
 .../admin/coupon/vo/CouponCreateReqVO.java    |  14 ++
 .../admin/coupon/vo/CouponExcelVO.java        |  90 ++++++++++
 .../admin/coupon/vo/CouponExportReqVO.java    |  91 ++++++++++
 .../admin/coupon/vo/CouponPageReqVO.java      |  93 +++++++++++
 .../admin/coupon/vo/CouponRespVO.java         |  19 +++
 .../admin/coupon/vo/CouponUpdateReqVO.java    |  18 ++
 .../CouponTempleteController.java             | 100 +++++++++++
 .../vo/CouponTempleteBaseVO.java              | 144 ++++++++++++++++
 .../vo/CouponTempleteCreateReqVO.java         |  12 ++
 .../vo/CouponTempleteExcelVO.java             | 119 +++++++++++++
 .../vo/CouponTempleteExportReqVO.java         | 119 +++++++++++++
 .../vo/CouponTempletePageReqVO.java           | 122 ++++++++++++++
 .../vo/CouponTempleteRespVO.java              |  19 +++
 .../vo/CouponTempleteUpdateReqVO.java         |  17 ++
 .../CouponTemplete/CouponTempleteConvert.java |  38 +++++
 .../coupon/convert/coupon/CouponConvert.java  |  34 ++++
 .../CouponTemplete/CouponTempleteDO.java      | 158 ++++++++++++++++++
 .../dal/dataobject/coupon/CouponDO.java       | 118 +++++++++++++
 .../CouponTemplete/CouponTempleteMapper.java  |  98 +++++++++++
 .../coupon/dal/mysql/coupon/CouponMapper.java |  76 +++++++++
 .../CouponTemplete/CouponTempleteService.java |  70 ++++++++
 .../CouponTempleteServiceImpl.java            |  87 ++++++++++
 .../coupon/service/coupon/CouponService.java  |  70 ++++++++
 .../service/coupon/CouponServiceImpl.java     |  82 +++++++++
 .../CouponTemplete/CouponTempleteMapper.xml   |  12 ++
 .../resources/mapper/coupon/CouponMapper.xml  |  12 ++
 32 files changed, 2155 insertions(+)
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/pom.xml
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/pom.xml
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponCreateReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponUpdateReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteCreateReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExcelVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExportReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempletePageReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteRespVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteUpdateReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/coupon/CouponConvert.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/coupon/CouponMapper.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/CouponTemplete/CouponTempleteMapper.xml
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/coupon/CouponMapper.xml

diff --git a/yudao-module-mall/pom.xml b/yudao-module-mall/pom.xml
index 29d5d2d2b..23812b4cc 100644
--- a/yudao-module-mall/pom.xml
+++ b/yudao-module-mall/pom.xml
@@ -24,6 +24,8 @@
         <module>yudao-module-product-biz</module>
         <module>yudao-module-trade-api</module>
         <module>yudao-module-trade-biz</module>
+        <module>yudao-module-coupon-api</module>
+        <module>yudao-module-coupon-biz</module>
     </modules>
 
 </project>
diff --git a/yudao-module-mall/yudao-module-coupon-api/pom.xml b/yudao-module-mall/yudao-module-coupon-api/pom.xml
new file mode 100644
index 000000000..e98526f9c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-coupon-api</artifactId>
+    <packaging>jar</packaging>
+
+
+    <name>${project.artifactId}</name>
+    <description>
+        coupon 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java
new file mode 100644
index 000000000..331824466
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+
+/**
+ * coupon 优惠券错误码枚举类
+ *
+ * coupon 优惠券系统，使用 1-010-000-000 段
+ */
+public interface ErrorCodeConstants {
+    // ========== COUPON分类相关 1010001000 ============
+
+    ErrorCode COUPON_TEMPLETE_NOT_EXISTS = new ErrorCode(1010001000, "优惠券模板不存在");
+
+    // ========== COUPON分类相关 1010002000 ============
+    ErrorCode COUPON_NOT_EXISTS = new ErrorCode(1010001000, "优惠券模板不存在");
+
+
+}
+
diff --git a/yudao-module-mall/yudao-module-coupon-biz/pom.xml b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
new file mode 100644
index 000000000..735d5180d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>yudao-module-mall</artifactId>
+        <groupId>cn.iocoder.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-coupon-biz</artifactId>
+    <packaging>jar</packaging>
+
+
+    <name>${project.artifactId}</name>
+    <description>
+        trade 模块，主要实现交易相关功能
+        例如：订单、退款、购物车等功能。
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-coupon-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
new file mode 100644
index 000000000..21a91e4b5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.annotations.*;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo.*;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.coupon.CouponDO;
+import cn.iocoder.yudao.module.coupon.convert.coupon.CouponConvert;
+import cn.iocoder.yudao.module.coupon.service.coupon.CouponService;
+
+@Api(tags = "管理后台 - 优惠券")
+@RestController
+@RequestMapping("/coupon/")
+@Validated
+public class CouponController {
+
+    @Resource
+    private CouponService Service;
+
+    @PostMapping("/create")
+    @ApiOperation("创建优惠券")
+    @PreAuthorize("@ss.hasPermission('coupon::create')")
+    public CommonResult<Long> create(@Valid @RequestBody CouponCreateReqVO createReqVO) {
+        return success(Service.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("更新优惠券")
+    @PreAuthorize("@ss.hasPermission('coupon::update')")
+    public CommonResult<Boolean> update(@Valid @RequestBody CouponUpdateReqVO updateReqVO) {
+        Service.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除优惠券")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('coupon::delete')")
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        Service.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得优惠券")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('coupon::query')")
+    public CommonResult<CouponRespVO> get(@RequestParam("id") Long id) {
+        CouponDO couponDO = Service.get(id);
+        return success(CouponConvert.INSTANCE.convert(couponDO));
+    }
+
+    @GetMapping("/list")
+    @ApiOperation("获得优惠券列表")
+    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    @PreAuthorize("@ss.hasPermission('coupon::query')")
+    public CommonResult<List<CouponRespVO>> getList(@RequestParam("ids") Collection<Long> ids) {
+        List<CouponDO> list = Service.getList(ids);
+        return success(CouponConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("获得优惠券分页")
+    @PreAuthorize("@ss.hasPermission('coupon::query')")
+    public CommonResult<PageResult<CouponRespVO>> getPage(@Valid CouponPageReqVO pageVO) {
+        PageResult<CouponDO> pageResult = Service.getPage(pageVO);
+        return success(CouponConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @ApiOperation("导出优惠券 Excel")
+    @PreAuthorize("@ss.hasPermission('coupon::export')")
+    @OperateLog(type = EXPORT)
+    public void exportExcel(@Valid CouponExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<CouponDO> list = Service.getList(exportReqVO);
+        // 导出 Excel
+        List<CouponExcelVO> datas = CouponConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "优惠券.xls", "数据", CouponExcelVO.class, datas);
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
new file mode 100644
index 000000000..20dba42d8
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
@@ -0,0 +1,110 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+* 优惠券 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
+@Data
+public class CouponBaseVO {
+
+    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机", required = true)
+    @NotNull(message = "优惠券类型 reward-满减 discount-折扣 random-随机不能为空")
+    private String type;
+
+    @ApiModelProperty(value = "优惠券名称", required = true)
+    @NotNull(message = "优惠券名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "优惠券类型id")
+    private Long couponTypeId;
+
+    @ApiModelProperty(value = "优惠券编码", required = true)
+    @NotNull(message = "优惠券编码不能为空")
+    private String couponCode;
+
+    @ApiModelProperty(value = "领用人", required = true)
+    @NotNull(message = "领用人不能为空")
+    private Long memberId;
+
+    @ApiModelProperty(value = "优惠券使用订单id", required = true)
+    @NotNull(message = "优惠券使用订单id不能为空")
+    private Long useOrderId;
+
+    @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用", required = true)
+    @NotNull(message = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用不能为空")
+    private Boolean goodsType;
+
+    @ApiModelProperty(value = "适用商品id", required = true)
+    @NotNull(message = "适用商品id不能为空")
+    private String goodsIds;
+
+    @ApiModelProperty(value = "最小金额", required = true)
+    @NotNull(message = "最小金额不能为空")
+    private BigDecimal atLeast;
+
+    @ApiModelProperty(value = "面额", required = true)
+    @NotNull(message = "面额不能为空")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加", required = true)
+    @NotNull(message = "1 =< 折扣 <= 9.9 当type为discount时需要添加不能为空")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加", required = true)
+    @NotNull(message = "最多折扣金额 当type为discount时可选择性添加不能为空")
+    private BigDecimal discountLimit;
+
+    @ApiModelProperty(value = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用", required = true)
+    @NotNull(message = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用不能为空")
+    private Boolean whetherForbidPreference;
+
+    @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启", required = true)
+    @NotNull(message = "是否开启过期提醒0-不开启 1-开启不能为空")
+    private Boolean whetherExpireNotice;
+
+    @ApiModelProperty(value = "过期前N天提醒", required = true)
+    @NotNull(message = "过期前N天提醒不能为空")
+    private Integer expireNoticeFixedTerm;
+
+    @ApiModelProperty(value = "是否已提醒", required = true)
+    @NotNull(message = "是否已提醒不能为空")
+    private Boolean whetherNoticed;
+
+    @ApiModelProperty(value = "优惠券状态 1已领用（未使用） 2已使用 3已过期", required = true)
+    @NotNull(message = "优惠券状态 1已领用（未使用） 2已使用 3已过期不能为空")
+    private Integer state;
+
+    @ApiModelProperty(value = "获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取", required = true)
+    @NotNull(message = "获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取不能为空")
+    private Boolean getType;
+
+    @ApiModelProperty(value = "领取时间", required = true)
+    @NotNull(message = "领取时间不能为空")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date fetchTime;
+
+    @ApiModelProperty(value = "使用时间", required = true)
+    @NotNull(message = "使用时间不能为空")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date useTime;
+
+    @ApiModelProperty(value = "可使用的开始时间", required = true)
+    @NotNull(message = "可使用的开始时间不能为空")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date startTime;
+
+    @ApiModelProperty(value = "有效期结束时间", required = true)
+    @NotNull(message = "有效期结束时间不能为空")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponCreateReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponCreateReqVO.java
new file mode 100644
index 000000000..2cd3cb419
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponCreateReqVO.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+@ApiModel("管理后台 - 优惠券创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponCreateReqVO extends CouponBaseVO {
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
new file mode 100644
index 000000000..f7d1d1d6f
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
@@ -0,0 +1,90 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import io.swagger.annotations.*;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * 优惠券 Excel VO
+ *
+ * @author wxr
+ */
+@Data
+public class CouponExcelVO {
+
+    @ExcelProperty("用户ID")
+    private Long id;
+
+    @ExcelProperty("优惠券类型 reward-满减 discount-折扣 random-随机")
+    private String type;
+
+    @ExcelProperty("优惠券名称")
+    private String name;
+
+    @ExcelProperty("优惠券类型id")
+    private Long couponTypeId;
+
+    @ExcelProperty("优惠券编码")
+    private String couponCode;
+
+    @ExcelProperty("领用人")
+    private Long memberId;
+
+    @ExcelProperty("优惠券使用订单id")
+    private Long useOrderId;
+
+    @ExcelProperty("适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用")
+    private Boolean goodsType;
+
+    @ExcelProperty("适用商品id")
+    private String goodsIds;
+
+    @ExcelProperty("最小金额")
+    private BigDecimal atLeast;
+
+    @ExcelProperty("面额")
+    private BigDecimal money;
+
+    @ExcelProperty("1 =< 折扣 <= 9.9 当type为discount时需要添加")
+    private BigDecimal discount;
+
+    @ExcelProperty("最多折扣金额 当type为discount时可选择性添加")
+    private BigDecimal discountLimit;
+
+    @ExcelProperty("优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用")
+    private Boolean whetherForbidPreference;
+
+    @ExcelProperty("是否开启过期提醒0-不开启 1-开启")
+    private Boolean whetherExpireNotice;
+
+    @ExcelProperty("过期前N天提醒")
+    private Integer expireNoticeFixedTerm;
+
+    @ExcelProperty("是否已提醒")
+    private Boolean whetherNoticed;
+
+    @ExcelProperty("优惠券状态 1已领用（未使用） 2已使用 3已过期")
+    private Integer state;
+
+    @ExcelProperty("获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取")
+    private Boolean getType;
+
+    @ExcelProperty("领取时间")
+    private Date fetchTime;
+
+    @ExcelProperty("使用时间")
+    private Date useTime;
+
+    @ExcelProperty("可使用的开始时间")
+    private Date startTime;
+
+    @ExcelProperty("有效期结束时间")
+    private Date endTime;
+
+    @ExcelProperty("创建时间")
+    private Date createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
new file mode 100644
index 000000000..a195a61de
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
@@ -0,0 +1,91 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo;
+
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+import io.swagger.annotations.*;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel(value = "管理后台 - 优惠券 Excel 导出 Request VO", description = "参数和 CouponPageReqVO 是一致的")
+@Data
+public class CouponExportReqVO {
+
+    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机")
+    private String type;
+
+    @ApiModelProperty(value = "优惠券名称")
+    private String name;
+
+    @ApiModelProperty(value = "优惠券类型id")
+    private Long couponTypeId;
+
+    @ApiModelProperty(value = "优惠券编码")
+    private String couponCode;
+
+    @ApiModelProperty(value = "领用人")
+    private Long memberId;
+
+    @ApiModelProperty(value = "优惠券使用订单id")
+    private Long useOrderId;
+
+    @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用")
+    private Boolean goodsType;
+
+    @ApiModelProperty(value = "适用商品id")
+    private String goodsIds;
+
+    @ApiModelProperty(value = "最小金额")
+    private BigDecimal atLeast;
+
+    @ApiModelProperty(value = "面额")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加")
+    private BigDecimal discountLimit;
+
+    @ApiModelProperty(value = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用")
+    private Boolean whetherForbidPreference;
+
+    @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启")
+    private Boolean whetherExpireNotice;
+
+    @ApiModelProperty(value = "过期前N天提醒")
+    private Integer expireNoticeFixedTerm;
+
+    @ApiModelProperty(value = "是否已提醒")
+    private Boolean whetherNoticed;
+
+    @ApiModelProperty(value = "优惠券状态 1已领用（未使用） 2已使用 3已过期")
+    private Integer state;
+
+    @ApiModelProperty(value = "获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取")
+    private Boolean getType;
+
+    @ApiModelProperty(value = "领取时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] fetchTime;
+
+    @ApiModelProperty(value = "使用时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] useTime;
+
+    @ApiModelProperty(value = "可使用的开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] startTime;
+
+    @ApiModelProperty(value = "有效期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
new file mode 100644
index 000000000..9573200a5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo;
+
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+import io.swagger.annotations.*;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 优惠券分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponPageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机")
+    private String type;
+
+    @ApiModelProperty(value = "优惠券名称")
+    private String name;
+
+    @ApiModelProperty(value = "优惠券类型id")
+    private Long couponTypeId;
+
+    @ApiModelProperty(value = "优惠券编码")
+    private String couponCode;
+
+    @ApiModelProperty(value = "领用人")
+    private Long memberId;
+
+    @ApiModelProperty(value = "优惠券使用订单id")
+    private Long useOrderId;
+
+    @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用")
+    private Boolean goodsType;
+
+    @ApiModelProperty(value = "适用商品id")
+    private String goodsIds;
+
+    @ApiModelProperty(value = "最小金额")
+    private BigDecimal atLeast;
+
+    @ApiModelProperty(value = "面额")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加")
+    private BigDecimal discountLimit;
+
+    @ApiModelProperty(value = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用")
+    private Boolean whetherForbidPreference;
+
+    @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启")
+    private Boolean whetherExpireNotice;
+
+    @ApiModelProperty(value = "过期前N天提醒")
+    private Integer expireNoticeFixedTerm;
+
+    @ApiModelProperty(value = "是否已提醒")
+    private Boolean whetherNoticed;
+
+    @ApiModelProperty(value = "优惠券状态 1已领用（未使用） 2已使用 3已过期")
+    private Integer state;
+
+    @ApiModelProperty(value = "获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取")
+    private Boolean getType;
+
+    @ApiModelProperty(value = "领取时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] fetchTime;
+
+    @ApiModelProperty(value = "使用时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] useTime;
+
+    @ApiModelProperty(value = "可使用的开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] startTime;
+
+    @ApiModelProperty(value = "有效期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
new file mode 100644
index 000000000..9055a36a0
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+
+@ApiModel("管理后台 - 优惠券 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponRespVO extends CouponBaseVO {
+
+    @ApiModelProperty(value = "用户ID", required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponUpdateReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponUpdateReqVO.java
new file mode 100644
index 000000000..0c1a741ca
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponUpdateReqVO.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+@ApiModel("管理后台 - 优惠券更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponUpdateReqVO extends CouponBaseVO {
+
+    @ApiModelProperty(value = "用户ID", required = true)
+    @NotNull(message = "用户ID不能为空")
+    private Long id;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
new file mode 100644
index 000000000..d60ed45aa
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete;
+
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.*;
+import cn.iocoder.yudao.module.coupon.convert.CouponTemplete.CouponTempleteConvert;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
+import cn.iocoder.yudao.module.coupon.service.CouponTemplete.CouponTempleteService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.annotations.*;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+
+
+@Api(tags = "管理后台 - 优惠券模板")
+@RestController
+@RequestMapping("/CouponTemplete/")
+@Validated
+public class CouponTempleteController {
+
+    @Resource
+    private CouponTempleteService Service;
+
+    @PostMapping("/create")
+    @ApiOperation("创建优惠券模板")
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::create')")
+    public CommonResult<Long> create(@Valid @RequestBody CouponTempleteCreateReqVO createReqVO) {
+        return success(Service.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("更新优惠券模板")
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::update')")
+    public CommonResult<Boolean> update(@Valid @RequestBody CouponTempleteUpdateReqVO updateReqVO) {
+        Service.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除优惠券模板")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::delete')")
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        Service.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得优惠券模板")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
+    public CommonResult<CouponTempleteRespVO> get(@RequestParam("id") Long id) {
+        CouponTempleteDO couponTempleteDO = Service.get(id);
+        return success(CouponTempleteConvert.INSTANCE.convert(couponTempleteDO));
+    }
+
+    @GetMapping("/list")
+    @ApiOperation("获得优惠券模板列表")
+    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
+    public CommonResult<List<CouponTempleteRespVO>> getList(@RequestParam("ids") Collection<Long> ids) {
+        List<CouponTempleteDO> list = Service.getList(ids);
+        return success(CouponTempleteConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("获得优惠券模板分页")
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
+    public CommonResult<PageResult<CouponTempleteRespVO>> getPage(@Valid CouponTempletePageReqVO pageVO) {
+        PageResult<CouponTempleteDO> pageResult = Service.getPage(pageVO);
+        return success(CouponTempleteConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @ApiOperation("导出优惠券模板 Excel")
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::export')")
+    @OperateLog(type = EXPORT)
+    public void exportExcel(@Valid CouponTempleteExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<CouponTempleteDO> list = Service.getList(exportReqVO);
+        // 导出 Excel
+        List<CouponTempleteExcelVO> datas = CouponTempleteConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "优惠券模板.xls", "数据", CouponTempleteExcelVO.class, datas);
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
new file mode 100644
index 000000000..f43339f0f
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
@@ -0,0 +1,144 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+* 优惠券模板 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
+@Data
+public class CouponTempleteBaseVO {
+
+    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机", required = true)
+    @NotNull(message = "优惠券类型 reward-满减 discount-折扣 random-随机不能为空")
+    private String type;
+
+    @ApiModelProperty(value = "优惠券名称", required = true)
+    @NotNull(message = "优惠券名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "名称备注")
+    private String couponNameRemark;
+
+    @ApiModelProperty(value = "优惠券图片")
+    private String image;
+
+    @ApiModelProperty(value = "发放数量", required = true)
+    @NotNull(message = "发放数量不能为空")
+    private Integer count;
+
+    @ApiModelProperty(value = "已领取数量", required = true)
+    @NotNull(message = "已领取数量不能为空")
+    private Integer leadCount;
+
+    @ApiModelProperty(value = "已使用数量", required = true)
+    @NotNull(message = "已使用数量不能为空")
+    private Integer usedCount;
+
+    @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用", required = true)
+    @NotNull(message = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用不能为空")
+    private Boolean goodsType;
+
+    @ApiModelProperty(value = "适用商品id")
+    private String productIds;
+
+    @ApiModelProperty(value = "使用门槛0-无门槛 1-有门槛", required = true)
+    @NotNull(message = "使用门槛0-无门槛 1-有门槛不能为空")
+    private Boolean hasUseLimit;
+
+    @ApiModelProperty(value = "满多少元使用 0代表无限制", required = true)
+    @NotNull(message = "满多少元使用 0代表无限制不能为空")
+    private BigDecimal atLeast;
+
+    @ApiModelProperty(value = "发放面额 当type为reward时需要添加", required = true)
+    @NotNull(message = "发放面额 当type为reward时需要添加不能为空")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加", required = true)
+    @NotNull(message = "1 =< 折扣 <= 9.9 当type为discount时需要添加不能为空")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加", required = true)
+    @NotNull(message = "最多折扣金额 当type为discount时可选择性添加不能为空")
+    private BigDecimal discountLimit;
+
+    @ApiModelProperty(value = "最低金额 当type为radom时需要添加", required = true)
+    @NotNull(message = "最低金额 当type为radom时需要添加不能为空")
+    private BigDecimal minMoney;
+
+    @ApiModelProperty(value = "最大金额 当type为radom时需要添加", required = true)
+    @NotNull(message = "最大金额 当type为radom时需要添加不能为空")
+    private BigDecimal maxMoney;
+
+    @ApiModelProperty(value = "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期", required = true)
+    @NotNull(message = "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期不能为空")
+    private Boolean validityType;
+
+    @ApiModelProperty(value = "使用开始日期 过期类型1时必填")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date startUseTime;
+
+    @ApiModelProperty(value = "使用结束日期 过期类型1时必填")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endUseTime;
+
+    @ApiModelProperty(value = "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效", required = true)
+    @NotNull(message = "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效不能为空")
+    private Integer fixedTerm;
+
+    @ApiModelProperty(value = "是否无限制0-否 1是", required = true)
+    @NotNull(message = "是否无限制0-否 1是不能为空")
+    private Boolean whetherLimitless;
+
+    @ApiModelProperty(value = "每人最大领取个数", required = true)
+    @NotNull(message = "每人最大领取个数不能为空")
+    private Integer maxFetch;
+
+    @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启", required = true)
+    @NotNull(message = "是否开启过期提醒0-不开启 1-开启不能为空")
+    private Boolean whetherExpireNotice;
+
+    @ApiModelProperty(value = "过期前N天提醒", required = true)
+    @NotNull(message = "过期前N天提醒不能为空")
+    private Integer expireNoticeFixedTerm;
+
+    @ApiModelProperty(value = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用", required = true)
+    @NotNull(message = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用不能为空")
+    private Boolean whetherForbidPreference;
+
+    @ApiModelProperty(value = "是否显示", required = true)
+    @NotNull(message = "是否显示不能为空")
+    private Integer whetherShow;
+
+    @ApiModelProperty(value = "订单的优惠总金额", required = true)
+    @NotNull(message = "订单的优惠总金额不能为空")
+    private BigDecimal discountOrderMoney;
+
+    @ApiModelProperty(value = "用券总成交额", required = true)
+    @NotNull(message = "用券总成交额不能为空")
+    private BigDecimal orderMoney;
+
+    @ApiModelProperty(value = "是否禁止发放0-否 1-是", required = true)
+    @NotNull(message = "是否禁止发放0-否 1-是不能为空")
+    private Boolean whetherForbidden;
+
+    @ApiModelProperty(value = "使用优惠券购买的商品数量", required = true)
+    @NotNull(message = "使用优惠券购买的商品数量不能为空")
+    private Integer orderGoodsNum;
+
+    @ApiModelProperty(value = "状态（1进行中2已结束-1已关闭）", required = true)
+    @NotNull(message = "状态（1进行中2已结束-1已关闭）不能为空")
+    private Integer status;
+
+    @ApiModelProperty(value = "有效日期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteCreateReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteCreateReqVO.java
new file mode 100644
index 000000000..fa13b77a5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteCreateReqVO.java
@@ -0,0 +1,12 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+
+import lombok.*;
+import io.swagger.annotations.*;
+
+@ApiModel("管理后台 - 优惠券模板创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponTempleteCreateReqVO extends CouponTempleteBaseVO {
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExcelVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExcelVO.java
new file mode 100644
index 000000000..a09b3ff71
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExcelVO.java
@@ -0,0 +1,119 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * 优惠券模板 Excel VO
+ *
+ * @author wxr
+ */
+@Data
+public class CouponTempleteExcelVO {
+
+    @ExcelProperty("用户ID")
+    private Long id;
+
+    @ExcelProperty("优惠券类型 reward-满减 discount-折扣 random-随机")
+    private String type;
+
+    @ExcelProperty("优惠券名称")
+    private String name;
+
+    @ExcelProperty("名称备注")
+    private String couponNameRemark;
+
+    @ExcelProperty("优惠券图片")
+    private String image;
+
+    @ExcelProperty("发放数量")
+    private Integer count;
+
+    @ExcelProperty("已领取数量")
+    private Integer leadCount;
+
+    @ExcelProperty("已使用数量")
+    private Integer usedCount;
+
+    @ExcelProperty("适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用")
+    private Boolean goodsType;
+
+    @ExcelProperty("适用商品id")
+    private String productIds;
+
+    @ExcelProperty("使用门槛0-无门槛 1-有门槛")
+    private Boolean hasUseLimit;
+
+    @ExcelProperty("满多少元使用 0代表无限制")
+    private BigDecimal atLeast;
+
+    @ExcelProperty("发放面额 当type为reward时需要添加")
+    private BigDecimal money;
+
+    @ExcelProperty("1 =< 折扣 <= 9.9 当type为discount时需要添加")
+    private BigDecimal discount;
+
+    @ExcelProperty("最多折扣金额 当type为discount时可选择性添加")
+    private BigDecimal discountLimit;
+
+    @ExcelProperty("最低金额 当type为radom时需要添加")
+    private BigDecimal minMoney;
+
+    @ExcelProperty("最大金额 当type为radom时需要添加")
+    private BigDecimal maxMoney;
+
+    @ExcelProperty("过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期")
+    private Boolean validityType;
+
+    @ExcelProperty("使用开始日期 过期类型1时必填")
+    private Date startUseTime;
+
+    @ExcelProperty("使用结束日期 过期类型1时必填")
+    private Date endUseTime;
+
+    @ExcelProperty("当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效")
+    private Integer fixedTerm;
+
+    @ExcelProperty("是否无限制0-否 1是")
+    private Boolean whetherLimitless;
+
+    @ExcelProperty("每人最大领取个数")
+    private Integer maxFetch;
+
+    @ExcelProperty("是否开启过期提醒0-不开启 1-开启")
+    private Boolean whetherExpireNotice;
+
+    @ExcelProperty("过期前N天提醒")
+    private Integer expireNoticeFixedTerm;
+
+    @ExcelProperty("优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用")
+    private Boolean whetherForbidPreference;
+
+    @ExcelProperty("是否显示")
+    private Integer whetherShow;
+
+    @ExcelProperty("订单的优惠总金额")
+    private BigDecimal discountOrderMoney;
+
+    @ExcelProperty("用券总成交额")
+    private BigDecimal orderMoney;
+
+    @ExcelProperty("是否禁止发放0-否 1-是")
+    private Boolean whetherForbidden;
+
+    @ExcelProperty("使用优惠券购买的商品数量")
+    private Integer orderGoodsNum;
+
+    @ExcelProperty("状态（1进行中2已结束-1已关闭）")
+    private Integer status;
+
+    @ExcelProperty("有效日期结束时间")
+    private Date endTime;
+
+    @ExcelProperty("创建时间")
+    private Date createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExportReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExportReqVO.java
new file mode 100644
index 000000000..b8b8fced1
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExportReqVO.java
@@ -0,0 +1,119 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+import io.swagger.annotations.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel(value = "管理后台 - 优惠券模板 Excel 导出 Request VO", description = "参数和 CouponTempletePageReqVO 是一致的")
+@Data
+public class CouponTempleteExportReqVO {
+
+    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机")
+    private String type;
+
+    @ApiModelProperty(value = "优惠券名称")
+    private String name;
+
+    @ApiModelProperty(value = "名称备注")
+    private String couponNameRemark;
+
+    @ApiModelProperty(value = "优惠券图片")
+    private String image;
+
+    @ApiModelProperty(value = "发放数量")
+    private Integer count;
+
+    @ApiModelProperty(value = "已领取数量")
+    private Integer leadCount;
+
+    @ApiModelProperty(value = "已使用数量")
+    private Integer usedCount;
+
+    @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用")
+    private Boolean goodsType;
+
+    @ApiModelProperty(value = "适用商品id")
+    private String productIds;
+
+    @ApiModelProperty(value = "使用门槛0-无门槛 1-有门槛")
+    private Boolean hasUseLimit;
+
+    @ApiModelProperty(value = "满多少元使用 0代表无限制")
+    private BigDecimal atLeast;
+
+    @ApiModelProperty(value = "发放面额 当type为reward时需要添加")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加")
+    private BigDecimal discountLimit;
+
+    @ApiModelProperty(value = "最低金额 当type为radom时需要添加")
+    private BigDecimal minMoney;
+
+    @ApiModelProperty(value = "最大金额 当type为radom时需要添加")
+    private BigDecimal maxMoney;
+
+    @ApiModelProperty(value = "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期")
+    private Boolean validityType;
+
+    @ApiModelProperty(value = "使用开始日期 过期类型1时必填")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] startUseTime;
+
+    @ApiModelProperty(value = "使用结束日期 过期类型1时必填")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] endUseTime;
+
+    @ApiModelProperty(value = "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效")
+    private Integer fixedTerm;
+
+    @ApiModelProperty(value = "是否无限制0-否 1是")
+    private Boolean whetherLimitless;
+
+    @ApiModelProperty(value = "每人最大领取个数")
+    private Integer maxFetch;
+
+    @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启")
+    private Boolean whetherExpireNotice;
+
+    @ApiModelProperty(value = "过期前N天提醒")
+    private Integer expireNoticeFixedTerm;
+
+    @ApiModelProperty(value = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用")
+    private Boolean whetherForbidPreference;
+
+    @ApiModelProperty(value = "是否显示")
+    private Integer whetherShow;
+
+    @ApiModelProperty(value = "订单的优惠总金额")
+    private BigDecimal discountOrderMoney;
+
+    @ApiModelProperty(value = "用券总成交额")
+    private BigDecimal orderMoney;
+
+    @ApiModelProperty(value = "是否禁止发放0-否 1-是")
+    private Boolean whetherForbidden;
+
+    @ApiModelProperty(value = "使用优惠券购买的商品数量")
+    private Integer orderGoodsNum;
+
+    @ApiModelProperty(value = "状态（1进行中2已结束-1已关闭）")
+    private Integer status;
+
+    @ApiModelProperty(value = "有效日期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempletePageReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempletePageReqVO.java
new file mode 100644
index 000000000..92622d793
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempletePageReqVO.java
@@ -0,0 +1,122 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+import io.swagger.annotations.*;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 优惠券模板分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponTempletePageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机")
+    private String type;
+
+    @ApiModelProperty(value = "优惠券名称")
+    private String name;
+
+    @ApiModelProperty(value = "名称备注")
+    private String couponNameRemark;
+
+    @ApiModelProperty(value = "优惠券图片")
+    private String image;
+
+    @ApiModelProperty(value = "发放数量")
+    private Integer count;
+
+    @ApiModelProperty(value = "已领取数量")
+    private Integer leadCount;
+
+    @ApiModelProperty(value = "已使用数量")
+    private Integer usedCount;
+
+    @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用")
+    private Boolean goodsType;
+
+    @ApiModelProperty(value = "适用商品id")
+    private String productIds;
+
+    @ApiModelProperty(value = "使用门槛0-无门槛 1-有门槛")
+    private Boolean hasUseLimit;
+
+    @ApiModelProperty(value = "满多少元使用 0代表无限制")
+    private BigDecimal atLeast;
+
+    @ApiModelProperty(value = "发放面额 当type为reward时需要添加")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加")
+    private BigDecimal discountLimit;
+
+    @ApiModelProperty(value = "最低金额 当type为radom时需要添加")
+    private BigDecimal minMoney;
+
+    @ApiModelProperty(value = "最大金额 当type为radom时需要添加")
+    private BigDecimal maxMoney;
+
+    @ApiModelProperty(value = "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期")
+    private Boolean validityType;
+
+    @ApiModelProperty(value = "使用开始日期 过期类型1时必填")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] startUseTime;
+
+    @ApiModelProperty(value = "使用结束日期 过期类型1时必填")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] endUseTime;
+
+    @ApiModelProperty(value = "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效")
+    private Integer fixedTerm;
+
+    @ApiModelProperty(value = "是否无限制0-否 1是")
+    private Boolean whetherLimitless;
+
+    @ApiModelProperty(value = "每人最大领取个数")
+    private Integer maxFetch;
+
+    @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启")
+    private Boolean whetherExpireNotice;
+
+    @ApiModelProperty(value = "过期前N天提醒")
+    private Integer expireNoticeFixedTerm;
+
+    @ApiModelProperty(value = "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用")
+    private Boolean whetherForbidPreference;
+
+    @ApiModelProperty(value = "是否显示")
+    private Integer whetherShow;
+
+    @ApiModelProperty(value = "订单的优惠总金额")
+    private BigDecimal discountOrderMoney;
+
+    @ApiModelProperty(value = "用券总成交额")
+    private BigDecimal orderMoney;
+
+    @ApiModelProperty(value = "是否禁止发放0-否 1-是")
+    private Boolean whetherForbidden;
+
+    @ApiModelProperty(value = "使用优惠券购买的商品数量")
+    private Integer orderGoodsNum;
+
+    @ApiModelProperty(value = "状态（1进行中2已结束-1已关闭）")
+    private Integer status;
+
+    @ApiModelProperty(value = "有效日期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteRespVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteRespVO.java
new file mode 100644
index 000000000..318492a24
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteRespVO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+
+@ApiModel("管理后台 - 优惠券模板 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponTempleteRespVO extends CouponTempleteBaseVO {
+
+    @ApiModelProperty(value = "用户ID", required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteUpdateReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteUpdateReqVO.java
new file mode 100644
index 000000000..7d0fb7544
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteUpdateReqVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+
+import lombok.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+@ApiModel("管理后台 - 优惠券模板更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CouponTempleteUpdateReqVO extends CouponTempleteBaseVO {
+
+    @ApiModelProperty(value = "用户ID", required = true)
+    @NotNull(message = "用户ID不能为空")
+    private Long id;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java
new file mode 100644
index 000000000..ddd774053
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.coupon.convert.CouponTemplete;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteCreateReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteExcelVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteRespVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteUpdateReqVO;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+
+/**
+ * 优惠券模板 Convert
+ *
+ * @author wxr
+ */
+@Mapper
+public interface CouponTempleteConvert {
+
+    CouponTempleteConvert INSTANCE = Mappers.getMapper(CouponTempleteConvert.class);
+
+    CouponTempleteDO convert(CouponTempleteCreateReqVO bean);
+
+    CouponTempleteDO convert(CouponTempleteUpdateReqVO bean);
+
+    CouponTempleteRespVO convert(CouponTempleteDO bean);
+
+    List<CouponTempleteRespVO> convertList(List<CouponTempleteDO> list);
+
+    PageResult<CouponTempleteRespVO> convertPage(PageResult<CouponTempleteDO> page);
+
+    List<CouponTempleteExcelVO> convertList02(List<CouponTempleteDO> list);
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/coupon/CouponConvert.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/coupon/CouponConvert.java
new file mode 100644
index 000000000..e4dab938b
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/coupon/CouponConvert.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.coupon.convert.coupon;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo.*;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.coupon.CouponDO;
+
+/**
+ * 优惠券 Convert
+ *
+ * @author wxr
+ */
+@Mapper
+public interface CouponConvert {
+
+    CouponConvert INSTANCE = Mappers.getMapper(CouponConvert.class);
+
+    CouponDO convert(CouponCreateReqVO bean);
+
+    CouponDO convert(CouponUpdateReqVO bean);
+
+    CouponRespVO convert(CouponDO bean);
+
+    List<CouponRespVO> convertList(List<CouponDO> list);
+
+    PageResult<CouponRespVO> convertPage(PageResult<CouponDO> page);
+
+    List<CouponExcelVO> convertList02(List<CouponDO> list);
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
new file mode 100644
index 000000000..106c459a1
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
@@ -0,0 +1,158 @@
+package cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 优惠券模板 DO
+ *
+ * @author wxr
+ */
+@TableName("coupon_templete")
+@KeySequence("coupon_templete_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CouponTempleteDO extends BaseDO {
+
+    /**
+     * 用户ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 优惠券类型 reward-满减 discount-折扣 random-随机
+     */
+    private String type;
+    /**
+     * 优惠券名称
+     */
+    private String name;
+    /**
+     * 名称备注
+     */
+    private String couponNameRemark;
+    /**
+     * 优惠券图片
+     */
+    private String image;
+    /**
+     * 发放数量
+     */
+    private Integer count;
+    /**
+     * 已领取数量
+     */
+    private Integer leadCount;
+    /**
+     * 已使用数量
+     */
+    private Integer usedCount;
+    /**
+     * 适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用
+     */
+    private Boolean goodsType;
+    /**
+     * 适用商品id
+     */
+    private String productIds;
+    /**
+     * 使用门槛0-无门槛 1-有门槛
+     */
+    private Boolean hasUseLimit;
+    /**
+     * 满多少元使用 0代表无限制
+     */
+    private BigDecimal atLeast;
+    /**
+     * 发放面额 当type为reward时需要添加
+     */
+    private BigDecimal money;
+    /**
+     * 1 =< 折扣 <= 9.9 当type为discount时需要添加
+     */
+    private BigDecimal discount;
+    /**
+     * 最多折扣金额 当type为discount时可选择性添加
+     */
+    private BigDecimal discountLimit;
+    /**
+     * 最低金额 当type为radom时需要添加
+     */
+    private BigDecimal minMoney;
+    /**
+     * 最大金额 当type为radom时需要添加
+     */
+    private BigDecimal maxMoney;
+    /**
+     * 过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期
+     */
+    private Boolean validityType;
+    /**
+     * 使用开始日期 过期类型1时必填
+     */
+    private Date startUseTime;
+    /**
+     * 使用结束日期 过期类型1时必填
+     */
+    private Date endUseTime;
+    /**
+     * 当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效
+     */
+    private Integer fixedTerm;
+    /**
+     * 是否无限制0-否 1是
+     */
+    private Boolean whetherLimitless;
+    /**
+     * 每人最大领取个数
+     */
+    private Integer maxFetch;
+    /**
+     * 是否开启过期提醒0-不开启 1-开启
+     */
+    private Boolean whetherExpireNotice;
+    /**
+     * 过期前N天提醒
+     */
+    private Integer expireNoticeFixedTerm;
+    /**
+     * 优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用
+     */
+    private Boolean whetherForbidPreference;
+    /**
+     * 是否显示
+     */
+    private Integer whetherShow;
+    /**
+     * 订单的优惠总金额
+     */
+    private BigDecimal discountOrderMoney;
+    /**
+     * 用券总成交额
+     */
+    private BigDecimal orderMoney;
+    /**
+     * 是否禁止发放0-否 1-是
+     */
+    private Boolean whetherForbidden;
+    /**
+     * 使用优惠券购买的商品数量
+     */
+    private Integer orderGoodsNum;
+    /**
+     * 状态（1进行中2已结束-1已关闭）
+     */
+    private Integer status;
+    /**
+     * 有效日期结束时间
+     */
+    private Date endTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
new file mode 100644
index 000000000..70e3aae20
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
@@ -0,0 +1,118 @@
+package cn.iocoder.yudao.module.coupon.dal.dataobject.coupon;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.*;
+
+/**
+ * 优惠券 DO
+ *
+ * @author wxr
+ */
+@TableName("coupon")
+@KeySequence("coupon_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CouponDO extends BaseDO {
+
+    /**
+     * 用户ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 优惠券类型 reward-满减 discount-折扣 random-随机
+     */
+    private String type;
+    /**
+     * 优惠券名称
+     */
+    private String name;
+    /**
+     * 优惠券类型id
+     */
+    private Long couponTypeId;
+    /**
+     * 优惠券编码
+     */
+    private String couponCode;
+    /**
+     * 领用人
+     */
+    private Long memberId;
+    /**
+     * 优惠券使用订单id
+     */
+    private Long useOrderId;
+    /**
+     * 适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用
+     */
+    private Boolean goodsType;
+    /**
+     * 适用商品id
+     */
+    private String goodsIds;
+    /**
+     * 最小金额
+     */
+    private BigDecimal atLeast;
+    /**
+     * 面额
+     */
+    private BigDecimal money;
+    /**
+     * 1 =< 折扣 <= 9.9 当type为discount时需要添加
+     */
+    private BigDecimal discount;
+    /**
+     * 最多折扣金额 当type为discount时可选择性添加
+     */
+    private BigDecimal discountLimit;
+    /**
+     * 优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用
+     */
+    private Boolean whetherForbidPreference;
+    /**
+     * 是否开启过期提醒0-不开启 1-开启
+     */
+    private Boolean whetherExpireNotice;
+    /**
+     * 过期前N天提醒
+     */
+    private Integer expireNoticeFixedTerm;
+    /**
+     * 是否已提醒
+     */
+    private Boolean whetherNoticed;
+    /**
+     * 优惠券状态 1已领用（未使用） 2已使用 3已过期
+     */
+    private Integer state;
+    /**
+     * 获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取
+     */
+    private Boolean getType;
+    /**
+     * 领取时间
+     */
+    private Date fetchTime;
+    /**
+     * 使用时间
+     */
+    private Date useTime;
+    /**
+     * 可使用的开始时间
+     */
+    private Date startTime;
+    /**
+     * 有效期结束时间
+     */
+    private Date endTime;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java
new file mode 100644
index 000000000..b930f113f
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java
@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.coupon.dal.mysql.CouponTemplete;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteExportReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempletePageReqVO;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 优惠券模板 Mapper
+ *
+ * @author wxr
+ */
+@Mapper
+public interface CouponTempleteMapper extends BaseMapperX<CouponTempleteDO> {
+
+    default PageResult<CouponTempleteDO> selectPage(CouponTempletePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<CouponTempleteDO>()
+                .eqIfPresent(CouponTempleteDO::getType, reqVO.getType())
+                .likeIfPresent(CouponTempleteDO::getName, reqVO.getName())
+                .eqIfPresent(CouponTempleteDO::getCouponNameRemark, reqVO.getCouponNameRemark())
+                .eqIfPresent(CouponTempleteDO::getImage, reqVO.getImage())
+                .eqIfPresent(CouponTempleteDO::getCount, reqVO.getCount())
+                .eqIfPresent(CouponTempleteDO::getLeadCount, reqVO.getLeadCount())
+                .eqIfPresent(CouponTempleteDO::getUsedCount, reqVO.getUsedCount())
+                .eqIfPresent(CouponTempleteDO::getGoodsType, reqVO.getGoodsType())
+                .eqIfPresent(CouponTempleteDO::getProductIds, reqVO.getProductIds())
+                .eqIfPresent(CouponTempleteDO::getHasUseLimit, reqVO.getHasUseLimit())
+                .eqIfPresent(CouponTempleteDO::getAtLeast, reqVO.getAtLeast())
+                .eqIfPresent(CouponTempleteDO::getMoney, reqVO.getMoney())
+                .eqIfPresent(CouponTempleteDO::getDiscount, reqVO.getDiscount())
+                .eqIfPresent(CouponTempleteDO::getDiscountLimit, reqVO.getDiscountLimit())
+                .eqIfPresent(CouponTempleteDO::getMinMoney, reqVO.getMinMoney())
+                .eqIfPresent(CouponTempleteDO::getMaxMoney, reqVO.getMaxMoney())
+                .eqIfPresent(CouponTempleteDO::getValidityType, reqVO.getValidityType())
+                .betweenIfPresent(CouponTempleteDO::getStartUseTime, reqVO.getStartUseTime())
+                .betweenIfPresent(CouponTempleteDO::getEndUseTime, reqVO.getEndUseTime())
+                .eqIfPresent(CouponTempleteDO::getFixedTerm, reqVO.getFixedTerm())
+                .eqIfPresent(CouponTempleteDO::getWhetherLimitless, reqVO.getWhetherLimitless())
+                .eqIfPresent(CouponTempleteDO::getMaxFetch, reqVO.getMaxFetch())
+                .eqIfPresent(CouponTempleteDO::getWhetherExpireNotice, reqVO.getWhetherExpireNotice())
+                .eqIfPresent(CouponTempleteDO::getExpireNoticeFixedTerm, reqVO.getExpireNoticeFixedTerm())
+                .eqIfPresent(CouponTempleteDO::getWhetherForbidPreference, reqVO.getWhetherForbidPreference())
+                .eqIfPresent(CouponTempleteDO::getWhetherShow, reqVO.getWhetherShow())
+                .eqIfPresent(CouponTempleteDO::getDiscountOrderMoney, reqVO.getDiscountOrderMoney())
+                .eqIfPresent(CouponTempleteDO::getOrderMoney, reqVO.getOrderMoney())
+                .eqIfPresent(CouponTempleteDO::getWhetherForbidden, reqVO.getWhetherForbidden())
+                .eqIfPresent(CouponTempleteDO::getOrderGoodsNum, reqVO.getOrderGoodsNum())
+                .eqIfPresent(CouponTempleteDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(CouponTempleteDO::getEndTime, reqVO.getEndTime())
+                .betweenIfPresent(CouponTempleteDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CouponTempleteDO::getId));
+    }
+
+    default List<CouponTempleteDO> selectList(CouponTempleteExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<CouponTempleteDO>()
+                .eqIfPresent(CouponTempleteDO::getType, reqVO.getType())
+                .likeIfPresent(CouponTempleteDO::getName, reqVO.getName())
+                .eqIfPresent(CouponTempleteDO::getCouponNameRemark, reqVO.getCouponNameRemark())
+                .eqIfPresent(CouponTempleteDO::getImage, reqVO.getImage())
+                .eqIfPresent(CouponTempleteDO::getCount, reqVO.getCount())
+                .eqIfPresent(CouponTempleteDO::getLeadCount, reqVO.getLeadCount())
+                .eqIfPresent(CouponTempleteDO::getUsedCount, reqVO.getUsedCount())
+                .eqIfPresent(CouponTempleteDO::getGoodsType, reqVO.getGoodsType())
+                .eqIfPresent(CouponTempleteDO::getProductIds, reqVO.getProductIds())
+                .eqIfPresent(CouponTempleteDO::getHasUseLimit, reqVO.getHasUseLimit())
+                .eqIfPresent(CouponTempleteDO::getAtLeast, reqVO.getAtLeast())
+                .eqIfPresent(CouponTempleteDO::getMoney, reqVO.getMoney())
+                .eqIfPresent(CouponTempleteDO::getDiscount, reqVO.getDiscount())
+                .eqIfPresent(CouponTempleteDO::getDiscountLimit, reqVO.getDiscountLimit())
+                .eqIfPresent(CouponTempleteDO::getMinMoney, reqVO.getMinMoney())
+                .eqIfPresent(CouponTempleteDO::getMaxMoney, reqVO.getMaxMoney())
+                .eqIfPresent(CouponTempleteDO::getValidityType, reqVO.getValidityType())
+                .betweenIfPresent(CouponTempleteDO::getStartUseTime, reqVO.getStartUseTime())
+                .betweenIfPresent(CouponTempleteDO::getEndUseTime, reqVO.getEndUseTime())
+                .eqIfPresent(CouponTempleteDO::getFixedTerm, reqVO.getFixedTerm())
+                .eqIfPresent(CouponTempleteDO::getWhetherLimitless, reqVO.getWhetherLimitless())
+                .eqIfPresent(CouponTempleteDO::getMaxFetch, reqVO.getMaxFetch())
+                .eqIfPresent(CouponTempleteDO::getWhetherExpireNotice, reqVO.getWhetherExpireNotice())
+                .eqIfPresent(CouponTempleteDO::getExpireNoticeFixedTerm, reqVO.getExpireNoticeFixedTerm())
+                .eqIfPresent(CouponTempleteDO::getWhetherForbidPreference, reqVO.getWhetherForbidPreference())
+                .eqIfPresent(CouponTempleteDO::getWhetherShow, reqVO.getWhetherShow())
+                .eqIfPresent(CouponTempleteDO::getDiscountOrderMoney, reqVO.getDiscountOrderMoney())
+                .eqIfPresent(CouponTempleteDO::getOrderMoney, reqVO.getOrderMoney())
+                .eqIfPresent(CouponTempleteDO::getWhetherForbidden, reqVO.getWhetherForbidden())
+                .eqIfPresent(CouponTempleteDO::getOrderGoodsNum, reqVO.getOrderGoodsNum())
+                .eqIfPresent(CouponTempleteDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(CouponTempleteDO::getEndTime, reqVO.getEndTime())
+                .betweenIfPresent(CouponTempleteDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CouponTempleteDO::getId));
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/coupon/CouponMapper.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/coupon/CouponMapper.java
new file mode 100644
index 000000000..8c9014694
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/coupon/CouponMapper.java
@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.coupon.dal.mysql.coupon;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.coupon.CouponDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo.*;
+
+/**
+ * 优惠券 Mapper
+ *
+ * @author wxr
+ */
+@Mapper
+public interface CouponMapper extends BaseMapperX<CouponDO> {
+
+    default PageResult<CouponDO> selectPage(CouponPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<CouponDO>()
+                .eqIfPresent(CouponDO::getType, reqVO.getType())
+                .likeIfPresent(CouponDO::getName, reqVO.getName())
+                .eqIfPresent(CouponDO::getCouponTypeId, reqVO.getCouponTypeId())
+                .eqIfPresent(CouponDO::getCouponCode, reqVO.getCouponCode())
+                .eqIfPresent(CouponDO::getMemberId, reqVO.getMemberId())
+                .eqIfPresent(CouponDO::getUseOrderId, reqVO.getUseOrderId())
+                .eqIfPresent(CouponDO::getGoodsType, reqVO.getGoodsType())
+                .eqIfPresent(CouponDO::getGoodsIds, reqVO.getGoodsIds())
+                .eqIfPresent(CouponDO::getAtLeast, reqVO.getAtLeast())
+                .eqIfPresent(CouponDO::getMoney, reqVO.getMoney())
+                .eqIfPresent(CouponDO::getDiscount, reqVO.getDiscount())
+                .eqIfPresent(CouponDO::getDiscountLimit, reqVO.getDiscountLimit())
+                .eqIfPresent(CouponDO::getWhetherForbidPreference, reqVO.getWhetherForbidPreference())
+                .eqIfPresent(CouponDO::getWhetherExpireNotice, reqVO.getWhetherExpireNotice())
+                .eqIfPresent(CouponDO::getExpireNoticeFixedTerm, reqVO.getExpireNoticeFixedTerm())
+                .eqIfPresent(CouponDO::getWhetherNoticed, reqVO.getWhetherNoticed())
+                .eqIfPresent(CouponDO::getState, reqVO.getState())
+                .eqIfPresent(CouponDO::getGetType, reqVO.getGetType())
+                .betweenIfPresent(CouponDO::getFetchTime, reqVO.getFetchTime())
+                .betweenIfPresent(CouponDO::getUseTime, reqVO.getUseTime())
+                .betweenIfPresent(CouponDO::getStartTime, reqVO.getStartTime())
+                .betweenIfPresent(CouponDO::getEndTime, reqVO.getEndTime())
+                .betweenIfPresent(CouponDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CouponDO::getId));
+    }
+
+    default List<CouponDO> selectList(CouponExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<CouponDO>()
+                .eqIfPresent(CouponDO::getType, reqVO.getType())
+                .likeIfPresent(CouponDO::getName, reqVO.getName())
+                .eqIfPresent(CouponDO::getCouponTypeId, reqVO.getCouponTypeId())
+                .eqIfPresent(CouponDO::getCouponCode, reqVO.getCouponCode())
+                .eqIfPresent(CouponDO::getMemberId, reqVO.getMemberId())
+                .eqIfPresent(CouponDO::getUseOrderId, reqVO.getUseOrderId())
+                .eqIfPresent(CouponDO::getGoodsType, reqVO.getGoodsType())
+                .eqIfPresent(CouponDO::getGoodsIds, reqVO.getGoodsIds())
+                .eqIfPresent(CouponDO::getAtLeast, reqVO.getAtLeast())
+                .eqIfPresent(CouponDO::getMoney, reqVO.getMoney())
+                .eqIfPresent(CouponDO::getDiscount, reqVO.getDiscount())
+                .eqIfPresent(CouponDO::getDiscountLimit, reqVO.getDiscountLimit())
+                .eqIfPresent(CouponDO::getWhetherForbidPreference, reqVO.getWhetherForbidPreference())
+                .eqIfPresent(CouponDO::getWhetherExpireNotice, reqVO.getWhetherExpireNotice())
+                .eqIfPresent(CouponDO::getExpireNoticeFixedTerm, reqVO.getExpireNoticeFixedTerm())
+                .eqIfPresent(CouponDO::getWhetherNoticed, reqVO.getWhetherNoticed())
+                .eqIfPresent(CouponDO::getState, reqVO.getState())
+                .eqIfPresent(CouponDO::getGetType, reqVO.getGetType())
+                .betweenIfPresent(CouponDO::getFetchTime, reqVO.getFetchTime())
+                .betweenIfPresent(CouponDO::getUseTime, reqVO.getUseTime())
+                .betweenIfPresent(CouponDO::getStartTime, reqVO.getStartTime())
+                .betweenIfPresent(CouponDO::getEndTime, reqVO.getEndTime())
+                .betweenIfPresent(CouponDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CouponDO::getId));
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java
new file mode 100644
index 000000000..f0ad215c8
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.coupon.service.CouponTemplete;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
+
+/**
+ * 优惠券模板 Service 接口
+ *
+ * @author wxr
+ */
+public interface CouponTempleteService {
+
+    /**
+     * 创建优惠券模板
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long create(@Valid CouponTempleteCreateReqVO createReqVO);
+
+    /**
+     * 更新优惠券模板
+     *
+     * @param updateReqVO 更新信息
+     */
+    void update(@Valid CouponTempleteUpdateReqVO updateReqVO);
+
+    /**
+     * 删除优惠券模板
+     *
+     * @param id 编号
+     */
+    void delete(Long id);
+
+    /**
+     * 获得优惠券模板
+     *
+     * @param id 编号
+     * @return 优惠券模板
+     */
+    CouponTempleteDO get(Long id);
+
+    /**
+     * 获得优惠券模板列表
+     *
+     * @param ids 编号
+     * @return 优惠券模板列表
+     */
+    List<CouponTempleteDO> getList(Collection<Long> ids);
+
+    /**
+     * 获得优惠券模板分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 优惠券模板分页
+     */
+    PageResult<CouponTempleteDO> getPage(CouponTempletePageReqVO pageReqVO);
+
+    /**
+     * 获得优惠券模板列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 优惠券模板列表
+     */
+    List<CouponTempleteDO> getList(CouponTempleteExportReqVO exportReqVO);
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
new file mode 100644
index 000000000..982b2f1b2
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
@@ -0,0 +1,87 @@
+package cn.iocoder.yudao.module.coupon.service.CouponTemplete;
+
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteCreateReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteExportReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempletePageReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteUpdateReqVO;
+import cn.iocoder.yudao.module.coupon.convert.CouponTemplete.CouponTempleteConvert;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
+import cn.iocoder.yudao.module.coupon.dal.mysql.CouponTemplete.CouponTempleteMapper;
+import cn.iocoder.yudao.module.coupon.service.CouponTemplete.CouponTempleteService;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.CouponTemplete.enums.ErrorCodeConstants.COUPON_TEMPLETE_NOT_EXISTS;
+
+/**
+ * 优惠券模板 Service 实现类
+ *
+ * @author wxr
+ */
+@Service
+@Validated
+public class CouponTempleteServiceImpl implements CouponTempleteService {
+
+    @Resource
+    private CouponTempleteMapper couponTempleteMapper;
+
+    @Override
+    public Long create(CouponTempleteCreateReqVO createReqVO) {
+        // 插入
+        CouponTempleteDO couponTempleteDO = CouponTempleteConvert.INSTANCE.convert(createReqVO);
+        couponTempleteMapper.insert(couponTempleteDO);
+        // 返回
+        return couponTempleteDO.getId();
+    }
+
+    @Override
+    public void update(CouponTempleteUpdateReqVO updateReqVO) {
+        // 校验存在
+        this.validateExists(updateReqVO.getId());
+        // 更新
+        CouponTempleteDO updateObj = CouponTempleteConvert.INSTANCE.convert(updateReqVO);
+        couponTempleteMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void delete(Long id) {
+        // 校验存在
+        this.validateExists(id);
+        // 删除
+        couponTempleteMapper.deleteById(id);
+    }
+
+    private void validateExists(Long id) {
+        if (couponTempleteMapper.selectById(id) == null) {
+            throw exception(COUPON_TEMPLETE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public CouponTempleteDO get(Long id) {
+        return couponTempleteMapper.selectById(id);
+    }
+
+    @Override
+    public List<CouponTempleteDO> getList(Collection<Long> ids) {
+        return couponTempleteMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<CouponTempleteDO> getPage(CouponTempletePageReqVO pageReqVO) {
+        return couponTempleteMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<CouponTempleteDO> getList(CouponTempleteExportReqVO exportReqVO) {
+        return couponTempleteMapper.selectList(exportReqVO);
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java
new file mode 100644
index 000000000..a3ca66611
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.coupon.service.coupon;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo.*;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.coupon.CouponDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 优惠券 Service 接口
+ *
+ * @author wxr
+ */
+public interface CouponService {
+
+    /**
+     * 创建优惠券
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long create(@Valid CouponCreateReqVO createReqVO);
+
+    /**
+     * 更新优惠券
+     *
+     * @param updateReqVO 更新信息
+     */
+    void update(@Valid CouponUpdateReqVO updateReqVO);
+
+    /**
+     * 删除优惠券
+     *
+     * @param id 编号
+     */
+    void delete(Long id);
+
+    /**
+     * 获得优惠券
+     *
+     * @param id 编号
+     * @return 优惠券
+     */
+    CouponDO get(Long id);
+
+    /**
+     * 获得优惠券列表
+     *
+     * @param ids 编号
+     * @return 优惠券列表
+     */
+    List<CouponDO> getList(Collection<Long> ids);
+
+    /**
+     * 获得优惠券分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 优惠券分页
+     */
+    PageResult<CouponDO> getPage(CouponPageReqVO pageReqVO);
+
+    /**
+     * 获得优惠券列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 优惠券列表
+     */
+    List<CouponDO> getList(CouponExportReqVO exportReqVO);
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
new file mode 100644
index 000000000..99f87ecfc
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.coupon.service.coupon;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+import cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo.*;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.coupon.CouponDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import cn.iocoder.yudao.module.coupon.convert.coupon.CouponConvert;
+import cn.iocoder.yudao.module.coupon.dal.mysql.coupon.CouponMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.CouponTemplete.enums.ErrorCodeConstants.COUPON_NOT_EXISTS;
+
+/**
+ * 优惠券 Service 实现类
+ *
+ * @author wxr
+ */
+@Service
+@Validated
+public class CouponServiceImpl implements CouponService {
+
+    @Resource
+    private CouponMapper couponMapper;
+
+    @Override
+    public Long create(CouponCreateReqVO createReqVO) {
+        // 插入
+        CouponDO couponDO = CouponConvert.INSTANCE.convert(createReqVO);
+        couponMapper.insert(couponDO);
+        // 返回
+        return couponDO.getId();
+    }
+
+    @Override
+    public void update(CouponUpdateReqVO updateReqVO) {
+        // 校验存在
+        this.validateExists(updateReqVO.getId());
+        // 更新
+        CouponDO updateObj = CouponConvert.INSTANCE.convert(updateReqVO);
+        couponMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void delete(Long id) {
+        // 校验存在
+        this.validateExists(id);
+        // 删除
+        couponMapper.deleteById(id);
+    }
+
+    private void validateExists(Long id) {
+        if (couponMapper.selectById(id) == null) {
+            throw exception(COUPON_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public CouponDO get(Long id) {
+        return couponMapper.selectById(id);
+    }
+
+    @Override
+    public List<CouponDO> getList(Collection<Long> ids) {
+        return couponMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<CouponDO> getPage(CouponPageReqVO pageReqVO) {
+        return couponMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<CouponDO> getList(CouponExportReqVO exportReqVO) {
+        return couponMapper.selectList(exportReqVO);
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/CouponTemplete/CouponTempleteMapper.xml b/yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/CouponTemplete/CouponTempleteMapper.xml
new file mode 100644
index 000000000..b7db75a77
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/CouponTemplete/CouponTempleteMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.coupon.dal.mysql.CouponTemplete.CouponTempleteMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/coupon/CouponMapper.xml b/yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/coupon/CouponMapper.xml
new file mode 100644
index 000000000..a5e70cf5d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/resources/mapper/coupon/CouponMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.coupon.dal.mysql.coupon.CouponMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

From 00863fdbac44befc1915e64d1065120d88500f23 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 12 Aug 2022 00:04:05 +0800
Subject: [PATCH 28/56] =?UTF-8?q?mall=EF=BC=9A=E8=B0=83=E6=95=B4=20trade?=
 =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E7=9A=84=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/order/TradeOrderDO.java    | 67 +++++++++-------
 .../dataobject/order/TradeOrderItemDO.java    | 78 +++++++++++--------
 2 files changed, 85 insertions(+), 60 deletions(-)

diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index 38cc67a48..ae2cfbc7b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -109,26 +109,43 @@ public class TradeOrderDO extends BaseDO {
     private Date payTime;
 
     // ========== 价格 + 支付基本信息 ==========
+    // 价格文档 - 淘宝：https://open.taobao.com/docV3.htm?docId=108471&docType=1
+
+//  TODO  promotion_details(订单优惠信息明细，商品和订单级优惠一般都在里面)
+
     /**
-     * 购买（商品）总金额，单位：分
+     * 商品原价（总），单位：分
+     *
+     * 基于 {@link TradeOrderItemDO#getTotalOriginalPrice()} 求和
      */
-    private Integer buyPrice; // niu - goods_money；
+    private Integer skuOriginalPrice; // niu - goods_money；
+    /**
+     * 商品优惠（总），单位：分
+     *
+     * 基于 {@link TradeOrderItemDO#getTotalPromotionPrice()} 求和
+     */
+    private Integer skuPromotionPrice;
+    /**
+     * 订单优惠（总），单位：分
+     *
+     * 例如说：满减折扣；不包括优惠劵、商品优惠
+     */
+    private Integer orderPromotionPrice; // niu - promotion_money；taobao - discount_fee（主订单优惠）
     /**
      * 运费金额，单位：分
      */
-    private Integer deliveryPrice; // niu - delivery_money；
+    private Integer deliveryPrice; // niu - delivery_money；taobao - post_fee（订单邮费）
+    // TODO 芋艿：taobao 的：trade.adjust_fee/order.adjust_fee（调整金额，如：卖家手动修改订单价格，官方数据修复等等）
     /**
-     * 最终金额，单位：分
+     * 应付金额（总），单位：分
      *
-     * presentPrice = buyPrice + deliveryPrice -  couponPrice - integralPrice - marketPrice
+     * = {@link #skuOriginalPrice}
+     * + {@link #deliveryPrice}
+     * - {@link #skuPromotionPrice}
+     * - {@link #orderPromotionPrice}
+     * - {@link #couponPrice}
      */
-    private Integer presentPrice; // niu - order_money；
-    /**
-     * 实际已支付金额，单位：分
-     *
-     * 初始时，金额为 0 。等到支付成功后，会进行更新。
-     */
-    private Integer payPrice; // niu - pay_money；
+    private Integer payPrice; // niu - pay_money；taobao - payment（主订单实付金额） | trade.total_fee（主订单应付金额，参考使用）；
     /**
      * 支付订单编号
      *
@@ -137,8 +154,10 @@ public class TradeOrderDO extends BaseDO {
     private Long payOrderId;
     /**
      * 支付成功的支付渠道
+     *
+     * 对应 PayChannelEnum 枚举
      */
-    private Integer payType;
+    private Integer payChannel;
 
     // ========== 收件 + 物流基本信息 ==========
     /**
@@ -226,20 +245,14 @@ public class TradeOrderDO extends BaseDO {
      * 优惠劵减免金额，单位：分
      */
     private Integer couponPrice; // niu - coupon_money；
-    /**
-     * 营销减免金额，单位：分
-     *
-     * 例如说：满减折扣
-     */
-    private Integer marketPrice; // niu - promotion_money；
-    /**
-     * 积分抵扣的金额，单位：分
-     */
-    private Integer integralPrice;
-    /**
-     * 使用的积分
-     */
-    private Integer useIntegral;
+//    /**
+//     * 积分抵扣的金额，单位：分
+//     */
+//    private Integer integralPrice;
+//    /**
+//     * 使用的积分
+//     */
+//    private Integer useIntegral;
 
     // TODO ========== 待定字段：yv =========
     // TODO cart_id：购物车 id
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
index 81961928e..5796e2916 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
@@ -41,12 +41,18 @@ public class TradeOrderItemDO extends BaseDO {
     private Long orderId;
 
     // ========== 商品基本信息 ==========
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 ProductSkuDO 的 spuId 编号
+     */
+    private Long spuId;
     /**
      * 商品 SKU 编号
      *
      * 关联 ProductSkuDO 的 id 编号
      */
-    private Integer skuId;
+    private Long skuId;
     /**
      * 规格值数组，JSON 格式
      */
@@ -74,46 +80,51 @@ public class TradeOrderItemDO extends BaseDO {
 
     // ========== 价格 + 支付基本信息 ==========
     /**
-     * 购买单价，单位：分
+     * 商品原价（单），单位：分
      *
      * 对应 ProductSkuDO 的 price 字段
      */
-    private Integer buyPrice; // like - original_price；niu - costPrice
+    private Integer originalPrice; // like - original_price；niu - costPrice
     /**
-     * 最终单价，单位：分。
-     */
-    private Integer presentPrice; // like - goods_price；niu - price
-    /**
-     * 购买总金额，单位：分
-     */
-    private Integer buyTotal; // like - total_price；niu - 暂无
-    /**
-     * 最终总金额，单位：分。
+     * 商品原价（总），单位：分
      *
-     * 注意，presentPrice * count 不一定等于 presentTotal 。
-     * 因为，存在无法整除的情况。
-     * 举个例子，presentPrice = 8.33 ，stock = 3 的情况，presentTotal 有可能是 24.99 ，也可能是 25 。
-     * 所以，需要存储一个该字段。
+     * = {@link #originalPrice} * {@link #count}
      */
-    private Integer presentTotal; // like -  total_pay_price；niu - goods_money
+    private Integer totalOriginalPrice; // like - total_price；niu - 暂无
+    /**
+     * 商品级优惠（总），单位：分
+     *
+     * 例如说“限时折扣”：商品原价的 8 折；商品原价的减 50 元
+     */
+    private Integer totalPromotionPrice; // taobao - order.discount_fee（子订单商品优惠）
+    /**
+     * 最终购买金额（单），单位：分。
+     *
+     * = {@link #totalPresentPrice} / {@link #count}
+     */
+    private Integer presentPrice;
+    /**
+     * 最终购买金额（总），单位：分。
+     *
+     * = {@link #totalOriginalPrice}
+     * - {@link #totalPromotionPrice}
+     */
+    private Integer totalPresentPrice; // like -  total_pay_price；niu - goods_money; taobao - order.payment（子订单实付金额，不算主订单分摊金额） | order.total_fee（子订单应付金额，参考使用）
+    // TODO 芋艿：part_mjz_discount(子订单分摊金额)；本质上，totalOriginalPrice - totalPayPrice
+    /**
+     * 应付金额（总），单位：分
+     */
+    private Integer totalPayPrice; // taobao - divide_order_fee （分摊后子订单实付金额）；
 
     // ========== 营销基本信息 ==========
-    /**
-     * 优惠劵满减金额，单位：分
-     */
-    private Integer couponTotal; // like - discount_price；niu - coupon_money
-    /**
-     * 营销减免金额，单位：分
-     */
-    private Integer marketTotal; // like - discount_price；niu - promotion_money
-    /**
-     * 积分抵扣的金额，单位：分
-     */
-    private Integer integralTotal; // like - integral_price；niu - point_money
-    /**
-     * 使用的积分
-     */
-    private Integer useIntegral; // niu - use_point
+//    /**
+//     * 积分抵扣的金额，单位：分
+//     */
+//    private Integer integralTotal; // like - integral_price；niu - point_money
+//    /**
+//     * 使用的积分
+//     */
+//    private Integer useIntegral; // niu - use_point
 
     // ========== 退款基本信息 ==========
     /**
@@ -193,5 +204,6 @@ public class TradeOrderItemDO extends BaseDO {
     // TODO refund_status '退款状态'
     // TODO refund_type '退款状态'
     // TODO 一堆退款字段
+
 }
 

From c8ec5c8952da003a63d3a8c327a951ab125bac20 Mon Sep 17 00:00:00 2001
From: wuxiran <wuxiran@outlook.com>
Date: Tue, 16 Aug 2022 00:26:44 +0800
Subject: [PATCH 29/56] =?UTF-8?q?mall:=E4=B8=8A=E4=BC=A0enum=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E5=81=9A=E5=90=8E=E7=AB=AF=E6=A8=A1=E6=9D=BF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A4=E5=AE=9A=E3=80=81=E5=89=8D=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enums/CouponExpireTimeTypeEnum.java       |  28 ++
 .../enums/CouponFetchTypeEnum.java            |  28 ++
 .../enums/CouponProductTypeEnum.java          |  30 ++
 .../enums/CouponStatusTypeEnum.java           |  30 ++
 .../CouponTemplete/enums/CouponTypeEnum.java  |  30 ++
 .../enums/CouponUseLimitEnum.java             |  29 ++
 .../enums/CouponValidityTypeEnum.java         |  29 ++
 .../enums/ErrorCodeConstants.java             |   7 +
 .../admin/coupon/CouponController.java        |  46 +-
 .../CouponTempleteController.java             |  27 +-
 .../vo/CouponTempleteBaseVO.java              |  92 ++--
 .../CouponTempleteServiceImpl.java            |  50 +-
 .../coupon/service/coupon/CouponService.java  |   4 +-
 .../service/coupon/CouponServiceImpl.java     |  27 +-
 yudao-ui-admin/.env.dev                       |   2 +-
 yudao-ui-admin/.env.local                     |   2 +-
 yudao-ui-admin/.eslintignore                  |   2 +-
 .../api/mall/CouponTemplete/CouponTemplete.js |  54 +++
 .../src/views/mall/CouponTemplete/index.vue   | 457 ++++++++++++++++++
 19 files changed, 883 insertions(+), 91 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponProductTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java
 create mode 100644 yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js
 create mode 100644 yudao-ui-admin/src/views/mall/CouponTemplete/index.vue

diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java
new file mode 100644
index 000000000..be6d2a90e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 优惠券 - 是否开启过期提醒
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponExpireTimeTypeEnum {
+
+    OPEN(1,"不开启"),CLOSE(0,"开启"),;
+
+    /**
+     * 是否开启过期提醒
+     */
+    private final Integer type;
+    /**
+     * 是否开启过期提醒
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java
new file mode 100644
index 000000000..ffdd99c28
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 优惠券 - 领取是否无限制 0
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponFetchTypeEnum {
+
+    LIMIT(0,"否"),NOT_LIMIT(0,"开启"),;
+
+    /**
+     * 是否开启过期提醒
+     */
+    private final Integer type;
+    /**
+     * 是否开启过期提醒
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponProductTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponProductTypeEnum.java
new file mode 100644
index 000000000..f5e6cf995
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponProductTypeEnum.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 优惠券 - 优惠券类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponProductTypeEnum {
+
+    PROCESSING(1,"进行中"),
+    END(2,"已结束"),
+    CLOSE(3,"已关闭"),;
+
+    /**
+     * 优惠券类型
+     */
+    private final Integer type;
+    /**
+     * 优惠券类型名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java
new file mode 100644
index 000000000..c58ce36b4
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 优惠券 - 优惠券类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponStatusTypeEnum {
+
+    ALL(1,"全部商品可用"),
+    POINT_PRODUCT(2,"指定商品可用"),
+    POINT_PRODUCT_NOT(3,"指定商品不可用不能为空"),;
+
+    /**
+     * 优惠券类型
+     */
+    private final Integer type;
+    /**
+     * 优惠券类型名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponTypeEnum.java
new file mode 100644
index 000000000..639d5080d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponTypeEnum.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 优惠券 - 优惠券类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponTypeEnum {
+
+    REWARD(1,"满减"),
+    DISCOUNT(2,"折扣"),
+    RANDOW(3,"随机"),;
+
+    /**
+     * 优惠券类型
+     */
+    private final Integer type;
+    /**
+     * 优惠券类型名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java
new file mode 100644
index 000000000..61d2f429b
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 优惠券 - 优惠券类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponUseLimitEnum {
+
+    HAS_LIMIT(1,"无门槛"),
+    NO_LIMIT(2,"有门槛"),;
+
+    /**
+     * 优惠券类型
+     */
+    private final Integer type;
+    /**
+     * 优惠券类型名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java
new file mode 100644
index 000000000..6411ecbf9
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 过期类型 - 状态
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponValidityTypeEnum {
+
+    TIME_RANGE_EXPIRTED(1,"时间范围过期"),
+    EXPIRES_AFTER_FIXED_DATE(2,"领取之日固定日期后过期"),
+    EXPIRES_DATE_NEXT_FIEXD_DATE(3,"领取次日固定日期后过期不能为空"),;
+
+
+    /**
+     * 状态值
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java
index 331824466..fced9d140 100644
--- a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/ErrorCodeConstants.java
@@ -11,6 +11,13 @@ public interface ErrorCodeConstants {
     // ========== COUPON分类相关 1010001000 ============
 
     ErrorCode COUPON_TEMPLETE_NOT_EXISTS = new ErrorCode(1010001000, "优惠券模板不存在");
+    ErrorCode MONEY_NOT_NULL = new ErrorCode(1010001001, "当type为reward时需要添加发放面额不能为空");
+    ErrorCode DISCOUNT_NOT_NULL = new ErrorCode(1010001001, "当type为discount时需要添加折扣不能为空");
+    ErrorCode DISCOUNT_LIMIT_NOT_NULL = new ErrorCode(1010001001, "当type为discount时可选择性添加最多折扣金额不能为空");
+    ErrorCode MIN_MAX_NOT_NULL = new ErrorCode(1010001001, "当type为radom时需要添加最低金额");
+    ErrorCode START_END_TIME_NOT_NULL = new ErrorCode(1010001001, "使用开始日期,使用结束日期不能为空");
+    ErrorCode FIXED_TERM_NOT_NULL = new ErrorCode(1010001001, "领取之日起或者次日N天内有效不能为空");
+
 
     // ========== COUPON分类相关 1010002000 ============
     ErrorCode COUPON_NOT_EXISTS = new ErrorCode(1010001000, "优惠券模板不存在");
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
index 21a91e4b5..6e099269a 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
@@ -6,20 +6,13 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.annotations.*;
 
-import javax.validation.constraints.*;
 import javax.validation.*;
-import javax.servlet.http.*;
 import java.util.*;
-import java.io.IOException;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
 
 import cn.iocoder.yudao.module.coupon.controller.admin.coupon.vo.*;
 import cn.iocoder.yudao.module.coupon.dal.dataobject.coupon.CouponDO;
@@ -28,25 +21,29 @@ import cn.iocoder.yudao.module.coupon.service.coupon.CouponService;
 
 @Api(tags = "管理后台 - 优惠券")
 @RestController
-@RequestMapping("/coupon/")
+@RequestMapping("/coupon/coupon/")
 @Validated
 public class CouponController {
 
     @Resource
-    private CouponService Service;
+    private CouponService couponService;
 
+
+    //todo 用户优惠券
     @PostMapping("/create")
-    @ApiOperation("创建优惠券")
+    @ApiOperation("用户领取优惠券")
     @PreAuthorize("@ss.hasPermission('coupon::create')")
-    public CommonResult<Long> create(@Valid @RequestBody CouponCreateReqVO createReqVO) {
-        return success(Service.create(createReqVO));
+    public CommonResult<Long> create(@RequestParam("couponTemplateId") Long couponTemplateId) {
+
+        return success(couponService.create(couponTemplateId));
     }
 
+
     @PutMapping("/update")
     @ApiOperation("更新优惠券")
     @PreAuthorize("@ss.hasPermission('coupon::update')")
     public CommonResult<Boolean> update(@Valid @RequestBody CouponUpdateReqVO updateReqVO) {
-        Service.update(updateReqVO);
+        couponService.update(updateReqVO);
         return success(true);
     }
 
@@ -55,7 +52,7 @@ public class CouponController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('coupon::delete')")
     public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
-        Service.delete(id);
+        couponService.delete(id);
         return success(true);
     }
 
@@ -64,16 +61,18 @@ public class CouponController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('coupon::query')")
     public CommonResult<CouponRespVO> get(@RequestParam("id") Long id) {
-        CouponDO couponDO = Service.get(id);
+        CouponDO couponDO = couponService.get(id);
         return success(CouponConvert.INSTANCE.convert(couponDO));
     }
 
+
+
     @GetMapping("/list")
     @ApiOperation("获得优惠券列表")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+//    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
     @PreAuthorize("@ss.hasPermission('coupon::query')")
     public CommonResult<List<CouponRespVO>> getList(@RequestParam("ids") Collection<Long> ids) {
-        List<CouponDO> list = Service.getList(ids);
+        List<CouponDO> list = couponService.getList(ids);
         return success(CouponConvert.INSTANCE.convertList(list));
     }
 
@@ -81,20 +80,9 @@ public class CouponController {
     @ApiOperation("获得优惠券分页")
     @PreAuthorize("@ss.hasPermission('coupon::query')")
     public CommonResult<PageResult<CouponRespVO>> getPage(@Valid CouponPageReqVO pageVO) {
-        PageResult<CouponDO> pageResult = Service.getPage(pageVO);
+        PageResult<CouponDO> pageResult = couponService.getPage(pageVO);
         return success(CouponConvert.INSTANCE.convertPage(pageResult));
     }
 
-    @GetMapping("/export-excel")
-    @ApiOperation("导出优惠券 Excel")
-    @PreAuthorize("@ss.hasPermission('coupon::export')")
-    @OperateLog(type = EXPORT)
-    public void exportExcel(@Valid CouponExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<CouponDO> list = Service.getList(exportReqVO);
-        // 导出 Excel
-        List<CouponExcelVO> datas = CouponConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "优惠券.xls", "数据", CouponExcelVO.class, datas);
-    }
 
 }
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
index d60ed45aa..40d9ac429 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
@@ -11,24 +11,15 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.annotations.*;
 
 import javax.validation.*;
-import javax.servlet.http.*;
 import java.util.*;
-import java.io.IOException;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-
-
 @Api(tags = "管理后台 - 优惠券模板")
 @RestController
-@RequestMapping("/CouponTemplete/")
+@RequestMapping("/coupon/CouponTemplete/")
 @Validated
 public class CouponTempleteController {
 
@@ -61,7 +52,7 @@ public class CouponTempleteController {
 
     @GetMapping("/get")
     @ApiOperation("获得优惠券模板")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+//    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
     public CommonResult<CouponTempleteRespVO> get(@RequestParam("id") Long id) {
         CouponTempleteDO couponTempleteDO = Service.get(id);
@@ -70,7 +61,7 @@ public class CouponTempleteController {
 
     @GetMapping("/list")
     @ApiOperation("获得优惠券模板列表")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+//    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
     @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
     public CommonResult<List<CouponTempleteRespVO>> getList(@RequestParam("ids") Collection<Long> ids) {
         List<CouponTempleteDO> list = Service.getList(ids);
@@ -85,16 +76,6 @@ public class CouponTempleteController {
         return success(CouponTempleteConvert.INSTANCE.convertPage(pageResult));
     }
 
-    @GetMapping("/export-excel")
-    @ApiOperation("导出优惠券模板 Excel")
-    @PreAuthorize("@ss.hasPermission('CouponTemplete::export')")
-    @OperateLog(type = EXPORT)
-    public void exportExcel(@Valid CouponTempleteExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<CouponTempleteDO> list = Service.getList(exportReqVO);
-        // 导出 Excel
-        List<CouponTempleteExcelVO> datas = CouponTempleteConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "优惠券模板.xls", "数据", CouponTempleteExcelVO.class, datas);
-    }
+
 
 }
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
index f43339f0f..d9818344f 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
@@ -16,9 +16,8 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class CouponTempleteBaseVO {
 
-    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机", required = true)
-    @NotNull(message = "优惠券类型 reward-满减 discount-折扣 random-随机不能为空")
-    private String type;
+
+    //基本信息
 
     @ApiModelProperty(value = "优惠券名称", required = true)
     @NotNull(message = "优惠券名称不能为空")
@@ -30,17 +29,8 @@ public class CouponTempleteBaseVO {
     @ApiModelProperty(value = "优惠券图片")
     private String image;
 
-    @ApiModelProperty(value = "发放数量", required = true)
-    @NotNull(message = "发放数量不能为空")
-    private Integer count;
+    /*  ============判断适用商品——开始=============  */
 
-    @ApiModelProperty(value = "已领取数量", required = true)
-    @NotNull(message = "已领取数量不能为空")
-    private Integer leadCount;
-
-    @ApiModelProperty(value = "已使用数量", required = true)
-    @NotNull(message = "已使用数量不能为空")
-    private Integer usedCount;
 
     @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用", required = true)
     @NotNull(message = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用不能为空")
@@ -57,15 +47,22 @@ public class CouponTempleteBaseVO {
     @NotNull(message = "满多少元使用 0代表无限制不能为空")
     private BigDecimal atLeast;
 
-    @ApiModelProperty(value = "发放面额 当type为reward时需要添加", required = true)
+
+    /*  ============折扣类型——开始=============  */
+
+    @ApiModelProperty(value = "优惠券类型 reward-满减 discount-折扣 random-随机", required = true)
+    @NotNull(message = "优惠券类型 reward-满减 discount-折扣 random-随机不能为空")
+    private String type;
+
+    @ApiModelProperty(value = "发放面额 当type为reward时需要添加")
     @NotNull(message = "发放面额 当type为reward时需要添加不能为空")
     private BigDecimal money;
 
-    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加", required = true)
+    @ApiModelProperty(value = "1 =< 折扣 <= 9.9 当type为discount时需要添加")
     @NotNull(message = "1 =< 折扣 <= 9.9 当type为discount时需要添加不能为空")
     private BigDecimal discount;
 
-    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加", required = true)
+    @ApiModelProperty(value = "最多折扣金额 当type为discount时可选择性添加")
     @NotNull(message = "最多折扣金额 当type为discount时可选择性添加不能为空")
     private BigDecimal discountLimit;
 
@@ -77,9 +74,15 @@ public class CouponTempleteBaseVO {
     @NotNull(message = "最大金额 当type为radom时需要添加不能为空")
     private BigDecimal maxMoney;
 
+    /*  ============折扣类型——结束=============  */
+
+
+    /*  ============过期类型——开始=============  */
+
+
     @ApiModelProperty(value = "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期", required = true)
-    @NotNull(message = "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期不能为空")
-    private Boolean validityType;
+    @NotNull(message = "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期 不能为空")
+    private Integer validityType;
 
     @ApiModelProperty(value = "使用开始日期 过期类型1时必填")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -89,19 +92,26 @@ public class CouponTempleteBaseVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date endUseTime;
 
-    @ApiModelProperty(value = "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效", required = true)
+    @ApiModelProperty(value = "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效")
     @NotNull(message = "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效不能为空")
     private Integer fixedTerm;
 
-    @ApiModelProperty(value = "是否无限制0-否 1是", required = true)
-    @NotNull(message = "是否无限制0-否 1是不能为空")
+    @ApiModelProperty(value = "有效日期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endTime;
+
+    /*  ============过期类型——结束=============  */
+
+
+    @ApiModelProperty(value = "领取是否无限制0-否 1是", required = true)
+    @NotNull(message = "是否无限制0-否 1是 不能为空")
     private Boolean whetherLimitless;
 
     @ApiModelProperty(value = "每人最大领取个数", required = true)
     @NotNull(message = "每人最大领取个数不能为空")
     private Integer maxFetch;
 
-    @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启", required = true)
+    @ApiModelProperty(value = "是否开启过期提醒 0-不开启 1-开启", required = true)
     @NotNull(message = "是否开启过期提醒0-不开启 1-开启不能为空")
     private Boolean whetherExpireNotice;
 
@@ -117,6 +127,18 @@ public class CouponTempleteBaseVO {
     @NotNull(message = "是否显示不能为空")
     private Integer whetherShow;
 
+    @ApiModelProperty(value = "是否禁止发放0-否 1-是", required = true)
+    @NotNull(message = "是否禁止发放0-否 1-是不能为空")
+    private Boolean whetherForbidden;
+
+    /*  ============汇总计算——开始=============  */
+
+
+
+    @ApiModelProperty(value = "使用优惠券购买的商品数量", required = true)
+    @NotNull(message = "使用优惠券购买的商品数量不能为空")
+    private Integer orderGoodsNum;
+
     @ApiModelProperty(value = "订单的优惠总金额", required = true)
     @NotNull(message = "订单的优惠总金额不能为空")
     private BigDecimal discountOrderMoney;
@@ -125,20 +147,26 @@ public class CouponTempleteBaseVO {
     @NotNull(message = "用券总成交额不能为空")
     private BigDecimal orderMoney;
 
-    @ApiModelProperty(value = "是否禁止发放0-否 1-是", required = true)
-    @NotNull(message = "是否禁止发放0-否 1-是不能为空")
-    private Boolean whetherForbidden;
+    @ApiModelProperty(value = "发放数量", required = true)
+    @NotNull(message = "发放数量不能为空")
+    private Integer count;
 
-    @ApiModelProperty(value = "使用优惠券购买的商品数量", required = true)
-    @NotNull(message = "使用优惠券购买的商品数量不能为空")
-    private Integer orderGoodsNum;
+    @ApiModelProperty(value = "已领取数量", required = true)
+    @NotNull(message = "已领取数量不能为空")
+    private Integer leadCount;
 
-    @ApiModelProperty(value = "状态（1进行中2已结束-1已关闭）", required = true)
+    @ApiModelProperty(value = "已使用数量", required = true)
+    @NotNull(message = "已使用数量不能为空")
+    private Integer usedCount;
+
+
+    /*  ============汇总计算——结束=============  */
+
+
+    @ApiModelProperty(value = "状态（1进行中2已结束3已关闭）", required = true)
     @NotNull(message = "状态（1进行中2已结束-1已关闭）不能为空")
     private Integer status;
 
-    @ApiModelProperty(value = "有效日期结束时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date endTime;
+
 
 }
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
index 982b2f1b2..f3f826b81 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.coupon.service.CouponTemplete;
 
+import cn.iocoder.yudao.module.CouponTemplete.enums.CouponTypeEnum;
+import cn.iocoder.yudao.module.CouponTemplete.enums.CouponValidityTypeEnum;
 import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteCreateReqVO;
 import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteExportReqVO;
 import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempletePageReqVO;
@@ -18,7 +20,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.CouponTemplete.enums.ErrorCodeConstants.COUPON_TEMPLETE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.CouponTemplete.enums.ErrorCodeConstants.*;
 
 /**
  * 优惠券模板 Service 实现类
@@ -36,11 +38,57 @@ public class CouponTempleteServiceImpl implements CouponTempleteService {
     public Long create(CouponTempleteCreateReqVO createReqVO) {
         // 插入
         CouponTempleteDO couponTempleteDO = CouponTempleteConvert.INSTANCE.convert(createReqVO);
+        /* 验证类型、判断必填*/
+        checkCouponType(createReqVO);
+
+        /*todo 验证过期类型、判断必填*/
+        checkValidityType(createReqVO);
+
+
+
         couponTempleteMapper.insert(couponTempleteDO);
         // 返回
         return couponTempleteDO.getId();
     }
 
+    /*确认优惠券类型*/
+    private void checkValidityType(CouponTempleteCreateReqVO createReqVO) {
+        Integer validtyType = createReqVO.getValidityType();
+
+        if(CouponValidityTypeEnum.TIME_RANGE_EXPIRTED.getStatus().equals(validtyType)){
+            if(createReqVO.getStartUseTime() == null||createReqVO.getEndUseTime() == null){
+                throw exception(START_END_TIME_NOT_NULL);
+            }
+        }else{
+            if(createReqVO.getFixedTerm() == null){
+                throw exception(FIXED_TERM_NOT_NULL);
+            }
+        }
+    }
+
+    private void checkCouponType(CouponTempleteCreateReqVO createReqVO) {
+
+        String couponType = createReqVO.getType();
+        //当type=reward时候，需要添加
+        if(couponType.equals(CouponTypeEnum.REWARD.getName())){
+            if(createReqVO.getMoney()==null){
+                throw exception(MONEY_NOT_NULL);
+            }
+        }else if(couponType.equals(CouponTypeEnum.DISCOUNT.getName())){
+            if(createReqVO.getDiscount()==null){
+                throw exception(DISCOUNT_NOT_NULL);
+            }
+            if(createReqVO.getDiscountLimit()==null){
+                throw exception(DISCOUNT_LIMIT_NOT_NULL);
+            }
+        }else if (couponType.equals(CouponTypeEnum.RANDOW.getName())){
+            //当type为radom时需要添加不能为空
+            if(createReqVO.getMinMoney()==null||createReqVO.getMaxMoney()==null){
+                throw exception(MIN_MAX_NOT_NULL);
+            }
+        }
+    }
+
     @Override
     public void update(CouponTempleteUpdateReqVO updateReqVO) {
         // 校验存在
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java
index a3ca66611..6a9d31520 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponService.java
@@ -16,10 +16,10 @@ public interface CouponService {
     /**
      * 创建优惠券
      *
-     * @param createReqVO 创建信息
+     * @param templateId 优惠券模板id
      * @return 编号
      */
-    Long create(@Valid CouponCreateReqVO createReqVO);
+    Long create(Long templateId);
 
     /**
      * 更新优惠券
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
index 99f87ecfc..0a1737a31 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
@@ -1,5 +1,10 @@
 package cn.iocoder.yudao.module.coupon.service.coupon;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
+import cn.iocoder.yudao.module.coupon.dal.mysql.CouponTemplete.CouponTempleteMapper;
+import io.micrometer.core.instrument.Counter;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -27,7 +32,9 @@ public class CouponServiceImpl implements CouponService {
     @Resource
     private CouponMapper couponMapper;
 
-    @Override
+    @Resource
+    private CouponTempleteMapper couponTempleteMapper;
+
     public Long create(CouponCreateReqVO createReqVO) {
         // 插入
         CouponDO couponDO = CouponConvert.INSTANCE.convert(createReqVO);
@@ -36,6 +43,24 @@ public class CouponServiceImpl implements CouponService {
         return couponDO.getId();
     }
 
+
+    /**
+     *todo 获取用户id收获优惠券
+     *@author:wxr
+     *@date:2022-08-13 3:11
+     *@Description
+     */
+    @Override
+    public Long create(Long templateId) {
+        Long userid = SecurityFrameworkUtils.getLoginUserId();
+        CouponDO couponDO = CouponDO.builder().memberId(userid).build();
+        CouponTempleteDO couponTempleteDO = couponTempleteMapper.selectById(templateId);
+        //todo 缺少判空
+        BeanUtil.copyProperties(couponTempleteDO,couponTempleteDO);
+        couponMapper.insert(couponDO);
+        return couponDO.getId();
+    }
+
     @Override
     public void update(CouponUpdateReqVO updateReqVO) {
         // 校验存在
diff --git a/yudao-ui-admin/.env.dev b/yudao-ui-admin/.env.dev
index db9e33854..bb68d6fe2 100644
--- a/yudao-ui-admin/.env.dev
+++ b/yudao-ui-admin/.env.dev
@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:48080'
+VUE_APP_BASE_API = 'http://localhost:48081'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/yudao-ui-admin/.env.local b/yudao-ui-admin/.env.local
index 58029b662..af9741467 100644
--- a/yudao-ui-admin/.env.local
+++ b/yudao-ui-admin/.env.local
@@ -6,7 +6,7 @@ VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/本地环境
 # VUE_APP_BASE_API = '/proxy-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+VUE_APP_BASE_API = 'http://127.0.0.1:48081'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/yudao-ui-admin/.eslintignore b/yudao-ui-admin/.eslintignore
index 89be6f659..21cfec76a 100644
--- a/yudao-ui-admin/.eslintignore
+++ b/yudao-ui-admin/.eslintignore
@@ -7,4 +7,4 @@ public
 # 忽略当前目录下为js的文件的语法检查
 *.js
 # 忽略当前目录下为vue的文件的语法检查
-*.vue
\ No newline at end of file
+*.vue
diff --git a/yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js b/yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js
new file mode 100644
index 000000000..429dfb8dc
--- /dev/null
+++ b/yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建优惠券模板
+export function create(data) {
+  return request({
+    url: '/coupon/CouponTemplete/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新优惠券模板
+export function update(data) {
+  return request({
+    url: '/coupon/CouponTemplete/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券模板
+export function deleteCouponTemplete (id) {
+  return request({
+    url: '/coupon/CouponTemplete/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得优惠券模板
+export function get(id) {
+  return request({
+    url: '/coupon/CouponTemplete/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得优惠券模板分页
+export function getPage(query) {
+  return request({
+    url: '/coupon/CouponTemplete/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出优惠券模板 Excel
+export function exportExcel(query) {
+  return request({
+    url: '/coupon/CouponTemplete/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
diff --git a/yudao-ui-admin/src/views/mall/CouponTemplete/index.vue b/yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
new file mode 100644
index 000000000..47be4afd3
--- /dev/null
+++ b/yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="优惠券类" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择优惠券类型 reward-满减 discount-折扣 random-随机" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="优惠券名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入优惠券名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态（1进行中2已结束-1已关闭）" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="有效日期结束时间" prop="endTime">
+        <el-date-picker v-model="queryParams.endTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['CouponTemplete::create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['CouponTemplete::export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="用户ID" align="center" prop="id" />
+
+    <!--      todo 优惠券类型-->
+      <el-table-column label="优惠券类型" align="center" prop="type" />
+      <el-table-column label="优惠券名称" align="center" prop="name" />
+      <el-table-column label="优惠券图片" align="center" prop="image" />
+      <el-table-column label="发放数量" align="center" prop="count" />
+      <el-table-column label="已领取数量" align="center" prop="leadCount" />
+      <el-table-column label="已使用数量" align="center" prop="usedCount" />
+<!--            todo 适用商品类型-->
+<!--      <el-table-column label="适用商品类型" align="center" prop="goodsType" />-->
+      <!--      todo 使用门槛0-无门槛 1-有门槛-->
+
+      <el-table-column label="使用门槛" align="center" prop="hasUseLimit" />
+<!--      <el-table-column label="满多少元使用 0代表无限制" align="center" prop="atLeast" />-->
+      <!--      todo 发放面额 折扣-->
+      <el-table-column label="优惠金额/折扣" align="center" prop="money" />
+<!--      <el-table-column label="1 =< 折扣 <= 9.9 当type为discount时需要添加" align="center" prop="discount" />-->
+<!--      <el-table-column label="最多折扣金额 当type为discount时可选择性添加" align="center" prop="discountLimit" />-->
+<!--      <el-table-column label="最低金额 当type为radom时需要添加" align="center" prop="minMoney" />-->
+<!--      <el-table-column label="最大金额 当type为radom时需要添加" align="center" prop="maxMoney" />-->
+      <!-- todo 1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期 -->
+      <el-table-column label="有效期限" align="center" prop="validityType" />
+<!--      <el-table-column label="使用开始日期 过期类型1时必填" align="center" prop="startUseTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.startUseTime) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="使用结束日期 过期类型1时必填" align="center" prop="endUseTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.endUseTime) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="有效日期结束时间" align="center" prop="endTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.endTime) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效" align="center" prop="fixedTerm" />-->
+<!--      <el-table-column label="是否无限制0-否 1是" align="center" prop="whetherLimitless" />-->
+      <el-table-column label="领取上限" align="center" prop="maxFetch" />
+      <!--   todo     0-不限制 1- 优惠券仅原价购买商品时可用-->
+      <el-table-column label="优惠叠加" align="center" prop="whetherForbidPreference" />
+      <el-table-column label="是否显示" align="center" prop="whetherShow" />
+      <el-table-column label="订单的优惠总金额" align="center" prop="discountOrderMoney" />
+      <el-table-column label="用券总成交额" align="center" prop="orderMoney" />
+      <el-table-column label="是否禁止发放" align="center" prop="whetherForbidden" />
+      <el-table-column label="使用优惠券购买的商品数量" align="center" prop="orderGoodsNum" />
+      <el-table-column label="状态" align="center" prop="status" />
+
+      <el-table-column label="备注" align="center" prop="couponNameRemark" />
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
+        <template #scope>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['CouponTemplete::update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['CouponTemplete::delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="优惠券类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择优惠券类型 reward-满减 discount-折扣 random-随机">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="优惠券名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入优惠券名称" />
+        </el-form-item>
+        <el-form-item label="名称备注" prop="couponNameRemark">
+          <el-input v-model="form.couponNameRemark" placeholder="请输入名称备注" />
+        </el-form-item>
+        <el-form-item label="发放数量" prop="count">
+          <el-input v-model="form.count" placeholder="请输入发放数量" />
+        </el-form-item>
+        <el-form-item label="适用商品类型" prop="goodsType">
+          <el-radio-group v-model="form.goodsType">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      <!--        todo 请输入适用商品id-->
+        <el-form-item label="适用商品id" prop="productIds">
+          <el-input v-model="form.productIds" placeholder="请输入适用商品id" />
+        </el-form-item>
+        <el-form-item label="使用门槛" prop="hasUseLimit">
+          <el-radio-group v-model="form.hasUseLimit">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="满多少元使用" prop="atLeast">
+          <el-input v-model="form.atLeast" placeholder="请输入满多少元使用 0代表无限制" />
+        </el-form-item>
+        <el-form-item label="发放面额" prop="money">
+          <el-input v-model="form.money" placeholder="请输入发放面额 当type为reward时需要添加" />
+        </el-form-item>
+        <el-form-item label="1 =< 折扣 <= 9.9" prop="discount">
+          <el-input v-model="form.discount" placeholder="请输入1 =< 折扣 <= 9.9 当type为discount时需要添加" />
+        </el-form-item>
+        <el-form-item label="最多折扣金额" prop="discountLimit">
+          <el-input v-model="form.discountLimit" placeholder="请输入最多折扣金额 当type为discount时可选择性添加" />
+        </el-form-item>
+        <el-form-item label="最低金额" prop="minMoney">
+          <el-input v-model="form.minMoney" placeholder="请输入最低金额 当type为radom时需要添加" />
+        </el-form-item>
+        <el-form-item label="最大金额" prop="maxMoney">
+          <el-input v-model="form.maxMoney" placeholder="请输入最大金额 当type为radom时需要添加" />
+        </el-form-item>
+        <el-form-item label="过期类型" prop="validityType">
+          <el-radio-group v-model="form.validityType">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="使用开始日期 过期类型1时必填" prop="startUseTime">
+          <el-date-picker clearable v-model="form.startUseTime" type="date" value-format="timestamp" placeholder="选择使用开始日期 过期类型1时必填" />
+        </el-form-item>
+        <el-form-item label="使用结束日期 过期类型1时必填" prop="endUseTime">
+          <el-date-picker clearable v-model="form.endUseTime" type="date" value-format="timestamp" placeholder="选择使用结束日期 过期类型1时必填" />
+        </el-form-item>
+        <el-form-item label="当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效" prop="fixedTerm">
+          <el-input v-model="form.fixedTerm" placeholder="请输入当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效" />
+        </el-form-item>
+        <el-form-item label="是否无限制0-否 1是" prop="whetherLimitless">
+          <el-radio-group v-model="form.whetherLimitless">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="每人最大领取个数" prop="maxFetch">
+          <el-input v-model="form.maxFetch" placeholder="请输入每人最大领取个数" />
+        </el-form-item>
+        <el-form-item label="是否开启过期提醒0-不开启 1-开启" prop="whetherExpireNotice">
+          <el-radio-group v-model="form.whetherExpireNotice">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="过期前N天提醒" prop="expireNoticeFixedTerm">
+          <el-input v-model="form.expireNoticeFixedTerm" placeholder="请输入过期前N天提醒" />
+        </el-form-item>
+        <el-form-item label="优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用" prop="whetherForbidPreference">
+          <el-radio-group v-model="form.whetherForbidPreference">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否显示" prop="whetherShow">
+          <el-input v-model="form.whetherShow" placeholder="请输入是否显示" />
+        </el-form-item>
+        <el-form-item label="订单的优惠总金额" prop="discountOrderMoney">
+          <el-input v-model="form.discountOrderMoney" placeholder="请输入订单的优惠总金额" />
+        </el-form-item>
+        <el-form-item label="用券总成交额" prop="orderMoney">
+          <el-input v-model="form.orderMoney" placeholder="请输入用券总成交额" />
+        </el-form-item>
+        <el-form-item label="是否禁止发放0-否 1-是" prop="whetherForbidden">
+          <el-radio-group v-model="form.whetherForbidden">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="使用优惠券购买的商品数量" prop="orderGoodsNum">
+          <el-input v-model="form.orderGoodsNum" placeholder="请输入使用优惠券购买的商品数量" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="有效日期结束时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="date" value-format="timestamp" placeholder="选择有效日期结束时间" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { create, update, deleteCouponTemplete, get, getPage, exportExcel } from "@/api/mall/CouponTemplete/CouponTemplete.js";
+
+export default {
+  name: "",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 优惠券模板列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        type: null,
+        name: null,
+        couponNameRemark: null,
+        image: null,
+        count: null,
+        leadCount: null,
+        usedCount: null,
+        goodsType: null,
+        productIds: null,
+        hasUseLimit: null,
+        atLeast: null,
+        money: null,
+        discount: null,
+        discountLimit: null,
+        minMoney: null,
+        maxMoney: null,
+        validityType: null,
+        startUseTime: [],
+        endUseTime: [],
+        fixedTerm: null,
+        whetherLimitless: null,
+        maxFetch: null,
+        whetherExpireNotice: null,
+        expireNoticeFixedTerm: null,
+        whetherForbidPreference: null,
+        whetherShow: null,
+        discountOrderMoney: null,
+        orderMoney: null,
+        whetherForbidden: null,
+        orderGoodsNum: null,
+        status: null,
+        endTime: [],
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        type: [{ required: true, message: "优惠券类型 reward-满减 discount-折扣 random-随机不能为空", trigger: "change" }],
+        name: [{ required: true, message: "优惠券名称不能为空", trigger: "blur" }],
+        count: [{ required: true, message: "发放数量不能为空", trigger: "blur" }],
+        leadCount: [{ required: true, message: "已领取数量不能为空", trigger: "blur" }],
+        usedCount: [{ required: true, message: "已使用数量不能为空", trigger: "blur" }],
+        goodsType: [{ required: true, message: "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用不能为空", trigger: "blur" }],
+        hasUseLimit: [{ required: true, message: "使用门槛0-无门槛 1-有门槛不能为空", trigger: "blur" }],
+        atLeast: [{ required: true, message: "满多少元使用 0代表无限制不能为空", trigger: "blur" }],
+        money: [{ required: true, message: "发放面额 当type为reward时需要添加不能为空", trigger: "blur" }],
+        discount: [{ required: true, message: "1 =< 折扣 <= 9.9 当type为discount时需要添加不能为空", trigger: "blur" }],
+        discountLimit: [{ required: true, message: "最多折扣金额 当type为discount时可选择性添加不能为空", trigger: "blur" }],
+        minMoney: [{ required: true, message: "最低金额 当type为radom时需要添加不能为空", trigger: "blur" }],
+        maxMoney: [{ required: true, message: "最大金额 当type为radom时需要添加不能为空", trigger: "blur" }],
+        validityType: [{ required: true, message: "过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期不能为空", trigger: "blur" }],
+        fixedTerm: [{ required: true, message: "当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效不能为空", trigger: "blur" }],
+        whetherLimitless: [{ required: true, message: "是否无限制0-否 1是不能为空", trigger: "blur" }],
+        maxFetch: [{ required: true, message: "每人最大领取个数不能为空", trigger: "blur" }],
+        whetherExpireNotice: [{ required: true, message: "是否开启过期提醒0-不开启 1-开启不能为空", trigger: "blur" }],
+        expireNoticeFixedTerm: [{ required: true, message: "过期前N天提醒不能为空", trigger: "blur" }],
+        whetherForbidPreference: [{ required: true, message: "优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用不能为空", trigger: "blur" }],
+        whetherShow: [{ required: true, message: "是否显示不能为空", trigger: "blur" }],
+        discountOrderMoney: [{ required: true, message: "订单的优惠总金额不能为空", trigger: "blur" }],
+        orderMoney: [{ required: true, message: "用券总成交额不能为空", trigger: "blur" }],
+        whetherForbidden: [{ required: true, message: "是否禁止发放0-否 1-是不能为空", trigger: "blur" }],
+        orderGoodsNum: [{ required: true, message: "使用优惠券购买的商品数量不能为空", trigger: "blur" }],
+        status: [{ required: true, message: "状态（1进行中2已结束-1已关闭）不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        type: undefined,
+        name: undefined,
+        couponNameRemark: undefined,
+        image: undefined,
+        count: undefined,
+        leadCount: undefined,
+        usedCount: undefined,
+        goodsType: undefined,
+        productIds: undefined,
+        hasUseLimit: undefined,
+        atLeast: undefined,
+        money: undefined,
+        discount: undefined,
+        discountLimit: undefined,
+        minMoney: undefined,
+        maxMoney: undefined,
+        validityType: undefined,
+        startUseTime: undefined,
+        endUseTime: undefined,
+        fixedTerm: undefined,
+        whetherLimitless: undefined,
+        maxFetch: undefined,
+        whetherExpireNotice: undefined,
+        expireNoticeFixedTerm: undefined,
+        whetherForbidPreference: undefined,
+        whetherShow: undefined,
+        discountOrderMoney: undefined,
+        orderMoney: undefined,
+        whetherForbidden: undefined,
+        orderGoodsNum: undefined,
+        status: undefined,
+        endTime: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加优惠券模板";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      get(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改优惠券模板";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          update(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        create(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除优惠券模板编号为"' + id + '"的数据项?').then(function() {
+          return deleteCouponTemplete(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有优惠券模板数据项?').then(() => {
+          this.exportLoading = true;
+          return exportExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '优惠券模板.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

From d505b64b8f98e3e8e132a38fa67898ca2f3c037d Mon Sep 17 00:00:00 2001
From: wuxiran <wuxiran@outlook.com>
Date: Tue, 16 Aug 2022 00:38:22 +0800
Subject: [PATCH 30/56] =?UTF-8?q?mall:=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/.env.dev   | 2 +-
 yudao-ui-admin/.env.local | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-ui-admin/.env.dev b/yudao-ui-admin/.env.dev
index bb68d6fe2..db9e33854 100644
--- a/yudao-ui-admin/.env.dev
+++ b/yudao-ui-admin/.env.dev
@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:48081'
+VUE_APP_BASE_API = 'http://localhost:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/yudao-ui-admin/.env.local b/yudao-ui-admin/.env.local
index af9741467..58029b662 100644
--- a/yudao-ui-admin/.env.local
+++ b/yudao-ui-admin/.env.local
@@ -6,7 +6,7 @@ VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/本地环境
 # VUE_APP_BASE_API = '/proxy-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:48081'
+VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

From 5948be86a820ad729ac227fee5870c490012bdd7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 16 Aug 2022 08:57:18 +0800
Subject: [PATCH 31/56] =?UTF-8?q?mall=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao-module-market-api/pom.xml           |   7 +
 .../module/market/api/price/PriceApi.java     |  21 ++
 .../api/price/dto/PriceCalculateReqDTO.java   |  56 +++++
 .../api/price/dto/PriceCalculateRespDTO.java  | 191 ++++++++++++++++++
 .../activity/MarketActivityTypeEnum.java      |  44 ----
 .../enums/common/PromotionLevelEnum.java      |  37 ++++
 .../enums/common/PromotionTypeEnum.java       |  37 ++++
 .../admin/activity/vo/ActivityBaseVO.java     |   4 +-
 .../admin/activity/vo/ActivityPageReqVO.java  |   4 +-
 .../dal/dataobject/order/TradeOrderDO.java    |  17 +-
 .../dataobject/order/TradeOrderItemDO.java    |  15 +-
 11 files changed, 375 insertions(+), 58 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApi.java
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateReqDTO.java
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java
 delete mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionLevelEnum.java
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java

diff --git a/yudao-module-mall/yudao-module-market-api/pom.xml b/yudao-module-mall/yudao-module-market-api/pom.xml
index fef3428fc..9517c343f 100644
--- a/yudao-module-mall/yudao-module-market-api/pom.xml
+++ b/yudao-module-mall/yudao-module-market-api/pom.xml
@@ -21,6 +21,13 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-common</artifactId>
         </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApi.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApi.java
new file mode 100644
index 000000000..532a66dc2
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApi.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.market.api.price;
+
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateReqDTO;
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateRespDTO;
+
+/**
+ * 价格 API 接口
+ *
+ * @author 芋道源码
+ */
+public interface PriceApi {
+
+    /**
+     * 计算商品的价格
+     *
+     * @param calculateReqDTO 价格请求
+     * @return 价格相应
+     */
+    PriceCalculateRespDTO calculatePrice(PriceCalculateReqDTO calculateReqDTO);
+
+}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateReqDTO.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateReqDTO.java
new file mode 100644
index 000000000..4cc019651
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateReqDTO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.market.api.price.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 价格计算 Request DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class PriceCalculateReqDTO {
+
+    /**
+     * 用户编号
+     *
+     * 对应 MemberUserDO 的 id 编号
+     */
+    private Long userId;
+
+    /**
+     * 优惠劵编号
+     */
+    private Long couponId;
+
+    /**
+     * 商品 SKU 数组
+     */
+    @NotNull(message = "商品数组不能为空")
+    private List<Item> items;
+
+    /**
+     * 商品 SKU
+     */
+    @Data
+    public static class Item {
+
+        /**
+         * SKU 编号
+         */
+        @NotNull(message = "商品 SKU 编号不能为空")
+        private Long skuId;
+
+        /**
+         * SKU 数量
+         */
+        @NotNull(message = "商品 SKU 数量不能为空")
+        @Min(value = 0L, message = "商品 SKU 数量必须大于等于 0") // 可传递 0 数量，用于购物车未选中的情况
+        private Integer count;
+
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java
new file mode 100644
index 000000000..c6eb2d5e1
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java
@@ -0,0 +1,191 @@
+package cn.iocoder.yudao.module.market.api.price.dto;
+
+import cn.iocoder.yudao.module.market.enums.common.PromotionLevelEnum;
+import cn.iocoder.yudao.module.market.enums.common.PromotionTypeEnum;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 价格计算 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class PriceCalculateRespDTO {
+
+    /**
+     * 订单
+     */
+    private Order order;
+
+    /**
+     * 商品 SKU 数组
+     */
+    private List<Item> items;
+
+    /**
+     * 营销活动数组
+     *
+     * 只对应 {@link #items} 商品匹配的活动
+     */
+    private List<Promotion> promotions;
+
+    /**
+     * 订单
+     */
+    @Data
+    public static class Order {
+
+        /**
+         * 商品原价（总），单位：分
+         *
+         * 基于 {@link Item#getTotalOriginalPrice()} 求和
+         */
+        private Integer skuOriginalPrice;
+        /**
+         * 商品优惠（总），单位：分
+         *
+         * 基于 {@link Item#getTotalPromotionPrice()} 求和
+         */
+        private Integer skuPromotionPrice;
+        /**
+         * 订单优惠（总），单位：分
+         *
+         * 例如说：满减折扣；不包括优惠劵、商品优惠
+         */
+        private Integer orderPromotionPrice;
+        /**
+         * 运费金额，单位：分
+         */
+        private Integer deliveryPrice;
+        /**
+         * 应付金额（总），单位：分
+         *
+         * = {@link #skuOriginalPrice}
+         * + {@link #deliveryPrice}
+         * - {@link #skuPromotionPrice}
+         * - {@link #orderPromotionPrice}
+         * - {@link #couponPrice} // TODO 芋艿：需要再考虑一下它
+         */
+        private Integer payPrice;
+
+        // ========== 营销基本信息 ==========
+        /**
+         * 优惠劵编号
+         */
+        private Long couponId;
+        /**
+         * 优惠劵减免金额，单位：分
+         */
+        private Integer couponPrice;
+
+    }
+
+    /**
+     * 商品 SKU
+     */
+    @Data
+    public static class Item extends PriceCalculateReqDTO.Item {
+
+        /**
+         * 商品原价（单），单位：分
+         *
+         * 对应 ProductSkuDO 的 price 字段
+         */
+        private Integer originalPrice;
+        /**
+         * 商品原价（总），单位：分
+         *
+         * = {@link #originalPrice} * {@link #getCount()}
+         */
+        private Integer totalOriginalPrice;
+        /**
+         * 商品级优惠（总），单位：分
+         *
+         * 例如说“限时折扣”：商品原价的 8 折；商品原价的减 50 元
+         */
+        private Integer totalPromotionPrice;
+        /**
+         * 最终购买金额（总），单位：分。
+         *
+         * = {@link #totalOriginalPrice}
+         * - {@link #totalPromotionPrice}
+         */
+        private Integer totalPresentPrice;
+        /**
+         * 最终购买金额（单），单位：分。
+         *
+         * = {@link #totalPresentPrice} / {@link #getCount()}
+         */
+        private Integer presentPrice;
+        /**
+         * 应付金额（总），单位：分
+         */
+        private Integer totalPayPrice;
+
+    }
+
+    /**
+     * 营销活动
+     */
+    @Data
+    public static class Promotion {
+
+        /**
+         * 营销编号
+         *
+         * 例如说：营销活动的编号、优惠劵的编号
+         */
+        private Long id;
+        /**
+         * 营销类型
+         *
+         * 枚举 {@link PromotionTypeEnum}
+         */
+        private Integer type;
+        /**
+         * 营销级别
+         *
+         * 枚举 {@link PromotionLevelEnum}
+         */
+        private Integer level;
+        /**
+         * 匹配的商品 SKU 数组
+         */
+        private List<Item> items;
+        /**
+         * 计算时的原价（总），单位：分
+         */
+        private Integer totalOriginalPrice;
+        /**
+         * 计算时的优惠（总），单位：分
+         */
+        private Integer totalPromotionPrice;
+        // TODO 芋艿：是否匹配，match ；不匹配的原因
+        // TODO 芋艿：描述
+
+        /**
+         * 匹配的商品 SKU
+         */
+        @Data
+        public static class Item {
+
+            /**
+             * 商品 SKU 编号
+             */
+            private Long skuId;
+            /**
+             * 计算时的原价（总），单位：分
+             */
+            private Integer totalOriginalPrice;
+            /**
+             * 计算时的优惠（总），单位：分
+             */
+            private Integer totalPromotionPrice;
+
+        }
+
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityTypeEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityTypeEnum.java
deleted file mode 100644
index 0413dba66..000000000
--- a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityTypeEnum.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.module.market.enums.activity;
-
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-
-import java.util.Arrays;
-
-/**
- * 促销活动类型枚举
- */
-public enum MarketActivityTypeEnum implements IntArrayValuable {
-
-    TIME_LIMITED_DISCOUNT(1, "限时折扣"),
-    FULL_PRIVILEGE(2, "满减送"),
-    ;
-
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MarketActivityTypeEnum::getValue).toArray();
-
-    /**
-     * 类型值
-     */
-    private final Integer value;
-    /**
-     * 类型名
-     */
-    private final String name;
-
-    MarketActivityTypeEnum(Integer value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int[] array() {
-        return ARRAYS;
-    }
-}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionLevelEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionLevelEnum.java
new file mode 100644
index 000000000..25e3f33c2
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionLevelEnum.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.market.enums.common;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 营销的级别枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum PromotionLevelEnum implements IntArrayValuable {
+
+    ORDER(1, "订单级"),
+    SKU(2, "商品级"),
+    ;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PromotionLevelEnum::getLevel).toArray();
+
+    /**
+     * 级别值
+     */
+    private final Integer level;
+    /**
+     * 类型名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java
new file mode 100644
index 000000000..6ac3d65ba
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.market.enums.common;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 营销类型枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum PromotionTypeEnum implements IntArrayValuable {
+
+    TIME_LIMITED_DISCOUNT(1, "限时折扣"),
+    FULL_PRIVILEGE(2, "满减送"),
+    ;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PromotionTypeEnum::getType).toArray();
+
+    /**
+     * 类型值
+     */
+    private final Integer type;
+    /**
+     * 类型名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java
index 3ae5cd679..f036da230 100644
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.market.controller.admin.activity.vo;
 
 import cn.iocoder.yudao.framework.common.validation.InEnum;
 import cn.iocoder.yudao.module.market.enums.activity.MarketActivityStatusEnum;
-import cn.iocoder.yudao.module.market.enums.activity.MarketActivityTypeEnum;
+import cn.iocoder.yudao.module.market.enums.common.PromotionTypeEnum;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -24,7 +24,7 @@ public class ActivityBaseVO {
 
     @ApiModelProperty(value = "活动类型", required = true)
     @NotNull(message = "活动类型不能为空")
-    @InEnum(MarketActivityTypeEnum.class)
+    @InEnum(PromotionTypeEnum.class)
     private Integer activityType;
 
     @ApiModelProperty(value = "活动状态", required = true)
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java
index 9543d8fee..9eefc7c0d 100644
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.market.controller.admin.activity.vo;
 
 import cn.iocoder.yudao.framework.common.validation.InEnum;
 import cn.iocoder.yudao.module.market.enums.activity.MarketActivityStatusEnum;
-import cn.iocoder.yudao.module.market.enums.activity.MarketActivityTypeEnum;
+import cn.iocoder.yudao.module.market.enums.common.PromotionTypeEnum;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -21,7 +21,7 @@ public class ActivityPageReqVO extends PageParam {
     private String title;
 
     @ApiModelProperty(value = "活动类型")
-    @InEnum(MarketActivityTypeEnum.class)
+    @InEnum(PromotionTypeEnum.class)
     private Integer activityType;
 
     @ApiModelProperty(value = "活动状态")
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index ae2cfbc7b..84c256138 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -110,6 +110,8 @@ public class TradeOrderDO extends BaseDO {
 
     // ========== 价格 + 支付基本信息 ==========
     // 价格文档 - 淘宝：https://open.taobao.com/docV3.htm?docId=108471&docType=1
+    // 价格文档 - 京东到家：https://openo2o.jddj.com/api/getApiDetail/182/4d1494c5e7ac4679bfdaaed950c5bc7f.htm
+    // 价格文档 - 有赞：https://doc.youzanyun.com/detail/API/0/906
 
 //  TODO  promotion_details(订单优惠信息明细，商品和订单级优惠一般都在里面)
 
@@ -118,7 +120,8 @@ public class TradeOrderDO extends BaseDO {
      *
      * 基于 {@link TradeOrderItemDO#getTotalOriginalPrice()} 求和
      */
-    private Integer skuOriginalPrice; // niu - goods_money；
+    // niu - goods_money；
+    private Integer skuOriginalPrice;
     /**
      * 商品优惠（总），单位：分
      *
@@ -130,11 +133,13 @@ public class TradeOrderDO extends BaseDO {
      *
      * 例如说：满减折扣；不包括优惠劵、商品优惠
      */
-    private Integer orderPromotionPrice; // niu - promotion_money；taobao - discount_fee（主订单优惠）
+    // niu - promotion_money；taobao - discount_fee（主订单优惠）
+    private Integer orderPromotionPrice;
     /**
      * 运费金额，单位：分
      */
-    private Integer deliveryPrice; // niu - delivery_money；taobao - post_fee（订单邮费）
+    // niu - delivery_money；taobao - post_fee（订单邮费）
+    private Integer deliveryPrice;
     // TODO 芋艿：taobao 的：trade.adjust_fee/order.adjust_fee（调整金额，如：卖家手动修改订单价格，官方数据修复等等）
     /**
      * 应付金额（总），单位：分
@@ -145,7 +150,8 @@ public class TradeOrderDO extends BaseDO {
      * - {@link #orderPromotionPrice}
      * - {@link #couponPrice}
      */
-    private Integer payPrice; // niu - pay_money；taobao - payment（主订单实付金额） | trade.total_fee（主订单应付金额，参考使用）；
+    // niu - pay_money；taobao - payment（主订单实付金额） | trade.total_fee（主订单应付金额，参考使用）；
+    private Integer payPrice;
     /**
      * 支付订单编号
      *
@@ -244,7 +250,8 @@ public class TradeOrderDO extends BaseDO {
     /**
      * 优惠劵减免金额，单位：分
      */
-    private Integer couponPrice; // niu - coupon_money；
+    // niu - coupon_money；
+    private Integer couponPrice;
 //    /**
 //     * 积分抵扣的金额，单位：分
 //     */
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
index 5796e2916..14e4de0f4 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
@@ -84,19 +84,22 @@ public class TradeOrderItemDO extends BaseDO {
      *
      * 对应 ProductSkuDO 的 price 字段
      */
-    private Integer originalPrice; // like - original_price；niu - costPrice
+    // like - original_price；niu - costPrice
+    private Integer originalPrice;
     /**
      * 商品原价（总），单位：分
      *
      * = {@link #originalPrice} * {@link #count}
      */
-    private Integer totalOriginalPrice; // like - total_price；niu - 暂无
+    // like - total_price；niu - 暂无
+    private Integer totalOriginalPrice;
     /**
      * 商品级优惠（总），单位：分
      *
      * 例如说“限时折扣”：商品原价的 8 折；商品原价的减 50 元
      */
-    private Integer totalPromotionPrice; // taobao - order.discount_fee（子订单商品优惠）
+    // taobao - order.discount_fee（子订单商品优惠）
+    private Integer totalPromotionPrice;
     /**
      * 最终购买金额（单），单位：分。
      *
@@ -109,12 +112,14 @@ public class TradeOrderItemDO extends BaseDO {
      * = {@link #totalOriginalPrice}
      * - {@link #totalPromotionPrice}
      */
-    private Integer totalPresentPrice; // like -  total_pay_price；niu - goods_money; taobao - order.payment（子订单实付金额，不算主订单分摊金额） | order.total_fee（子订单应付金额，参考使用）
+    // like -  total_pay_price；niu - goods_money; taobao - order.payment（子订单实付金额，不算主订单分摊金额） | order.total_fee（子订单应付金额，参考使用）
+    private Integer totalPresentPrice;
     // TODO 芋艿：part_mjz_discount(子订单分摊金额)；本质上，totalOriginalPrice - totalPayPrice
     /**
      * 应付金额（总），单位：分
      */
-    private Integer totalPayPrice; // taobao - divide_order_fee （分摊后子订单实付金额）；
+    // taobao - divide_order_fee （分摊后子订单实付金额）；
+    private Integer totalPayPrice;
 
     // ========== 营销基本信息 ==========
 //    /**

From 96fc2523482b0a04f9e59425c8cb663499b8db7e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 16 Aug 2022 09:17:46 +0800
Subject: [PATCH 32/56] =?UTF-8?q?mall=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/price/dto/PriceCalculateRespDTO.java  | 25 +++++++++++++------
 .../dal/dataobject/order/TradeOrderDO.java    | 12 ++++-----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java
index c6eb2d5e1..dc4f10a10 100644
--- a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/api/price/dto/PriceCalculateRespDTO.java
@@ -66,8 +66,8 @@ public class PriceCalculateRespDTO {
          * + {@link #deliveryPrice}
          * - {@link #skuPromotionPrice}
          * - {@link #orderPromotionPrice}
-         * - {@link #couponPrice} // TODO 芋艿：需要再考虑一下它
          */
+        //         * - {@link #couponPrice}  // TODO 芋艿：靠营销表记录
         private Integer payPrice;
 
         // ========== 营销基本信息 ==========
@@ -75,10 +75,12 @@ public class PriceCalculateRespDTO {
          * 优惠劵编号
          */
         private Long couponId;
-        /**
-         * 优惠劵减免金额，单位：分
-         */
-        private Integer couponPrice;
+//        /**
+//         * 优惠劵减免金额，单位：分
+//         *
+//         *   // TODO 芋艿：靠营销表记录
+//         */
+//        private Integer couponPrice;
 
     }
 
@@ -162,8 +164,17 @@ public class PriceCalculateRespDTO {
          * 计算时的优惠（总），单位：分
          */
         private Integer totalPromotionPrice;
-        // TODO 芋艿：是否匹配，match ；不匹配的原因
-        // TODO 芋艿：描述
+        /**
+         * 是否满足优惠条件
+         */
+        private Boolean meet;
+        /**
+         * 满足条件的提示
+         *
+         * 如果 {@link #meet} = true 满足，则提示“圣诞价:省 150.00 元”
+         * 如果 {@link #meet} = false 不满足，则提示“购满 85 元，可减 40 元”
+         */
+        private String meetTip;
 
         /**
          * 匹配的商品 SKU
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index 84c256138..77bdf66b0 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -148,9 +148,9 @@ public class TradeOrderDO extends BaseDO {
      * + {@link #deliveryPrice}
      * - {@link #skuPromotionPrice}
      * - {@link #orderPromotionPrice}
-     * - {@link #couponPrice}
      */
     // niu - pay_money；taobao - payment（主订单实付金额） | trade.total_fee（主订单应付金额，参考使用）；
+//     * - {@link #couponPrice}  // TODO 芋艿：靠营销表记录
     private Integer payPrice;
     /**
      * 支付订单编号
@@ -247,11 +247,11 @@ public class TradeOrderDO extends BaseDO {
      * 优惠劵编号
      */
     private Long couponId;
-    /**
-     * 优惠劵减免金额，单位：分
-     */
-    // niu - coupon_money；
-    private Integer couponPrice;
+//    /**
+//     * 优惠劵减免金额，单位：分  // TODO 芋艿：靠营销表记录
+//     */
+//    // niu - coupon_money；
+//    private Integer couponPrice;
 //    /**
 //     * 积分抵扣的金额，单位：分
 //     */

From 405bf497ef5ae3f80fd76db6428895c28dccfee8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 17 Aug 2022 01:10:13 +0800
Subject: [PATCH 33/56] =?UTF-8?q?mall=EF=BC=9A=E6=96=B0=E5=A2=9E=20discoun?=
 =?UTF-8?q?t=20=E9=99=90=E6=97=B6=E6=8A=98=E6=89=A3=E3=80=81reward=20?=
 =?UTF-8?q?=E6=BB=A1=E5=87=8F=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/MarketActivityStatusEnum.java    |  51 -----
 .../common/PromotionActivityStatusEnum.java   |  39 ++++
 .../common/PromotionConditionTypeEnum.java    |  37 ++++
 .../common/PromotionProductScopeEnum.java     |  38 ++++
 .../enums/common/PromotionTypeEnum.java       |   4 +-
 .../admin/MarketTestController.java           |  25 ---
 .../admin/activity/ActivityController.java    |  77 -------
 .../admin/activity/vo/ActivityBaseVO.java     |  59 ------
 .../activity/vo/ActivityCreateReqVO.java      |  17 --
 .../admin/activity/vo/ActivityPageReqVO.java  |  57 -----
 .../admin/activity/vo/ActivityRespVO.java     |  19 --
 .../activity/vo/ActivityUpdateReqVO.java      |  18 --
 .../admin/discount/package-info.java          |   4 +
 .../convert/activity/ActivityConvert.java     |  32 ---
 .../market/convert/discount/package-info.java |   4 +
 .../dal/dataobject/activity/ActivityDO.java   |  64 ------
 .../discount/DiscountActivityDO.java          |  55 +++++
 .../discount/DiscountProductDO.java           |  65 ++++++
 .../dataobject/reward/RewardActivityDO.java   | 116 +++++++++++
 .../dal/mysql/activity/ActivityMapper.java    |  35 ----
 .../dal/mysql/discount/package-info.java      |   4 +
 .../yudao/module/market/package-info.java     |   6 +-
 .../service/activity/ActivityService.java     |  62 ------
 .../service/activity/ActivityServiceImpl.java |  77 -------
 .../market/service/discount/package-info.java |   4 +
 .../activity/ActivityServiceImplTest.java     | 197 ------------------
 26 files changed, 371 insertions(+), 795 deletions(-)
 delete mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityStatusEnum.java
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionActivityStatusEnum.java
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionConditionTypeEnum.java
 create mode 100644 yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionProductScopeEnum.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/ActivityController.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityCreateReqVO.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityRespVO.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityUpdateReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/discount/package-info.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/activity/ActivityConvert.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/discount/package-info.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/activity/ActivityDO.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountActivityDO.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountProductDO.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/reward/RewardActivityDO.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/activity/ActivityMapper.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/discount/package-info.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityService.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImpl.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/discount/package-info.java
 delete mode 100644 yudao-module-mall/yudao-module-market-biz/src/test/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImplTest.java

diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityStatusEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityStatusEnum.java
deleted file mode 100644
index a02b0269c..000000000
--- a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/activity/MarketActivityStatusEnum.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.module.market.enums.activity;
-
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-
-import java.util.Arrays;
-
-/**
- * 促销活动状态枚举
- */
-public enum MarketActivityStatusEnum implements IntArrayValuable {
-
-    WAIT(10, "未开始"),
-    RUN(20, "进行中"),
-    END(30, "已结束"),
-    /**
-     * 1. WAIT、RUN、END 可以转换成 INVALID 状态。
-     * 2. INVALID 只可以转换成 DELETED 状态。
-     */
-    INVALID(40, "已撤销"),
-    DELETED(50, "已删除"),
-    ;
-
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(MarketActivityStatusEnum::getValue).toArray();
-
-    /**
-     * 状态值
-     */
-    private final Integer value;
-    /**
-     * 状态名
-     */
-    private final String name;
-
-    MarketActivityStatusEnum(Integer value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int[] array() {
-        return ARRAYS;
-    }
-}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionActivityStatusEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionActivityStatusEnum.java
new file mode 100644
index 000000000..9577841aa
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionActivityStatusEnum.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.market.enums.common;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 促销活动的状态枚举
+ *
+ * @author 芋道源码
+ */
+@AllArgsConstructor
+@Getter
+public enum PromotionActivityStatusEnum implements IntArrayValuable {
+
+    WAIT(10, "未开始"),
+    RUN(20, "进行中"),
+    END(30, "已结束"),
+    CLOSE(40, "已关闭");
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PromotionActivityStatusEnum::getStatus).toArray();
+
+    /**
+     * 状态值
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionConditionTypeEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionConditionTypeEnum.java
new file mode 100644
index 000000000..4df0e6957
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionConditionTypeEnum.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.market.enums.common;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 营销的条件类型枚举
+ *
+ * @author 芋道源码
+ */
+@AllArgsConstructor
+@Getter
+public enum PromotionConditionTypeEnum implements IntArrayValuable {
+
+    PRICE(10, "满 N 元"),
+    COUNT(20, "满 N 件");
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PromotionConditionTypeEnum::getType).toArray();
+
+    /**
+     * 类型值
+     */
+    private final Integer type;
+    /**
+     * 类型名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionProductScopeEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionProductScopeEnum.java
new file mode 100644
index 000000000..e1792ee67
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionProductScopeEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.market.enums.common;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 营销的商品范围枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum PromotionProductScopeEnum implements IntArrayValuable {
+
+    ALL(1, "全部商品参与"),
+    SPU(2, "指定商品参与"),
+    ;
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PromotionProductScopeEnum::getScope).toArray();
+
+    /**
+     * 范围值
+     */
+    private final Integer scope;
+    /**
+     * 范围名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java
index 6ac3d65ba..f3f5cc882 100644
--- a/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java
+++ b/yudao-module-mall/yudao-module-market-api/src/main/java/cn/iocoder/yudao/module/market/enums/common/PromotionTypeEnum.java
@@ -15,8 +15,8 @@ import java.util.Arrays;
 @AllArgsConstructor
 public enum PromotionTypeEnum implements IntArrayValuable {
 
-    TIME_LIMITED_DISCOUNT(1, "限时折扣"),
-    FULL_PRIVILEGE(2, "满减送"),
+    DISCOUNT(1, "限时折扣"),
+    REWARD(2, "满减送"),
     ;
 
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PromotionTypeEnum::getType).toArray();
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
deleted file mode 100644
index 49b83b6c9..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Api(tags = "管理后台 - 营销")
-@RestController
-@RequestMapping("/market/test")
-@Validated
-public class MarketTestController {
-
-    @GetMapping("/get")
-    @ApiOperation("获取 market 信息")
-    public CommonResult<String> get() {
-        return success("true");
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/ActivityController.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/ActivityController.java
deleted file mode 100644
index dac4211a6..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/ActivityController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin.activity;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.annotations.*;
-import javax.validation.*;
-import java.util.*;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import cn.iocoder.yudao.module.market.controller.admin.activity.vo.*;
-import cn.iocoder.yudao.module.market.dal.dataobject.activity.ActivityDO;
-import cn.iocoder.yudao.module.market.convert.activity.ActivityConvert;
-import cn.iocoder.yudao.module.market.service.activity.ActivityService;
-
-@Api(tags = "管理后台 - 促销活动")
-@RestController
-@RequestMapping("/market/activity")
-@Validated
-public class ActivityController {
-
-    @Resource
-    private ActivityService activityService;
-
-    @PostMapping("/create")
-    @ApiOperation("创建促销活动")
-    @PreAuthorize("@ss.hasPermission('market:activity:create')")
-    public CommonResult<Long> createActivity(@Valid @RequestBody ActivityCreateReqVO createReqVO) {
-        return success(activityService.createActivity(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新促销活动")
-    @PreAuthorize("@ss.hasPermission('market:activity:update')")
-    public CommonResult<Boolean> updateActivity(@Valid @RequestBody ActivityUpdateReqVO updateReqVO) {
-        activityService.updateActivity(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除促销活动")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('market:activity:delete')")
-    public CommonResult<Boolean> deleteActivity(@RequestParam("id") Long id) {
-        activityService.deleteActivity(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @ApiOperation("获得促销活动")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('market:activity:query')")
-    public CommonResult<ActivityRespVO> getActivity(@RequestParam("id") Long id) {
-        ActivityDO activity = activityService.getActivity(id);
-        return success(ActivityConvert.INSTANCE.convert(activity));
-    }
-
-    @GetMapping("/list")
-    @ApiOperation("获得促销活动列表")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    @PreAuthorize("@ss.hasPermission('market:activity:query')")
-    public CommonResult<List<ActivityRespVO>> getActivityList(@RequestParam("ids") Collection<Long> ids) {
-        List<ActivityDO> list = activityService.getActivityList(ids);
-        return success(ActivityConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @ApiOperation("获得促销活动分页")
-    @PreAuthorize("@ss.hasPermission('market:activity:query')")
-    public CommonResult<PageResult<ActivityRespVO>> getActivityPage(@Valid ActivityPageReqVO pageVO) {
-        PageResult<ActivityDO> pageResult = activityService.getActivityPage(pageVO);
-        return success(ActivityConvert.INSTANCE.convertPage(pageResult));
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java
deleted file mode 100644
index f036da230..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityBaseVO.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin.activity.vo;
-
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.market.enums.activity.MarketActivityStatusEnum;
-import cn.iocoder.yudao.module.market.enums.common.PromotionTypeEnum;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-/**
-* 促销活动 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
-@Data
-public class ActivityBaseVO {
-
-    @ApiModelProperty(value = "活动标题", required = true)
-    @NotNull(message = "活动标题不能为空")
-    private String title;
-
-    @ApiModelProperty(value = "活动类型", required = true)
-    @NotNull(message = "活动类型不能为空")
-    @InEnum(PromotionTypeEnum.class)
-    private Integer activityType;
-
-    @ApiModelProperty(value = "活动状态", required = true)
-    @NotNull(message = "活动状态不能为空")
-    @InEnum(MarketActivityStatusEnum.class)
-    private Integer status;
-
-    @ApiModelProperty(value = "开始时间", required = true)
-    @NotNull(message = "开始时间不能为空")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date startTime;
-
-    @ApiModelProperty(value = "结束时间", required = true)
-    @NotNull(message = "结束时间不能为空")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date endTime;
-
-    @ApiModelProperty(value = "失效时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date invalidTime;
-
-    @ApiModelProperty(value = "删除时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date deleteTime;
-
-    @ApiModelProperty(value = "限制折扣字符串，使用 JSON 序列化成字符串存储")
-    private String timeLimitedDiscount;
-
-    @ApiModelProperty(value = "限制折扣字符串，使用 JSON 序列化成字符串存储")
-    private String fullPrivilege;
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityCreateReqVO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityCreateReqVO.java
deleted file mode 100644
index 0ca112709..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityCreateReqVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin.activity.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
-
-/**
- * @author xia
- */
-@ApiModel("管理后台 - 促销活动创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ActivityCreateReqVO extends ActivityBaseVO {
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java
deleted file mode 100644
index 9eefc7c0d..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin.activity.vo;
-
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.market.enums.activity.MarketActivityStatusEnum;
-import cn.iocoder.yudao.module.market.enums.common.PromotionTypeEnum;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel("管理后台 - 促销活动分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ActivityPageReqVO extends PageParam {
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "活动类型")
-    @InEnum(PromotionTypeEnum.class)
-    private Integer activityType;
-
-    @ApiModelProperty(value = "活动状态")
-    @InEnum(MarketActivityStatusEnum.class)
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "开始时间")
-    private Date[] startTime;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "结束时间")
-    private Date[] endTime;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "失效时间")
-    private Date[] invalidTime;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "删除时间")
-    private Date[] deleteTime;
-
-    @ApiModelProperty(value = "限制折扣字符串，使用 JSON 序列化成字符串存储")
-    private String timeLimitedDiscount;
-
-    @ApiModelProperty(value = "限制折扣字符串，使用 JSON 序列化成字符串存储")
-    private String fullPrivilege;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityRespVO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityRespVO.java
deleted file mode 100644
index de7ca3af2..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityRespVO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin.activity.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-
-@ApiModel("管理后台 - 促销活动 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ActivityRespVO extends ActivityBaseVO {
-
-    @ApiModelProperty(value = "活动编号", required = true)
-    private Long id;
-
-    @ApiModelProperty(value = "创建时间", required = true)
-    private Date createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityUpdateReqVO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityUpdateReqVO.java
deleted file mode 100644
index 1db24f259..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityUpdateReqVO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin.activity.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
-
-@ApiModel("管理后台 - 促销活动更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ActivityUpdateReqVO extends ActivityBaseVO {
-
-    @ApiModelProperty(value = "活动编号", required = true)
-    @NotNull(message = "活动编号不能为空")
-    private Long id;
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/discount/package-info.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/discount/package-info.java
new file mode 100644
index 000000000..a3f145f26
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/discount/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 占位
+ */
+package cn.iocoder.yudao.module.market.controller.admin.discount;
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/activity/ActivityConvert.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/activity/ActivityConvert.java
deleted file mode 100644
index 64ba73975..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/activity/ActivityConvert.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.module.market.convert.activity;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.market.controller.admin.activity.vo.*;
-import cn.iocoder.yudao.module.market.dal.dataobject.activity.ActivityDO;
-
-/**
- * 促销活动 Convert
- *
- * @author 芋道源码
- */
-@Mapper
-public interface ActivityConvert {
-
-    ActivityConvert INSTANCE = Mappers.getMapper(ActivityConvert.class);
-
-    ActivityDO convert(ActivityCreateReqVO bean);
-
-    ActivityDO convert(ActivityUpdateReqVO bean);
-
-    ActivityRespVO convert(ActivityDO bean);
-
-    List<ActivityRespVO> convertList(List<ActivityDO> list);
-
-    PageResult<ActivityRespVO> convertPage(PageResult<ActivityDO> page);
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/discount/package-info.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/discount/package-info.java
new file mode 100644
index 000000000..787492406
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/discount/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 占位
+ */
+package cn.iocoder.yudao.module.market.convert.discount;
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/activity/ActivityDO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/activity/ActivityDO.java
deleted file mode 100644
index 13dcbf67c..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/activity/ActivityDO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.iocoder.yudao.module.market.dal.dataobject.activity;
-
-import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-
-/**
- * 促销活动 DO
- *
- * @author 芋道源码
- */
-@TableName("market_activity")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityDO extends BaseDO {
-
-    /**
-     * 活动编号
-     */
-    @TableId
-    private Long id;
-    /**
-     * 活动标题
-     */
-    private String title;
-    /**
-     * 活动类型MarketActivityTypeEnum
-     */
-    private Integer activityType;
-    /**
-     * 活动状态MarketActivityStatusEnum
-     */
-    private Integer status;
-    /**
-     * 开始时间
-     */
-    private Date startTime;
-    /**
-     * 结束时间
-     */
-    private Date endTime;
-    /**
-     * 失效时间
-     */
-    private Date invalidTime;
-    /**
-     * 删除时间
-     */
-    private Date deleteTime;
-    /**
-     * 限制折扣字符串，使用 JSON 序列化成字符串存储
-     */
-    private String timeLimitedDiscount;
-    /**
-     * 限制折扣字符串，使用 JSON 序列化成字符串存储
-     */
-    private String fullPrivilege;
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountActivityDO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountActivityDO.java
new file mode 100644
index 000000000..8780546f6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountActivityDO.java
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.market.dal.dataobject.discount;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.market.enums.common.PromotionActivityStatusEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 限时折扣活动 DO
+ *
+ * 一个活动下，可以有 {@link DiscountProductDO} 商品；
+ * 一个商品，在指定时间段内，只能属于一个活动；
+ *
+ * @author 芋道源码
+ */
+@TableName(value = "promotion_discount_activity", autoResultMap = true)
+@KeySequence("promotion_discount_activity_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DiscountActivityDO extends BaseDO {
+
+    /**
+     * 活动编号，主键自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 活动标题
+     */
+    private String name;
+    /**
+     * 状态
+     *
+     * 枚举 {@link PromotionActivityStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountProductDO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountProductDO.java
new file mode 100644
index 000000000..cd73a19a5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/discount/DiscountProductDO.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.market.dal.dataobject.discount;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 限时折扣商品 DO
+ *
+ * @author 芋道源码
+ */
+@TableName(value = "promotion_discount_product", autoResultMap = true)
+@KeySequence("promotion_discount_product_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DiscountProductDO extends BaseDO {
+
+    /**
+     * 编号，主键自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 限时折扣活动的编号
+     *
+     * 关联 {@link DiscountActivityDO#getId()}
+     */
+    private Long activityId;
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 ProductSpuDO 的 id 编号
+     */
+    private Long spuId;
+    /**
+     * 商品 SKU 编号
+     *
+     * 关联 ProductSkuDO 的 id 编号
+     */
+    private Long skuId;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 销售价格，单位：分
+     *
+     * 冗余 ProductSkuDO 的 price 字段
+     */
+    private Integer originalPrice;
+    /**
+     * 优惠价格，单位：分
+     */
+    private Integer promotionPrice;
+
+}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/reward/RewardActivityDO.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/reward/RewardActivityDO.java
new file mode 100644
index 000000000..85cd8c955
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/dataobject/reward/RewardActivityDO.java
@@ -0,0 +1,116 @@
+package cn.iocoder.yudao.module.market.dal.dataobject.reward;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.market.enums.common.PromotionActivityStatusEnum;
+import cn.iocoder.yudao.module.market.enums.common.PromotionConditionTypeEnum;
+import cn.iocoder.yudao.module.market.enums.common.PromotionProductScopeEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 满减送活动 DO
+ *
+ * @author 芋道源码
+ */
+@TableName(value = "promotion_reward_activity", autoResultMap = true)
+@KeySequence("promotion_reward_activity_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RewardActivityDO extends BaseDO {
+
+    /**
+     * 活动编号，主键自增
+     */
+    @TableId
+    private Long id;
+    /**
+     * 活动标题
+     */
+    private String name;
+    /**
+     * 状态
+     *
+     * 枚举 {@link PromotionActivityStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 条件类型
+     *
+     * 枚举 {@link PromotionConditionTypeEnum}
+     */
+    private Integer conditionType;
+    /**
+     * 商品范围
+     *
+     * 枚举 {@link PromotionProductScopeEnum}
+     */
+    private Integer productScope;
+    /**
+     * 商品 SPU 编号的数组
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Long> spuIds;
+    /**
+     * 优惠规则的数组
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Rule> rules;
+
+    /**
+     * 优惠规则
+     */
+    @Data
+    public static class Rule {
+
+        /**
+         * 优惠门槛
+         *
+         * 1. 满 N 元，单位：分
+         * 2. 满 N 件
+         */
+        private Integer limit;
+        /**
+         * 优惠价格，单位：分
+         */
+        private Integer promotionPrice;
+        /**
+         * 是否包邮
+         */
+        private Boolean freeDelivery;
+        /**
+         * 赠送的积分
+         */
+        private Integer integral;
+        /**
+         * 赠送的优惠劵编号的数组
+         */
+        private List<Long> couponIds;
+        /**
+         * 赠送的优惠卷数量的数组
+         */
+        private List<Integer> couponCounts;
+
+    }
+
+
+}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/activity/ActivityMapper.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/activity/ActivityMapper.java
deleted file mode 100644
index feb3fb122..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/activity/ActivityMapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.market.dal.mysql.activity;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.market.dal.dataobject.activity.ActivityDO;
-import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.market.controller.admin.activity.vo.*;
-
-/**
- * 促销活动 Mapper
- *
- * @author 芋道源码
- */
-@Mapper
-public interface ActivityMapper extends BaseMapperX<ActivityDO> {
-
-    default PageResult<ActivityDO> selectPage(ActivityPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ActivityDO>()
-                .eqIfPresent(ActivityDO::getTitle, reqVO.getTitle())
-                .eqIfPresent(ActivityDO::getActivityType, reqVO.getActivityType())
-                .eqIfPresent(ActivityDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(ActivityDO::getStartTime, reqVO.getStartTime())
-                .betweenIfPresent(ActivityDO::getEndTime, reqVO.getEndTime())
-                .betweenIfPresent(ActivityDO::getInvalidTime, reqVO.getInvalidTime())
-                .betweenIfPresent(ActivityDO::getDeleteTime, reqVO.getDeleteTime())
-                .eqIfPresent(ActivityDO::getTimeLimitedDiscount, reqVO.getTimeLimitedDiscount())
-                .eqIfPresent(ActivityDO::getFullPrivilege, reqVO.getFullPrivilege())
-                .betweenIfPresent(ActivityDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ActivityDO::getId));
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/discount/package-info.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/discount/package-info.java
new file mode 100644
index 000000000..f8de42cd9
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/discount/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 占位
+ */
+package cn.iocoder.yudao.module.market.dal.mysql.discount;
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
index 2efde4ec7..92b9c698d 100644
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
@@ -1,8 +1,8 @@
 /**
- * market 模块，我们放营销业务。
+ * promotion 模块，我们放营销业务。
  * 例如说：营销活动、banner、优惠券等等
  *
- * 1. Controller URL：以 /market/ 开头，避免和其它 Module 冲突
- * 2. DataObject 表名：以 market_ 开头，方便在数据库中区分
+ * 1. Controller URL：以 /promotion/ 开头，避免和其它 Module 冲突
+ * 2. DataObject 表名：以 promotion_ 开头，方便在数据库中区分
  */
 package cn.iocoder.yudao.module.market;
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityService.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityService.java
deleted file mode 100644
index 1d5e27857..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package cn.iocoder.yudao.module.market.service.activity;
-
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.market.controller.admin.activity.vo.*;
-import cn.iocoder.yudao.module.market.dal.dataobject.activity.ActivityDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-/**
- * 促销活动 Service 接口
- *
- * @author 芋道源码
- */
-public interface ActivityService {
-
-    /**
-     * 创建促销活动
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createActivity(@Valid ActivityCreateReqVO createReqVO);
-
-    /**
-     * 更新促销活动
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateActivity(@Valid ActivityUpdateReqVO updateReqVO);
-
-    /**
-     * 删除促销活动
-     *
-     * @param id 编号
-     */
-    void deleteActivity(Long id);
-
-    /**
-     * 获得促销活动
-     *
-     * @param id 编号
-     * @return 促销活动
-     */
-    ActivityDO getActivity(Long id);
-
-    /**
-     * 获得促销活动列表
-     *
-     * @param ids 编号
-     * @return 促销活动列表
-     */
-    List<ActivityDO> getActivityList(Collection<Long> ids);
-
-    /**
-     * 获得促销活动分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 促销活动分页
-     */
-    PageResult<ActivityDO> getActivityPage(ActivityPageReqVO pageReqVO);
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImpl.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImpl.java
deleted file mode 100644
index 57bb9af53..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package cn.iocoder.yudao.module.market.service.activity;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.*;
-import cn.iocoder.yudao.module.market.controller.admin.activity.vo.*;
-import cn.iocoder.yudao.module.market.dal.dataobject.activity.ActivityDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import cn.iocoder.yudao.module.market.convert.activity.ActivityConvert;
-import cn.iocoder.yudao.module.market.dal.mysql.activity.ActivityMapper;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.market.enums.ErrorCodeConstants.*;
-
-/**
- * 促销活动 Service 实现类
- *
- * @author 芋道源码
- */
-@Service
-@Validated
-public class ActivityServiceImpl implements ActivityService {
-
-    @Resource
-    private ActivityMapper activityMapper;
-
-    @Override
-    public Long createActivity(ActivityCreateReqVO createReqVO) {
-        // 插入
-        ActivityDO activity = ActivityConvert.INSTANCE.convert(createReqVO);
-        activityMapper.insert(activity);
-        // 返回
-        return activity.getId();
-    }
-
-    @Override
-    public void updateActivity(ActivityUpdateReqVO updateReqVO) {
-        // 校验存在
-        this.validateActivityExists(updateReqVO.getId());
-        // 更新
-        ActivityDO updateObj = ActivityConvert.INSTANCE.convert(updateReqVO);
-        activityMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteActivity(Long id) {
-        // 校验存在
-        this.validateActivityExists(id);
-        // 删除
-        activityMapper.deleteById(id);
-    }
-
-    private void validateActivityExists(Long id) {
-        if (activityMapper.selectById(id) == null) {
-            throw exception(ACTIVITY_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public ActivityDO getActivity(Long id) {
-        return activityMapper.selectById(id);
-    }
-
-    @Override
-    public List<ActivityDO> getActivityList(Collection<Long> ids) {
-        return activityMapper.selectBatchIds(ids);
-    }
-
-    @Override
-    public PageResult<ActivityDO> getActivityPage(ActivityPageReqVO pageReqVO) {
-        return activityMapper.selectPage(pageReqVO);
-    }
-
-}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/discount/package-info.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/discount/package-info.java
new file mode 100644
index 000000000..f52febd44
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/discount/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * TODO 占位
+ */
+package cn.iocoder.yudao.module.market.service.discount;
diff --git a/yudao-module-mall/yudao-module-market-biz/src/test/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImplTest.java b/yudao-module-mall/yudao-module-market-biz/src/test/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImplTest.java
deleted file mode 100644
index b292251a4..000000000
--- a/yudao-module-mall/yudao-module-market-biz/src/test/java/cn/iocoder/yudao/module/market/service/activity/ActivityServiceImplTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package cn.iocoder.yudao.module.market.service.activity;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import javax.annotation.Resource;
-
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.iocoder.yudao.module.market.controller.admin.activity.vo.*;
-import cn.iocoder.yudao.module.market.dal.dataobject.activity.ActivityDO;
-import cn.iocoder.yudao.module.market.dal.mysql.activity.ActivityMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import org.springframework.context.annotation.Import;
-
-import static cn.iocoder.yudao.module.market.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
-* {@link ActivityServiceImpl} 的单元测试类
-*
-* @author 芋道源码
-*/
-@Import(ActivityServiceImpl.class)
-public class ActivityServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private ActivityServiceImpl activityService;
-
-    @Resource
-    private ActivityMapper activityMapper;
-
-    @Test
-    public void testCreateActivity_success() {
-        // 准备参数
-        ActivityCreateReqVO reqVO = randomPojo(ActivityCreateReqVO.class);
-
-        // 调用
-        Long activityId = activityService.createActivity(reqVO);
-        // 断言
-        assertNotNull(activityId);
-        // 校验记录的属性是否正确
-        ActivityDO activity = activityMapper.selectById(activityId);
-        assertPojoEquals(reqVO, activity);
-    }
-
-    @Test
-    public void testUpdateActivity_success() {
-        // mock 数据
-        ActivityDO dbActivity = randomPojo(ActivityDO.class);
-        activityMapper.insert(dbActivity);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        ActivityUpdateReqVO reqVO = randomPojo(ActivityUpdateReqVO.class, o -> {
-            o.setId(dbActivity.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        activityService.updateActivity(reqVO);
-        // 校验是否更新正确
-        ActivityDO activity = activityMapper.selectById(reqVO.getId()); // 获取最新的
-        assertPojoEquals(reqVO, activity);
-    }
-
-    @Test
-    public void testUpdateActivity_notExists() {
-        // 准备参数
-        ActivityUpdateReqVO reqVO = randomPojo(ActivityUpdateReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> activityService.updateActivity(reqVO), ACTIVITY_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteActivity_success() {
-        // mock 数据
-        ActivityDO dbActivity = randomPojo(ActivityDO.class);
-        activityMapper.insert(dbActivity);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbActivity.getId();
-
-        // 调用
-        activityService.deleteActivity(id);
-       // 校验数据不存在了
-       assertNull(activityMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteActivity_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> activityService.deleteActivity(id), ACTIVITY_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetActivityPage() {
-       // mock 数据
-       ActivityDO dbActivity = randomPojo(ActivityDO.class, o -> { // 等会查询到
-           o.setTitle(null);
-           o.setActivityType(null);
-           o.setStatus(null);
-           o.setStartTime(null);
-           o.setEndTime(null);
-           o.setInvalidTime(null);
-           o.setDeleteTime(null);
-           o.setTimeLimitedDiscount(null);
-           o.setFullPrivilege(null);
-           o.setCreateTime(null);
-       });
-       activityMapper.insert(dbActivity);
-       // 测试 title 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setTitle(null)));
-       // 测试 activityType 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setActivityType(null)));
-       // 测试 status 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setStatus(null)));
-       // 测试 startTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setStartTime(null)));
-       // 测试 endTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setEndTime(null)));
-       // 测试 invalidTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setInvalidTime(null)));
-       // 测试 deleteTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setDeleteTime(null)));
-       // 测试 timeLimitedDiscount 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setTimeLimitedDiscount(null)));
-       // 测试 fullPrivilege 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setFullPrivilege(null)));
-       // 测试 createTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setCreateTime(null)));
-       // 准备参数
-       ActivityPageReqVO reqVO = new ActivityPageReqVO();
-       reqVO.setTitle(null);
-       reqVO.setActivityType(null);
-       reqVO.setStatus(null);
-       reqVO.setStartTime(null);
-       reqVO.setEndTime(null);
-       reqVO.setInvalidTime(null);
-       reqVO.setDeleteTime(null);
-       reqVO.setTimeLimitedDiscount(null);
-       reqVO.setFullPrivilege(null);
-       reqVO.setCreateTime(null);
-
-       // 调用
-       PageResult<ActivityDO> pageResult = activityService.getActivityPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbActivity, pageResult.getList().get(0));
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetActivityList() {
-       // mock 数据
-       ActivityDO dbActivity = randomPojo(ActivityDO.class, o -> { // 等会查询到
-           o.setTitle(null);
-           o.setActivityType(null);
-           o.setStatus(null);
-           o.setStartTime(null);
-           o.setEndTime(null);
-           o.setInvalidTime(null);
-           o.setDeleteTime(null);
-           o.setTimeLimitedDiscount(null);
-           o.setFullPrivilege(null);
-           o.setCreateTime(null);
-       });
-       activityMapper.insert(dbActivity);
-       // 测试 title 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setTitle(null)));
-       // 测试 activityType 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setActivityType(null)));
-       // 测试 status 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setStatus(null)));
-       // 测试 startTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setStartTime(null)));
-       // 测试 endTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setEndTime(null)));
-       // 测试 invalidTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setInvalidTime(null)));
-       // 测试 deleteTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setDeleteTime(null)));
-       // 测试 timeLimitedDiscount 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setTimeLimitedDiscount(null)));
-       // 测试 fullPrivilege 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setFullPrivilege(null)));
-       // 测试 createTime 不匹配
-       activityMapper.insert(cloneIgnoreId(dbActivity, o -> o.setCreateTime(null)));
-    }
-
-}

From 07e5e1b59f6dc19315f7092fa996777afb9472b8 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Thu, 18 Aug 2022 22:38:51 +0800
Subject: [PATCH 34/56] =?UTF-8?q?feature(=E7=AE=A1=E7=90=86=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0):=20=E5=95=86=E5=93=81=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mall/product/spu/index.vue      | 718 +++++++++++-------
 .../src/views/mall/product/spu/save.vue       | 417 ++++++++++
 2 files changed, 869 insertions(+), 266 deletions(-)
 create mode 100644 yudao-ui-admin/src/views/mall/product/spu/save.vue

diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 5f5ca6d49..7b66f1f05 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -1,36 +1,81 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="商品名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入商品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="卖点" prop="sellPoint">
-        <el-input v-model="queryParams.sellPoint" placeholder="请输入卖点" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.sellPoint"
+          placeholder="请输入卖点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="分类id" prop="categoryId">
-        <el-input v-model="queryParams.categoryId" placeholder="请输入分类id" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.categoryId"
+          placeholder="请输入分类id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="价格(分)" prop="price">
-        <el-input v-model="queryParams.price" placeholder="请输入价格 单位使用：分" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入价格 单位使用：分"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="库存数量" prop="quantity">
-        <el-input v-model="queryParams.quantity" placeholder="请输入库存数量" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入库存数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择上下架状态" clearable size="small">
-          <el-option label="请选择字典生成" value=""/>
-          <el-option label="上架" value="0"/>
-          <el-option label="下架" value="1"/>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择上下架状态"
+          clearable
+          size="small"
+        >
+          <el-option label="请选择字典生成" value="" />
+          <el-option label="上架" value="0" />
+          <el-option label="下架" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+        <el-date-picker
+          v-model="dateRangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -38,95 +83,150 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['product:spu:create']">新增
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['product:spu:create']"
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   :loading="exportLoading"
-                   v-hasPermi="['product:spu:export']">导出
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['product:spu:export']"
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="主键" align="center" prop="id"/>
-      <el-table-column label="商品名称" align="center" prop="name"/>
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="商品名称" align="center" prop="name" />
       <!--      <el-table-column label="卖点" align="center" prop="sellPoint"/>-->
       <!--      <el-table-column label="描述" align="center" prop="description"/>-->
-      <el-table-column label="分类id" align="center" prop="categoryId"/>
+      <el-table-column label="分类id" align="center" prop="categoryId" />
       <el-table-column label="商品主图地址" align="center" prop="picUrls">
         <template slot-scope="scope">
-          <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/>
+          <img
+            v-if="scope.row.picUrls"
+            :src="scope.row.picUrls[0]"
+            alt="分类图片"
+            class="img-height"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="排序字段" align="center" prop="sort"/>
-      <el-table-column label="点赞初始人数" align="center" prop="likeCount"/>
-      <el-table-column label="价格 (分)" align="center" prop="price"/>
-      <el-table-column label="库存数量" align="center" prop="quantity"/>
+      <el-table-column label="排序字段" align="center" prop="sort" />
+      <el-table-column label="点赞初始人数" align="center" prop="likeCount" />
+      <el-table-column label="价格 (分)" align="center" prop="price" />
+      <el-table-column label="库存数量" align="center" prop="quantity" />
       <!--      <el-table-column label="状态" align="center" prop="status"/>-->
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['product:spu:update']">修改
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:spu:update']"
+            >修改
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['product:spu:delete']">删除
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:spu:delete']"
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
+
+<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body >
+  <save @closeDialog="open = false"/>
+</el-dialog>
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+    <!-- <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="商品名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入商品名称"/>
+          <el-input v-model="form.name" placeholder="请输入商品名称" />
         </el-form-item>
         <el-form-item label="卖点" prop="sellPoint">
-          <el-input v-model="form.sellPoint" placeholder="请输入卖点"/>
+          <el-input v-model="form.sellPoint" placeholder="请输入卖点" />
         </el-form-item>
         <el-form-item label="描述">
-          <editor v-model="form.description" :min-height="192"/>
+          <editor v-model="form.description" :min-height="192" />
         </el-form-item>
         <el-form-item label="分类id" prop="categoryIds">
           <el-cascader
-              v-model="form.categoryIds"
-              placeholder="请输入分类id"
-              style="width: 100%"
-              :options="categoryList"
-              :props="propName"
-              clearable></el-cascader>
+            v-model="form.categoryIds"
+            placeholder="请输入分类id"
+            style="width: 100%"
+            :options="categoryList"
+            :props="propName"
+            clearable
+          ></el-cascader>
         </el-form-item>
         <el-form-item label="商品主图地址" prop="picUrls">
-          <ImageUpload v-model="form.picUrls" :limit="10"/>
+          <ImageUpload v-model="form.picUrls" :limit="10" />
         </el-form-item>
         <el-form-item label="商品规格">
           <el-button size="mini" @click="shopTagInput()">添加规格</el-button>
           <div v-for="(tag, tagIndex) in skuTags" :key="tagIndex">
             <span>{{ tag.name }}</span>
-            <el-button style="margin-left: 10px" class="button-new-tag" type="text" icon="el-icon-delete"
-                       @click="removeTag(tagIndex)">删除
+            <el-button
+              style="margin-left: 10px"
+              class="button-new-tag"
+              type="text"
+              icon="el-icon-delete"
+              @click="removeTag(tagIndex)"
+              >删除
             </el-button>
-            <br/>
+            <br />
             <el-tag
-                v-for="(tagItem, tagItemIndex) in tag.selectValues"
-                :key="tagItem"
-                style="margin-right: 10px"
-                :disable-transitions="false">
+              v-for="(tagItem, tagItemIndex) in tag.selectValues"
+              :key="tagItemIndex"
+              style="margin-right: 10px"
+              :disable-transitions="false"
+            >
               {{ tagItem }}
-            </el-tag>
+            </el-tag> -->
             <!--            <el-input-->
             <!--              class="input-new-tag"-->
             <!--              v-if="tagItemInputs[tagIndex] && tagItemInputs[tagIndex].visible"-->
@@ -136,134 +236,178 @@
             <!--              @keyup.enter.native="handleInputConfirm(tagIndex)"-->
             <!--              @blur="handleInputConfirm(tagIndex)">-->
             <!--            </el-input>-->
-          </div>
+          <!-- </div>
         </el-form-item>
         <el-form-item label="规格名" v-show="isShowTagInput">
           <el-col :span="8">
-            <el-select v-model="addTagInput.name" filterable allow-create default-first-option placeholder="请选择"
-                       @change="handleTagClick">
+            <el-select
+              v-model="addTagInput.name"
+              filterable
+              allow-create
+              default-first-option
+              placeholder="请选择"
+              @change="handleTagClick"
+            >
               <el-option
-                  v-for="item in unUseTags"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name">
+                v-for="item in unUseTags"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+              >
               </el-option>
             </el-select>
           </el-col>
         </el-form-item>
         <el-form-item label="规格值" v-show="isShowTagInput">
           <el-col :span="8">
-            <el-select v-model="addTagInput.selectValues" multiple filterable allow-create default-first-option
-                       placeholder="请选择">
+            <el-select
+              v-model="addTagInput.selectValues"
+              multiple
+              filterable
+              allow-create
+              default-first-option
+              placeholder="请选择"
+            >
               <el-option
-                  v-for="item in dbTagValues"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name">
+                v-for="item in dbTagValues"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+              >
               </el-option>
             </el-select>
           </el-col>
         </el-form-item>
         <el-form-item>
-          <el-button size="mini" type="primary" @click="addTag()" v-show="isShowTagInput">确定</el-button>
-          <el-button size="mini" @click="hideTagInput()" v-show="isShowTagInput">取消</el-button>
+          <el-button
+            size="mini"
+            type="primary"
+            @click="addTag()"
+            v-show="isShowTagInput"
+            >确定</el-button
+          >
+          <el-button size="mini" @click="hideTagInput()" v-show="isShowTagInput"
+            >取消</el-button
+          >
         </el-form-item>
-        <el-form-item v-if="form.skus.length>0">
+        <el-form-item v-if="form.skus.length > 0">
           <el-table
-              :data="form.skus"
-              border
-              style="width: 100%; margin-top: 20px"
-              :span-method="tableSpanMethod">
-            <el-table-column v-for="(leftTitle, index) in skuTags" :key="index" :label="leftTitle.name">
+            :data="form.skus"
+            border
+            style="width: 100%; margin-top: 20px"
+            :span-method="tableSpanMethod"
+          >
+            <el-table-column
+              v-for="(leftTitle, index) in skuTags"
+              :key="index"
+              :label="leftTitle.name"
+            >
               <template slot-scope="scope">
                 {{ scope.row.propertyChildNames[index] }}
               </template>
             </el-table-column>
-            <el-table-column v-if="skuTags.length"
-                             prop="picUrl"
-                             label="sku图片"
-                             width="180">
+            <el-table-column
+              v-if="skuTags.length"
+              prop="picUrl"
+              label="sku图片"
+              width="180"
+            >
               <template slot-scope="scope">
                 <ImageUpload v-model="scope.row.picUrl" :limit="1">
                 </ImageUpload>
               </template>
             </el-table-column>
             <el-table-column
-                prop="prodName"
-                label="条形码"
-                width="250" v-if="skuTags.length">
+              prop="prodName"
+              label="条形码"
+              width="250"
+              v-if="skuTags.length"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.barCode" type="textarea" :disabled="scope.row.status==1"></el-input>
+                <el-input
+                  v-model="scope.row.barCode"
+                  type="textarea"
+                  :disabled="scope.row.status == 1"
+                ></el-input>
               </template>
             </el-table-column>
-            <el-table-column
-                prop="price"
-                label="销售价">
+            <el-table-column prop="price" label="销售价">
               <template slot-scope="scope">
                 <el-input-number
-                    size="small"
-                    v-model="scope.row.price"
-                    controls-position="right"
-                    :precision="2"
-                    :max="1000000000"
-                    :min="0.01"
-                    :disabled="scope.row.status==1">
+                  size="small"
+                  v-model="scope.row.price"
+                  controls-position="right"
+                  :precision="2"
+                  :max="1000000000"
+                  :min="0.01"
+                  :disabled="scope.row.status == 1"
+                >
                 </el-input-number>
               </template>
             </el-table-column>
-            <el-table-column
-                prop="oriPrice"
-                label="成本价">
+            <el-table-column prop="oriPrice" label="成本价">
               <template slot-scope="scope">
                 <el-input-number
-                    size="small"
-                    v-model="scope.row.costPrice"
-                    controls-position="right"
-                    :precision="2"
-                    :max="1000000000"
-                    :min="0.01"
-                    :disabled="scope.row.status==1">
+                  size="small"
+                  v-model="scope.row.costPrice"
+                  controls-position="right"
+                  :precision="2"
+                  :max="1000000000"
+                  :min="0.01"
+                  :disabled="scope.row.status == 1"
+                >
                 </el-input-number>
               </template>
             </el-table-column>
-            <el-table-column
-                prop="oriPrice"
-                label="原价">
+            <el-table-column prop="oriPrice" label="原价">
               <template slot-scope="scope">
                 <el-input-number
-                    size="small"
-                    v-model="scope.row.originalPrice"
-                    controls-position="right"
-                    :precision="2"
-                    :max="1000000000"
-                    :min="0.01"
-                    :disabled="scope.row.status==1">
+                  size="small"
+                  v-model="scope.row.originalPrice"
+                  controls-position="right"
+                  :precision="2"
+                  :max="1000000000"
+                  :min="0.01"
+                  :disabled="scope.row.status == 1"
+                >
                 </el-input-number>
               </template>
             </el-table-column>
-            <el-table-column
-                label="操作">
+            <el-table-column label="操作">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="changeSkuStatus(`${scope.$index}`)"
-                           v-if="scope.row.status===0">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="changeSkuStatus(`${scope.$index}`)"
+                  v-if="scope.row.status === 0"
+                >
                   正常
                 </el-button>
-                <el-button type="text" size="small" @click="changeSkuStatus(`${scope.$index}`)" v-else>已禁用</el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="changeSkuStatus(`${scope.$index}`)"
+                  v-else
+                  >已禁用</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </el-form-item>
         <el-form-item label="排序字段" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序字段"/>
+          <el-input v-model="form.sort" placeholder="请输入排序字段" />
         </el-form-item>
         <el-form-item label="点赞初始人数" prop="likeCount">
-          <el-input v-model="form.likeCount" placeholder="请输入点赞初始人数"/>
+          <el-input v-model="form.likeCount" placeholder="请输入点赞初始人数" />
         </el-form-item>
         <el-form-item label="价格 单位使用：分" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格 单位使用：分"/>
+          <el-input
+            v-model="form.price"
+            placeholder="请输入价格 单位使用：分"
+          />
         </el-form-item>
         <el-form-item label="库存数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入库存数量"/>
+          <el-input v-model="form.quantity" placeholder="请输入库存数量" />
         </el-form-item>
         <el-form-item label="上下架状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -276,19 +420,26 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
 <script>
-import {createSpu, updateSpu, deleteSpu, getSpu, getSpuPage, exportSpuExcel} from "@/api/mall/product/spu";
+import {
+  createSpu,
+  updateSpu,
+  deleteSpu,
+  getSpu,
+  getSpuPage,
+  exportSpuExcel,
+} from "@/api/mall/product/spu";
 import {
   createProductCategory,
   deleteProductCategory,
   exportCategoryExcel,
   getProductCategory,
   getProductCategoryList,
-  updateProductCategory
+  updateProductCategory,
 } from "@/api/mall/product/category";
 import {
   createProperty,
@@ -296,16 +447,19 @@ import {
   deleteProperty,
   getProperty,
   getPropertyPage,
-  exportPropertyExcel
+  exportPropertyExcel,
 } from "@/api/mall/product/property";
 
-import Editor from '@/components/Editor';
-import ImageUpload from '@/components/ImageUpload';
+import Editor from "@/components/Editor";
+import ImageUpload from "@/components/ImageUpload";
+import save  from "./save";
 
 export default {
   name: "Spu",
   components: {
-    Editor, ImageUpload
+    Editor,
+    ImageUpload,
+    save,
   },
   data() {
     return {
@@ -316,17 +470,17 @@ export default {
       propertyPageList: [],
       isShowTagInput: false,
       addTagInput: {
-        name: '',
-        propertyId: '',
+        name: "",
+        propertyId: "",
         selectValues: [],
         selectValueIds: [],
-        selectObect:[],
+        selectObect: [],
       },
       skuTags: [],
       propName: {
         checkStrictly: true,
-        label: 'name',
-        value: 'id'
+        label: "name",
+        value: "id",
       },
       categoryList: [],
       // 遮罩层
@@ -378,91 +532,101 @@ export default {
       },
       // 表单校验
       rules: {
-        sellPoint: [{required: true, message: "卖点不能为空", trigger: "blur"}],
-        description: [{required: true, message: "描述不能为空", trigger: "blur"}],
-        categoryIds: [{required: true, message: "分类id不能为空", trigger: "blur"}],
-        picUrls: [{required: true, message: "商品主图地址", trigger: "blur"}],
-        sort: [{required: true, message: "排序字段不能为空", trigger: "blur"}],
+        sellPoint: [
+          { required: true, message: "卖点不能为空", trigger: "blur" },
+        ],
+        description: [
+          { required: true, message: "描述不能为空", trigger: "blur" },
+        ],
+        categoryIds: [
+          { required: true, message: "分类id不能为空", trigger: "blur" },
+        ],
+        picUrls: [{ required: true, message: "商品主图地址", trigger: "blur" }],
+        sort: [
+          { required: true, message: "排序字段不能为空", trigger: "blur" },
+        ],
       },
       tagIndex: 0,
     };
   },
   created() {
-
     this.getList();
     this.getPropertyPageList();
     this.getListCategory();
   },
   methods: {
     getTableSpecData() {
-      return this.value
-    },
-    tableSpanMethod({row, column, rowIndex, columnIndex}) {
-
+      return this.value;
     },
+    tableSpanMethod({ row, column, rowIndex, columnIndex }) {},
     changeSkuStatus(tagIndex) {
       if (this.form.skus[tagIndex].status == 0) {
         this.form.skus[tagIndex].status = 1;
       } else {
         this.form.skus[tagIndex].status = 0;
       }
-
     },
     skuAddProdName() {
       if (this.initing) {
-        return
+        return;
       }
-      let skuList = []
+      let skuList = [];
       for (let i = 0; i < this.value.length; i++) {
-        const sku = Object.assign({}, this.value[i])
+        const sku = Object.assign({}, this.value[i]);
         if (!sku.properties) {
-          return
+          return;
         }
-        sku.skuName = ''
-        let properties = sku.properties.split(';')
+        sku.skuName = "";
+        let properties = sku.properties.split(";");
         for (const propertiesKey in properties) {
-          sku.skuName += properties[propertiesKey].split(':')[1] + ' '
+          sku.skuName += properties[propertiesKey].split(":")[1] + " ";
         }
-        sku.prodName = this.prodName + ' ' + sku.skuName
-        skuList.push(sku)
+        sku.prodName = this.prodName + " " + sku.skuName;
+        skuList.push(sku);
       }
-      this.$emit('input', skuList)
-    },
-    handleTagClose(tagIndex, tagItemIndex) {
-
+      this.$emit("input", skuList);
     },
+    handleTagClose(tagIndex, tagItemIndex) {},
     //确定添加sku规格
     addTag() {
-
       let skus = this.unUseTags.map(function (item, index) {
-        return item.name
+        return item.name;
       });
       let index = skus.indexOf(this.addTagInput.name);
 
       this.addTagInput.propertyId = this.unUseTags[index].id;
       for (let i = 0; i < this.addTagInput.selectValues.length; i++) {
-        for (let j = 0; j < this.unUseTags[index].propertyValueList.length; j++) {
-          if (this.addTagInput.selectValues[i] === this.unUseTags[index].propertyValueList[j].name) {
-            this.addTagInput.selectValueIds.push(this.unUseTags[index].propertyValueList[j].id)
+        for (
+          let j = 0;
+          j < this.unUseTags[index].propertyValueList.length;
+          j++
+        ) {
+          if (
+            this.addTagInput.selectValues[i] ===
+            this.unUseTags[index].propertyValueList[j].name
+          ) {
+            this.addTagInput.selectValueIds.push(
+              this.unUseTags[index].propertyValueList[j].id
+            );
             this.addTagInput.selectObect.push({
-              id:this.unUseTags[index].propertyValueList[j].id,
-              name:this.unUseTags[index].propertyValueList[j].name,
-            })
+              id: this.unUseTags[index].propertyValueList[j].id,
+              name: this.unUseTags[index].propertyValueList[j].name,
+            });
           }
         }
       }
-      let addTagInput = JSON.parse(JSON.stringify(this.addTagInput))
+      let addTagInput = JSON.parse(JSON.stringify(this.addTagInput));
       this.skuTags.push(addTagInput);
 
       // if (this.skuTags.length > 1) {
       this.skuTags = this.skuTags.sort((a, b) => a.propertyId - b.propertyId);
-      this.skuTags.forEach(function (item,index) {
-        item.selectObect = item.selectObect.sort((a, b) => a.id - b.id)
-      })
+      this.skuTags.forEach(function (item, index) {
+        item.selectObect = item.selectObect.sort((a, b) => a.id - b.id);
+      });
 
-      for (let i = 0; i <this.skuTags.length ; i++) {
-        let selectValueIds=[];
-        let selectValues=[];
+      for (let i = 0; i < this.skuTags.length; i++) {
+        let selectValueIds = [];
+        let selectValues = [];
         for (let j = 0; j < this.skuTags[i].selectObect.length; j++) {
           selectValueIds.push(this.skuTags[i].selectObect[j].id);
           selectValues.push(this.skuTags[i].selectObect[j].name);
@@ -489,17 +653,23 @@ export default {
         propertyNames.push(skuTags[i].name);
       }
 
-      let skuAll = sku1s.reduce((x, y) => {
-        let arr = [];
-        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
-        return arr;
-      }, [[]])
+      let skuAll = sku1s.reduce(
+        (x, y) => {
+          let arr = [];
+          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
+          return arr;
+        },
+        [[]]
+      );
 
-      let skuIdAll = skuIds.reduce((x, y) => {
-        let arr = [];
-        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
-        return arr;
-      }, [[]])
+      let skuIdAll = skuIds.reduce(
+        (x, y) => {
+          let arr = [];
+          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
+          return arr;
+        },
+        [[]]
+      );
 
       for (let i = 0; i < skuAll.length; i++) {
         let han = {
@@ -508,33 +678,32 @@ export default {
           propertyChildNames: skuAll[i],
           propertyChildIds: skuIdAll[i],
           properties: [],
-          picUrl: '',
-          costPrice: '',
-          originalPrice: '',
-          spuId: '',
-          prodName: '',
-          price: '',
-          barCode: '',
-          status: '0',
-        }
+          picUrl: "",
+          costPrice: "",
+          originalPrice: "",
+          spuId: "",
+          prodName: "",
+          price: "",
+          barCode: "",
+          status: "0",
+        };
         this.form.skus.push(han);
       }
-      this.form.skus.forEach(x => {
+      this.form.skus.forEach((x) => {
         x.properties = [];
         for (let i = 0; i < x.propertyIds.length; i++) {
           x.properties.push({
             propertyId: x.propertyIds[i],
-            valueId: x.propertyChildIds[i]
-          })
+            valueId: x.propertyChildIds[i],
+          });
         }
-      })
-
+      });
     },
     hideTagInput() {
       this.isShowTagInput = false;
       this.addTagInput = {
-        name: '',
-        propertyId: '',
+        name: "",
+        propertyId: "",
         selectValues: [],
         selectValueIds: [],
         selectObect: [],
@@ -542,12 +711,12 @@ export default {
     },
     shopTagInput() {
       if (this.unUseTags.length <= 0) {
-        return this.$message.error("规格已经添加完毕")
+        return this.$message.error("规格已经添加完毕");
       }
       this.isShowTagInput = true;
       this.addTagInput = {
-        name: '',
-        propertyId: '',
+        name: "",
+        propertyId: "",
         selectValues: [],
         selectValueIds: [],
         selectObect: [],
@@ -556,8 +725,8 @@ export default {
     //删除已选的规格
     removeTag(row) {
       let skus = this.allhistoryTags.map(function (item, index) {
-        return item.name
-      })
+        return item.name;
+      });
       let index = skus.indexOf(this.skuTags[row].name);
       this.unUseTags.push(this.allhistoryTags[index]);
       this.skuTags.splice(row, 1);
@@ -566,38 +735,37 @@ export default {
     handleTagClick(row) {
       for (let i = 0; i < this.propertyPageList.length; i++) {
         if (row == this.propertyPageList[i].name) {
-          this.dbTagValues = this.propertyPageList[i].propertyValueList
+          this.dbTagValues = this.propertyPageList[i].propertyValueList;
         }
       }
     },
     /** 查询规格 */
     getPropertyPageList() {
       // 执行查询
-      getPropertyPage().then(response => {
+      getPropertyPage().then((response) => {
         this.propertyPageList = response.data.list;
 
         this.unUseTags = this.propertyPageList.map(function (item, index) {
-          return item
-        })
+          return item;
+        });
         this.allhistoryTags = JSON.parse(JSON.stringify(this.unUseTags));
       });
     },
     /** 查询分类 */
     getListCategory() {
       // 执行查询
-      getProductCategoryList().then(response => {
+      getProductCategoryList().then((response) => {
         this.categoryList = this.handleTree(response.data, "id", "parentId");
-
       });
     },
     /** 查询列表 */
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      let params = { ...this.queryParams };
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
-      getSpuPage(params).then(response => {
+      getSpuPage(params).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -610,7 +778,6 @@ export default {
     },
     /** 表单重置 */
     reset() {
-
       this.form = {
         id: undefined,
         name: undefined,
@@ -652,7 +819,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getSpu(id).then(response => {
+      getSpu(id).then((response) => {
         let dataSpu = response.data;
         this.form = {
           id: dataSpu.id,
@@ -680,11 +847,15 @@ export default {
     },
     getDataHandle() {
       let that = this;
-      let productPropertyViews = JSON.parse(JSON.stringify(this.form.productPropertyViews));
-      productPropertyViews = productPropertyViews.sort((a, b) => a.propertyId - b.propertyId);
-      productPropertyViews.forEach(item => {
+      let productPropertyViews = JSON.parse(
+        JSON.stringify(this.form.productPropertyViews)
+      );
+      productPropertyViews = productPropertyViews.sort(
+        (a, b) => a.propertyId - b.propertyId
+      );
+      productPropertyViews.forEach((item) => {
         item.propertyValues = item.propertyValues.sort((a, b) => a.v1 - b.v1);
-      })
+      });
       let skuIds = [];
       for (let i = 0; i < productPropertyViews.length; i++) {
         let han = {
@@ -692,17 +863,21 @@ export default {
           propertyId: productPropertyViews[i].propertyId,
           selectValues: [],
           selectValueIds: [],
-        }
-        for (let j = 0; j < productPropertyViews[i].propertyValues.length; j++) {
+        };
+        for (
+          let j = 0;
+          j < productPropertyViews[i].propertyValues.length;
+          j++
+        ) {
           han.selectValues.push(productPropertyViews[i].propertyValues[j].v2);
           han.selectValueIds.push(productPropertyViews[i].propertyValues[j].v1);
         }
-        skuIds.push(han)
+        skuIds.push(han);
       }
       this.skuTags = skuIds;
       this.unUseTags = this.allhistoryTags.filter((v) =>
-          skuIds.every((val) => val.name != v.name)
-      )
+        skuIds.every((val) => val.name != v.name)
+      );
       this.getHandleTable();
     },
     getHandleTable() {
@@ -718,17 +893,23 @@ export default {
         propertyIds.push(skuTags[i].propertyId);
         propertyNames.push(skuTags[i].name);
       }
-      let skuAll = sku1s.reduce((x, y) => {
-        let arr = [];
-        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
-        return arr;
-      }, [[]])
+      let skuAll = sku1s.reduce(
+        (x, y) => {
+          let arr = [];
+          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
+          return arr;
+        },
+        [[]]
+      );
 
-      let skuIdAll = skuIds.reduce((x, y) => {
-        let arr = [];
-        x.forEach(m => y.forEach(y => arr.push(m.concat([y]))))
-        return arr;
-      }, [[]])
+      let skuIdAll = skuIds.reduce(
+        (x, y) => {
+          let arr = [];
+          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
+          return arr;
+        },
+        [[]]
+      );
 
       for (let i = 0; i < skuAll.length; i++) {
         let han = {
@@ -745,33 +926,32 @@ export default {
           price: this.form.skusList[i].price,
           barCode: this.form.skusList[i].barCode,
           status: this.form.skusList[i].status,
-        }
+        };
         this.form.skus.push(han);
       }
-      this.form.skus.forEach(x => {
+      this.form.skus.forEach((x) => {
         x.properties = [];
         for (let i = 0; i < x.propertyIds.length; i++) {
           x.properties.push({
             propertyId: x.propertyIds[i],
-            valueId: x.propertyChildIds[i]
-          })
+            valueId: x.propertyChildIds[i],
+          });
         }
-      })
-
+      });
     },
     /** 提交按钮 */
     submitForm() {
-
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
-        this.form.picUrls = this.form.picUrls.split(',');
-        this.form.categoryId = this.form.categoryIds[(this.form.categoryIds.length - 1)];
+        this.form.picUrls = this.form.picUrls.split(",");
+        this.form.categoryId =
+          this.form.categoryIds[this.form.categoryIds.length - 1];
         this.form.status = Number(this.form.status);
         // 修改的提交
         if (this.form.id != null) {
-          updateSpu(this.form).then(response => {
+          updateSpu(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -779,7 +959,7 @@ export default {
           return;
         }
         // 添加的提交
-        createSpu(this.form).then(response => {
+        createSpu(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -789,32 +969,38 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除商品spu编号为"' + id + '"的数据项?').then(function () {
-        return deleteSpu(id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
+      this.$modal
+        .confirm('是否确认删除商品spu编号为"' + id + '"的数据项?')
+        .then(function () {
+          return deleteSpu(id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = {...this.queryParams};
+      let params = { ...this.queryParams };
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行导出
-      this.$modal.confirm('是否确认导出所有商品spu数据项?').then(() => {
-        this.exportLoading = true;
-        return exportSpuExcel(params);
-      }).then(response => {
-        this.$download.excel(response, '商品spu.xls');
-        this.exportLoading = false;
-      }).catch(() => {
-      });
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有商品spu数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportSpuExcel(params);
+        })
+        .then((response) => {
+          this.$download.excel(response, "商品spu.xls");
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
 <style lang="scss">
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
new file mode 100644
index 000000000..93e42f79f
--- /dev/null
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -0,0 +1,417 @@
+<template>
+  <div class="container">
+    <el-dialog
+      title="请输入规格值，多个请换行"
+      :visible.sync="dialogForSpec"
+      append-to-body
+      width="400px"
+      @close="dialogForSpec = false; specValue = null"
+    >
+      <el-input
+        v-model="specValue"
+        type="textarea"
+        :autosize="{ minRows: 6, maxRows: 6}"
+        placeholder="请输入内容"
+      />
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogForSpec = false; specValue = null">取 消</el-button>
+        <el-button type="primary" @click="addSpecValue">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-tabs v-model="activeName"  class="tabs">
+      <!-- 基础设置 -->
+      <el-tab-pane label="基础设置" name="base">
+        <el-form ref="baseForm" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
+          <el-form-item label="商品名称" prop="name">
+            <el-input v-model="baseForm.name" placeholder="请输入商品名称"/>
+          </el-form-item>
+          <el-form-item label="卖点" prop="sellPoint">
+            <el-input v-model="baseForm.sellPoint" placeholder="请输入卖点"/>
+          </el-form-item>
+          <el-form-item label="分类id" prop="categoryIds">
+            <el-cascader
+              v-model="baseForm.categoryIds"
+              placeholder="请输入分类id"
+              style="width: 100%"
+              :options="categoryList"
+              :props="propName"
+              clearable
+            ></el-cascader>
+          </el-form-item>
+          <el-form-item label="商品主图" prop="picUrls">
+            <ImageUpload v-model="baseForm.picUrl" :limit="1" />
+          </el-form-item>
+           <el-form-item label="商品轮播图" prop="picUrl">
+            <ImageUpload v-model="baseForm.picUrls" :limit="10" />
+          </el-form-item>
+          <el-form-item label="排序字段" prop="sort">
+            <el-input v-model="baseForm.sort" placeholder="请输入排序字段"/>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+
+      <!-- 价格库存 -->
+      <el-tab-pane label="价格库存" name="rates" class="rates">
+        <el-form :model="ratesForm" :rules="rules.ratesForm">
+          <el-form-item label="商品规格">
+            <el-radio-group v-model="ratesForm.spec" @change="changeRadio">
+              <el-radio :label="0">单规格</el-radio>
+              <el-radio :label="1">多规格</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <!-- 动态添加规格属性 -->
+          <div v-show="ratesForm.spec === 1">
+            <div
+              v-for="(specs, index) in dynamicSpec"
+              :key="index"
+              class="dynamic-spec"
+            >
+              <!-- 删除按钮 -->
+              <el-button
+                type="danger"
+                icon="el-icon-delete"
+                circle
+                class="spec-delete"
+                @click="dynamicSpec.splice(index, 1)"
+              ></el-button>
+
+              <div class="spec-header">
+                规格项：
+                <el-input
+                  v-model="specs.spec_name"
+                  placeholder="请填写规格项"
+                  class="spec-name"
+                ></el-input>
+              </div>
+              <div class="spec-values">
+                <template v-for="(specsValue, i) in specs.spec_values">
+                  <el-input
+                    v-model="specs.spec_values[i]"
+                    class="spec-value"
+                    :key="specsValue"
+                  ></el-input>
+                </template>
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  circle
+                  @click="dialogForSpec = true; currentSpec = index"
+                ></el-button>
+              </div>
+            </div>
+            <el-button type="primary" @click="dynamicSpec.push({spec_values: []}); ratesForm.rates = []"
+            >添加规格项目
+            </el-button
+            >
+          </div>
+
+          <!-- 规格明细 -->
+          <el-form-item label="规格明细">
+            <el-table :data="ratesForm.rates" border style="width: 100%" ref="rates">
+              
+              <template v-if="ratesForm.spec == 1" > 
+                <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v=>v.spec_name != undefined)" :label="item.spec_name" >
+                <template slot-scope="scope">
+                  <el-input
+                    v-if="scope.row.spec"
+                    v-model="scope.row.spec[index]"
+                    disabled
+                  ></el-input>
+                </template>
+              </el-table-column>
+              </template>
+             
+              <el-table-column label="规格图片" width="120px">
+                <template slot-scope="scope">
+                  <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false" style="width: 100px; height: 50px" />
+                </template>
+              </el-table-column>
+              <el-table-column label="市场价(元)">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.marketPrice"
+                    type="number"
+                  ></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售价(元)" re>
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.price" type="number"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="成本价">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.costPrice"
+                    type="number"
+                  ></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="库存">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.stock" type="number"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="体积">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.volume" type="number"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="重量">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.weight" type="number"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="条码">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.barCode"></el-input>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+
+      <!-- 商品详情 -->
+      <el-tab-pane label="商品描述" name="third">
+        <editor v-model="baseForm.description" :min-height="400" />
+      </el-tab-pane>
+
+      <!-- 销售设置 -->
+      <el-tab-pane label="销售设置" name="fourth">
+        <el-form ref="baseForm" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
+        <el-form-item label="库存数量" prop="quantity">
+          <el-input v-model="baseForm.quantity" placeholder="请输入库存数量" />
+        </el-form-item>
+        <el-form-item label="上下架状态" prop="status">
+          <el-radio-group v-model="baseForm.status">
+            <el-radio label="0">上架</el-radio>
+            <el-radio label="1">下架</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
+
+  <div class="buttons">
+  <el-button type="info" round @click="cancel">取消</el-button>
+   <el-button type="success" round @click="submit">确认</el-button>
+  </div>
+
+  </div>
+</template>
+
+<script>
+import {
+  getProductCategoryList
+} from "@/api/mall/product/category";
+
+import Editor from "@/components/Editor";
+import ImageUpload from "@/components/ImageUpload";
+export default {
+  components: {
+    Editor,
+    ImageUpload
+  },
+  data() {
+    return {
+      activeName: "base",
+      propName: {
+        checkStrictly: true,
+        label: "name",
+        value: "id",
+      },
+      // 基础设置
+      baseForm: {
+        name: null,
+        sellPoint: null,
+        categoryIds: null,
+        sort: null,
+        description: null,
+        picUrl:null,
+        picUrls: [],
+        quantity: null
+      },
+      categoryList: [],
+
+      // 价格库存
+      ratesForm: {
+        spec: 0,
+        // 规格明细
+        rates: [{}]
+      },
+      dynamicSpec: [
+        // {
+        //   spec_id: 86,
+        //   spec_name: "颜色",
+        //   spec_values: [],
+        //   spec_value_ids: [225],
+        // },
+      ],
+      dialogForSpec: false,
+      specValue: null,
+      currentSpec: null,
+
+      // 表单校验
+      rules: {
+        description: [
+          {required: true, message: "描述不能为空", trigger: "blur"},
+        ],
+        categoryIds: [
+          {required: true, message: "分类id不能为空", trigger: "blur"},
+        ],
+        picUrls: [{required: true, message: "商品主图地址", trigger: "blur"}],
+        sort: [
+          {required: true, message: "排序字段不能为空", trigger: "blur"},
+        ],
+      },
+    };
+  },
+  created() {
+    this.getListCategory();
+  },
+  methods: {
+    changeRadio() {
+
+      this.$refs.rates.doLayout()
+      if(this.ratesForm.spec == 0){
+        this.ratesForm.rates = [{}]
+      }else{
+        this.ratesForm.rates = []
+        if(this.dynamicSpec.length > 0){
+          this.buildRatesFormRates()
+        }
+      }
+    },
+    // 构建规格明细笛卡尔积
+  buildRatesFormRates(){
+      let rates = [];
+      this.dynamicSpec.map(v=>v.spec_values)
+      .reduce((last, current) => {
+        const array = [];
+        last.forEach(par1 => {
+            current.forEach(par2 => {
+              let v 
+              if(par1 instanceof Array){
+                v = par1.concat(par2)
+              }else{
+                v = [par1, par2];
+              }
+              array.push(v)
+            });
+        });
+        return array;
+    })
+    .forEach(v=>{
+      rates.push({spec: v})
+    });
+    console.log(rates)
+    this.ratesForm.rates = rates
+  },
+    addSpecValue() {
+      this.dialogForSpec = false;
+      let specValue = this.dynamicSpec[this.currentSpec].spec_values
+        .concat(this.specValue.split(/[(\r\n)\r\n]+/))
+        .filter(v => v != "");
+      console.log(specValue)
+      this.dynamicSpec[this.currentSpec].spec_values = [...new Set(specValue)];
+      this.currentSpec = null;
+      this.buildRatesFormRates()
+    },
+    /** 查询分类 */
+    getListCategory() {
+      // 执行查询
+      getProductCategoryList().then((response) => {
+        this.categoryList = this.handleTree(response.data, "id", "parentId");
+      });
+    },
+    cancel(){
+        this.$emit("closeDialog");
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.spec-dialog {
+  width: 400px;
+  height: 300px;
+}
+
+.dynamic-spec {
+  background-color: #f2f2f2;
+  width: 85%;
+  margin: auto;
+  margin-bottom: 10px;
+
+  .spec-header {
+    padding: 30px;
+    padding-bottom: 0;
+
+    .spec-name {
+      display: inline;
+
+      input {
+        width: 30%;
+      }
+    }
+  }
+
+  .spec-values {
+    width: 84%;
+    padding: 25px;
+    margin: auto;
+
+    .spec-value {
+      display: inline-block;
+      margin-right: 10px;
+      margin-bottom: 10px;
+      width: 13%;
+
+    }
+  }
+
+  .spec-delete {
+    float: right;
+    margin-top: 10px;
+    margin-right: 10px;
+  }
+}
+
+.tabs{
+  height: 500px;
+  border-bottom: 2px solid #f2f2f2;
+  .el-tab-pane{
+    height: 445px;
+    overflow-y: auto;
+  }
+}
+
+// 库存价格图片样式修改
+.rates{
+.component-upload-image{
+  margin: auto;
+}
+.el-upload--picture-card{
+  width: 100px;
+  height: 50px;
+  line-height: 60px;
+  margin: auto;
+}
+.el-upload-list__item{
+   width: 100px !important;
+  height: 50px !important;
+}
+}
+.buttons{
+  margin-top: 20px;
+  height: 36px;
+  button{
+    float: right;
+    margin-left: 15px;
+  }
+}
+</style>

From 617573a59bf811605e5700813a197189158b629e Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Mon, 22 Aug 2022 20:43:12 +0800
Subject: [PATCH 35/56] =?UTF-8?q?feature(uniapp=E5=88=86=E7=B1=BB):=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/mall.sql                    |  24 ++
 .../admin/sku/vo/ProductSkuBaseVO.java        |  20 +-
 .../admin/spu/vo/ProductSpuBaseVO.java        |  85 +++++-
 .../property/ProductPropertyServiceImpl.java  |   4 +-
 .../service/sku/ProductSkuServiceImpl.java    |  12 +-
 .../src/views/mall/product/spu/index.vue      | 240 ---------------
 .../src/views/mall/product/spu/save.vue       | 280 ++++++++++--------
 7 files changed, 275 insertions(+), 390 deletions(-)

diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql
index e61b217e8..f6b3542e3 100644
--- a/sql/optional/mall/mall.sql
+++ b/sql/optional/mall/mall.sql
@@ -298,3 +298,27 @@ INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `
 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2027, 'Banner创建', 'market:banner:create', 3, 2, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2028, 'Banner更新', 'market:banner:update', 3, 3, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2029, 'Banner删除', 'market:banner:delete', 3, 4, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+
+alter table product_spu add `code` varchar(128) COMMENT '商品编码';
+alter table product_spu add  total_stock int COMMENT '总库存';
+alter table product_spu add  warn_stock int COMMENT '预警预存';
+alter table product_spu add  show_stock int COMMENT '是否展示库存';
+alter table product_spu add  sales_count int COMMENT '商品销量';
+alter table product_spu add  virtual_sales_count int COMMENT '虚拟销量';
+alter table product_spu add  click_count int COMMENT '商品点击量';
+alter table product_spu add  banner_url  varchar(128) COMMENT '主图地址';
+alter table product_spu add  spec_type int COMMENT '规格类型';
+alter table product_spu add  brand_id int COMMENT '商品品牌编号';
+alter table product_spu add  video_url varchar(128) COMMENT '商品视频';
+alter table product_spu add  min_price int COMMENT '最小价格，单位使用：分';
+alter table product_spu add  max_price int COMMENT '最大价格，单位使用：分';
+alter table product_spu add  market_price int COMMENT '市场价，单位使用：分';
+
+
+alter table product_sku add `name` varchar(128) COMMENT '商品 SKU 名字';
+alter table product_sku add `stock` int COMMENT '库存';
+alter table product_sku add `weight` double COMMENT '商品重量';
+alter table product_sku add `volume` double COMMENT '商品体积';
+
+
+alter table product_sku DROP `original_price`;
\ No newline at end of file
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
index cefab9a47..7371ba4cc 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
@@ -27,16 +27,16 @@ public class ProductSkuBaseVO {
     @NotNull(message = "销售价格，单位：分不能为空")
     private Integer price;
 
-    @ApiModelProperty(value = "原价， 单位： 分", required = true)
-    @NotNull(message = "原价， 单位： 分不能为空")
-    private Integer originalPrice;
+    @ApiModelProperty(value = "市场价， 单位： 分", required = true)
+    @NotNull(message = "市场价， 单位： 分不能为空")
+    private Integer marketPrice;
 
     @ApiModelProperty(value = "成本价，单位： 分", required = true)
     @NotNull(message = "成本价，单位： 分不能为空")
     private Integer costPrice;
 
-    @ApiModelProperty(value = "条形码", required = true)
-    @NotNull(message = "条形码不能为空")
+    @ApiModelProperty(value = "条形码")
+//    @NotNull(message = "条形码不能为空")
     private String barCode;
 
     @ApiModelProperty(value = "图片地址", required = true)
@@ -46,7 +46,15 @@ public class ProductSkuBaseVO {
     @ApiModelProperty(value = "状态： 0-正常 1-禁用")
     private Integer status;
 
-    // TODO @franky 要有 swagger 注解
+    @ApiModelProperty(value = "库存")
+    private Integer stock;
+
+    @ApiModelProperty(value = "商品重量，单位：kg 千克")
+    private Double weight;
+
+    @ApiModelProperty(value = "商品体积，单位：m^3 平米")
+    private Double volume;
+
     @Data
     public static class Property {
         @NotNull(message = "规格属性名id不能为空")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
index e9c76805a..33d11ccac 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
 
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +19,11 @@ public class ProductSpuBaseVO {
     @ApiModelProperty(value = "商品名称")
     private String name;
 
+    /**
+     * 商品编码
+     */
+    private String code;
+
     @ApiModelProperty(value = "卖点", required = true)
     @NotNull(message = "卖点不能为空")
     private String sellPoint;
@@ -24,28 +32,87 @@ public class ProductSpuBaseVO {
     @NotNull(message = "描述不能为空")
     private String description;
 
+    /**
+     * 商品品牌编号
+     *
+     * 关联 {@link ProductBrandDO#getId()}
+     */
+    private Long brandId;
+
     @ApiModelProperty(value = "分类id", required = true)
     @NotNull(message = "分类id不能为空")
     private Long categoryId;
 
+    /**
+     * 商品主图
+     */
+    private String bannerUrl;
+
     @ApiModelProperty(value = "商品主图地址,* 数组，以逗号分隔,最多上传15张", required = true)
     @NotNull(message = "商品主图地址,* 数组，以逗号分隔,最多上传15张不能为空")
     private List<String> picUrls;
 
+    /**
+     * 商品视频
+     */
+    private String videoUrl;
+
+    /**
+     * 规格类型
+     *
+     * 枚举 {@link ProductSpuSpecTypeEnum}
+     */
+    private Integer specType;
+
     @ApiModelProperty(value = "排序字段", required = true)
     @NotNull(message = "排序字段不能为空")
     private Integer sort;
-
-    @ApiModelProperty(value = "点赞初始人数")
-    private Integer likeCount;
-
-    @ApiModelProperty(value = "价格 单位使用：分")
-    private Integer price;
-
-    @ApiModelProperty(value = "库存数量")
-    private Integer quantity;
+    /**
+     * 最小价格，单位使用：分
+     *
+     * 基于其对应的 {@link ProductSkuDO#getPrice()} 最小值
+     */
+    private Integer minPrice;
+    /**
+     * 最大价格，单位使用：分
+     *
+     * 基于其对应的 {@link ProductSkuDO#getPrice()} 最大值
+     */
+    private Integer maxPrice;
+    /**
+     * 市场价，单位使用：分
+     *
+     * 基于其对应的 {@link ProductSkuDO#getMarketPrice()} 最大值
+     */
+    private Integer marketPrice;
+    /**
+     * 总库存
+     *
+     * 基于其对应的 {@link ProductSkuDO#getStock()} 求和
+     */
+    private Integer totalStock;
+    /**
+     * 预警预存
+     */
+    private Integer warnStock;
+    /**
+     * 是否展示库存
+     */
+    private Boolean showStock;
 
     @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
     private Integer status;
 
+    /**
+     * 商品销量
+     */
+    private Integer salesCount;
+    /**
+     * 虚拟销量
+     */
+    private Integer virtualSalesCount;
+    /**
+     * 商品点击量
+     */
+    private Integer clickCount;
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
index 9cb1a0da3..f650e90d9 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
@@ -49,7 +49,7 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
         //插入属性值
         List<ProductPropertyValueCreateReqVO> propertyValueList = createReqVO.getPropertyValueList();
         List<ProductPropertyValueDO> productPropertyValueDOList = ProductPropertyValueConvert.INSTANCE.convertList03(propertyValueList);
-        productPropertyValueDOList.stream().forEach(x-> x.setPropertyId(property.getId()));
+        productPropertyValueDOList.forEach(x-> x.setPropertyId(property.getId()));
         productPropertyValueMapper.insertBatch(productPropertyValueDOList);
         // 返回
         return property.getId();
@@ -67,7 +67,7 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
         productPropertyValueMapper.deletePropertyValueByPropertyId(updateReqVO.getId());
         List<ProductPropertyValueCreateReqVO> propertyValueList = updateReqVO.getPropertyValueList();
         List<ProductPropertyValueDO> productPropertyValueDOList = ProductPropertyValueConvert.INSTANCE.convertList03(propertyValueList);
-        productPropertyValueDOList.stream().forEach(x-> x.setPropertyId(updateReqVO.getId()));
+        productPropertyValueDOList.forEach(x-> x.setPropertyId(updateReqVO.getId()));
         productPropertyValueMapper.insertBatch(productPropertyValueDOList);
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index d15aa5c47..58538ebc0 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -2,9 +2,14 @@ package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
@@ -84,8 +89,6 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         return productSkuMapper.selectPage(pageReqVO);
     }
 
-    // TODO @franky：这个方法，貌似实现的还是有点问题哈。例如说，throw 异常，后面还执行逻辑~
-    // TODO @艿艿 咳咳，throw 那里我是偷懒省略了{}，哈哈，我加上，然后我调试下，在优化下
     @Override
     public void validateSkus(List<ProductSkuCreateReqVO> list) {
         List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> p.getProperties().stream()).collect(Collectors.toList());
@@ -99,8 +102,9 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         skuPropertyList.forEach(p -> {
             ProductPropertyRespVO productPropertyRespVO = propertyMap.get(p.getPropertyId());
             // 如果对应的属性名不存在或属性名下的属性值集合为空，给出提示
-            if (null == productPropertyRespVO || productPropertyRespVO.getPropertyValueList().isEmpty())
+            if (null == productPropertyRespVO || productPropertyRespVO.getPropertyValueList().isEmpty()) {
                 throw ServiceExceptionUtil.exception(PROPERTY_NOT_EXISTS);
+            }
             // 判断改属性名对应的属性值是否存在,不存在，给出提示
             if (!productPropertyRespVO.getPropertyValueList().stream().map(ProductPropertyValueRespVO::getId).collect(Collectors.toSet()).contains(p.getValueId())) {
                 throw ServiceExceptionUtil.exception(ErrorCodeConstants.PROPERTY_VALUE_NOT_EXISTS);
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 7b66f1f05..23e502052 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -181,246 +181,6 @@
 <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body >
   <save @closeDialog="open = false"/>
 </el-dialog>
-    <!-- 对话框(添加 / 修改) -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入商品名称" />
-        </el-form-item>
-        <el-form-item label="卖点" prop="sellPoint">
-          <el-input v-model="form.sellPoint" placeholder="请输入卖点" />
-        </el-form-item>
-        <el-form-item label="描述">
-          <editor v-model="form.description" :min-height="192" />
-        </el-form-item>
-        <el-form-item label="分类id" prop="categoryIds">
-          <el-cascader
-            v-model="form.categoryIds"
-            placeholder="请输入分类id"
-            style="width: 100%"
-            :options="categoryList"
-            :props="propName"
-            clearable
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item label="商品主图地址" prop="picUrls">
-          <ImageUpload v-model="form.picUrls" :limit="10" />
-        </el-form-item>
-        <el-form-item label="商品规格">
-          <el-button size="mini" @click="shopTagInput()">添加规格</el-button>
-          <div v-for="(tag, tagIndex) in skuTags" :key="tagIndex">
-            <span>{{ tag.name }}</span>
-            <el-button
-              style="margin-left: 10px"
-              class="button-new-tag"
-              type="text"
-              icon="el-icon-delete"
-              @click="removeTag(tagIndex)"
-              >删除
-            </el-button>
-            <br />
-            <el-tag
-              v-for="(tagItem, tagItemIndex) in tag.selectValues"
-              :key="tagItemIndex"
-              style="margin-right: 10px"
-              :disable-transitions="false"
-            >
-              {{ tagItem }}
-            </el-tag> -->
-            <!--            <el-input-->
-            <!--              class="input-new-tag"-->
-            <!--              v-if="tagItemInputs[tagIndex] && tagItemInputs[tagIndex].visible"-->
-            <!--              v-model="tagItemInputs[tagIndex].value"-->
-            <!--              :ref="`saveTagInput${tagIndex}`"-->
-            <!--              size="small"-->
-            <!--              @keyup.enter.native="handleInputConfirm(tagIndex)"-->
-            <!--              @blur="handleInputConfirm(tagIndex)">-->
-            <!--            </el-input>-->
-          <!-- </div>
-        </el-form-item>
-        <el-form-item label="规格名" v-show="isShowTagInput">
-          <el-col :span="8">
-            <el-select
-              v-model="addTagInput.name"
-              filterable
-              allow-create
-              default-first-option
-              placeholder="请选择"
-              @change="handleTagClick"
-            >
-              <el-option
-                v-for="item in unUseTags"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-              >
-              </el-option>
-            </el-select>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="规格值" v-show="isShowTagInput">
-          <el-col :span="8">
-            <el-select
-              v-model="addTagInput.selectValues"
-              multiple
-              filterable
-              allow-create
-              default-first-option
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in dbTagValues"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-              >
-              </el-option>
-            </el-select>
-          </el-col>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="addTag()"
-            v-show="isShowTagInput"
-            >确定</el-button
-          >
-          <el-button size="mini" @click="hideTagInput()" v-show="isShowTagInput"
-            >取消</el-button
-          >
-        </el-form-item>
-        <el-form-item v-if="form.skus.length > 0">
-          <el-table
-            :data="form.skus"
-            border
-            style="width: 100%; margin-top: 20px"
-            :span-method="tableSpanMethod"
-          >
-            <el-table-column
-              v-for="(leftTitle, index) in skuTags"
-              :key="index"
-              :label="leftTitle.name"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.propertyChildNames[index] }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="skuTags.length"
-              prop="picUrl"
-              label="sku图片"
-              width="180"
-            >
-              <template slot-scope="scope">
-                <ImageUpload v-model="scope.row.picUrl" :limit="1">
-                </ImageUpload>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="prodName"
-              label="条形码"
-              width="250"
-              v-if="skuTags.length"
-            >
-              <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.barCode"
-                  type="textarea"
-                  :disabled="scope.row.status == 1"
-                ></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column prop="price" label="销售价">
-              <template slot-scope="scope">
-                <el-input-number
-                  size="small"
-                  v-model="scope.row.price"
-                  controls-position="right"
-                  :precision="2"
-                  :max="1000000000"
-                  :min="0.01"
-                  :disabled="scope.row.status == 1"
-                >
-                </el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column prop="oriPrice" label="成本价">
-              <template slot-scope="scope">
-                <el-input-number
-                  size="small"
-                  v-model="scope.row.costPrice"
-                  controls-position="right"
-                  :precision="2"
-                  :max="1000000000"
-                  :min="0.01"
-                  :disabled="scope.row.status == 1"
-                >
-                </el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column prop="oriPrice" label="原价">
-              <template slot-scope="scope">
-                <el-input-number
-                  size="small"
-                  v-model="scope.row.originalPrice"
-                  controls-position="right"
-                  :precision="2"
-                  :max="1000000000"
-                  :min="0.01"
-                  :disabled="scope.row.status == 1"
-                >
-                </el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作">
-              <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="small"
-                  @click="changeSkuStatus(`${scope.$index}`)"
-                  v-if="scope.row.status === 0"
-                >
-                  正常
-                </el-button>
-                <el-button
-                  type="text"
-                  size="small"
-                  @click="changeSkuStatus(`${scope.$index}`)"
-                  v-else
-                  >已禁用</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-        <el-form-item label="排序字段" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序字段" />
-        </el-form-item>
-        <el-form-item label="点赞初始人数" prop="likeCount">
-          <el-input v-model="form.likeCount" placeholder="请输入点赞初始人数" />
-        </el-form-item>
-        <el-form-item label="价格 单位使用：分" prop="price">
-          <el-input
-            v-model="form.price"
-            placeholder="请输入价格 单位使用：分"
-          />
-        </el-form-item>
-        <el-form-item label="库存数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入库存数量" />
-        </el-form-item>
-        <el-form-item label="上下架状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio label="0">上架</el-radio>
-            <el-radio label="1">下架</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog> -->
   </div>
 </template>
 
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 93e42f79f..e05e651e4 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -1,26 +1,6 @@
 <template>
   <div class="container">
-    <el-dialog
-      title="请输入规格值，多个请换行"
-      :visible.sync="dialogForSpec"
-      append-to-body
-      width="400px"
-      @close="dialogForSpec = false; specValue = null"
-    >
-      <el-input
-        v-model="specValue"
-        type="textarea"
-        :autosize="{ minRows: 6, maxRows: 6}"
-        placeholder="请输入内容"
-      />
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogForSpec = false; specValue = null">取 消</el-button>
-        <el-button type="primary" @click="addSpecValue">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <el-tabs v-model="activeName"  class="tabs">
+    <el-tabs v-model="activeName" class="tabs">
       <!-- 基础设置 -->
       <el-tab-pane label="基础设置" name="base">
         <el-form ref="baseForm" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
@@ -40,11 +20,11 @@
               clearable
             ></el-cascader>
           </el-form-item>
-          <el-form-item label="商品主图" prop="picUrls">
-            <ImageUpload v-model="baseForm.picUrl" :limit="1" />
+          <el-form-item label="商品主图" prop="bannerUrl">
+            <ImageUpload v-model="baseForm.bannerUrl" :limit="1"/>
           </el-form-item>
-           <el-form-item label="商品轮播图" prop="picUrl">
-            <ImageUpload v-model="baseForm.picUrls" :limit="10" />
+          <el-form-item label="商品轮播图" prop="picUrls">
+            <ImageUpload v-model="baseForm.picUrls" :limit="10"/>
           </el-form-item>
           <el-form-item label="排序字段" prop="sort">
             <el-input v-model="baseForm.sort" placeholder="请输入排序字段"/>
@@ -80,29 +60,28 @@
 
               <div class="spec-header">
                 规格项：
-                <el-input
-                  v-model="specs.spec_name"
-                  placeholder="请填写规格项"
-                  class="spec-name"
-                ></el-input>
+                <el-select v-model="specs.specId" filterable placeholder="请选择" @change="changeSpec">
+                  <el-option
+                    v-for="item in propertyPageList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </div>
               <div class="spec-values">
-                <template v-for="(specsValue, i) in specs.spec_values">
-                  <el-input
-                    v-model="specs.spec_values[i]"
-                    class="spec-value"
-                    :key="specsValue"
-                  ></el-input>
+                <template v-for="(v, i) in specs.specValue">
+                  <el-input v-model="v.name" class="spec-value" :key="i"/>
                 </template>
-                <el-button
+                <!-- <el-button
                   type="primary"
                   icon="el-icon-plus"
                   circle
                   @click="dialogForSpec = true; currentSpec = index"
-                ></el-button>
+                ></el-button> -->
               </div>
             </div>
-            <el-button type="primary" @click="dynamicSpec.push({spec_values: []}); ratesForm.rates = []"
+            <el-button type="primary" @click="dynamicSpec.push({specValue: []}); ratesForm.rates = []"
             >添加规格项目
             </el-button
             >
@@ -111,22 +90,24 @@
           <!-- 规格明细 -->
           <el-form-item label="规格明细">
             <el-table :data="ratesForm.rates" border style="width: 100%" ref="rates">
-              
-              <template v-if="ratesForm.spec == 1" > 
-                <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v=>v.spec_name != undefined)" :label="item.spec_name" >
-                <template slot-scope="scope">
-                  <el-input
-                    v-if="scope.row.spec"
-                    v-model="scope.row.spec[index]"
-                    disabled
-                  ></el-input>
-                </template>
-              </el-table-column>
+
+              <template v-if="ratesForm.spec == 1">
+                <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v=>v.specName != undefined)"
+                                 :label="item.specName">
+                  <template slot-scope="scope">
+                    <el-input
+                      v-if="scope.row.spec"
+                      v-model="scope.row.spec[index]"
+                      disabled
+                    ></el-input>
+                  </template>
+                </el-table-column>
               </template>
-             
+
               <el-table-column label="规格图片" width="120px">
                 <template slot-scope="scope">
-                  <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false" style="width: 100px; height: 50px" />
+                  <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false"
+                               style="width: 100px; height: 50px"/>
                 </template>
               </el-table-column>
               <el-table-column label="市场价(元)">
@@ -177,40 +158,40 @@
 
       <!-- 商品详情 -->
       <el-tab-pane label="商品描述" name="third">
-        <editor v-model="baseForm.description" :min-height="400" />
+        <editor v-model="baseForm.description" :min-height="400"/>
       </el-tab-pane>
 
       <!-- 销售设置 -->
       <el-tab-pane label="销售设置" name="fourth">
         <el-form ref="baseForm" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
-        <el-form-item label="库存数量" prop="quantity">
-          <el-input v-model="baseForm.quantity" placeholder="请输入库存数量" />
-        </el-form-item>
-        <el-form-item label="上下架状态" prop="status">
-          <el-radio-group v-model="baseForm.status">
-            <el-radio label="0">上架</el-radio>
-            <el-radio label="1">下架</el-radio>
-          </el-radio-group>
-        </el-form-item>
+          <el-form-item label="库存数量" prop="totalStock">
+            <el-input v-model="baseForm.totalStock" placeholder="请输入库存数量"/>
+          </el-form-item>
+          <el-form-item label="上下架状态" prop="status">
+            <el-radio-group v-model="baseForm.status">
+              <el-radio :label="0">上架</el-radio>
+              <el-radio :label="1">下架</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
       </el-tab-pane>
     </el-tabs>
 
-  <div class="buttons">
-  <el-button type="info" round @click="cancel">取消</el-button>
-   <el-button type="success" round @click="submit">确认</el-button>
-  </div>
+    <div class="buttons">
+      <el-button type="info" round @click="cancel">取消</el-button>
+      <el-button type="success" round @click="submit">确认</el-button>
+    </div>
 
   </div>
 </template>
 
 <script>
-import {
-  getProductCategoryList
-} from "@/api/mall/product/category";
-
+import {getProductCategoryList} from "@/api/mall/product/category";
+import {createSpu,} from "@/api/mall/product/spu";
+import {getPropertyPage,} from "@/api/mall/product/property";
 import Editor from "@/components/Editor";
 import ImageUpload from "@/components/ImageUpload";
+
 export default {
   components: {
     Editor,
@@ -231,12 +212,12 @@ export default {
         categoryIds: null,
         sort: null,
         description: null,
-        picUrl:null,
+        bannerUrl: null,
         picUrls: [],
-        quantity: null
+        totalStock: null,
+        status: 0
       },
       categoryList: [],
-
       // 价格库存
       ratesForm: {
         spec: 0,
@@ -245,15 +226,16 @@ export default {
       },
       dynamicSpec: [
         // {
-        //   spec_id: 86,
-        //   spec_name: "颜色",
-        //   spec_values: [],
-        //   spec_value_ids: [225],
+        //   specId: 86,
+        //   specName: "颜色",
+        //   specValue:[{
+        //      name: "红色",
+        //      id: 225,
+        //   }]
         // },
       ],
-      dialogForSpec: false,
+      propertyPageList: [],
       specValue: null,
-      currentSpec: null,
 
       // 表单校验
       rules: {
@@ -263,7 +245,7 @@ export default {
         categoryIds: [
           {required: true, message: "分类id不能为空", trigger: "blur"},
         ],
-        picUrls: [{required: true, message: "商品主图地址", trigger: "blur"}],
+        bannerUrl: [{required: true, message: "商品主图地址", trigger: "blur"}],
         sort: [
           {required: true, message: "排序字段不能为空", trigger: "blur"},
         ],
@@ -272,54 +254,44 @@ export default {
   },
   created() {
     this.getListCategory();
+    this.getPropertyPageList();
   },
   methods: {
     changeRadio() {
 
       this.$refs.rates.doLayout()
-      if(this.ratesForm.spec == 0){
+      if (this.ratesForm.spec == 0) {
         this.ratesForm.rates = [{}]
-      }else{
+      } else {
         this.ratesForm.rates = []
-        if(this.dynamicSpec.length > 0){
+        if (this.dynamicSpec.length > 0) {
           this.buildRatesFormRates()
         }
       }
     },
     // 构建规格明细笛卡尔积
-  buildRatesFormRates(){
+    buildRatesFormRates() {
       let rates = [];
-      this.dynamicSpec.map(v=>v.spec_values)
-      .reduce((last, current) => {
-        const array = [];
-        last.forEach(par1 => {
+      this.dynamicSpec.map(v => v.specValue.map(m => m.name))
+        .reduce((last, current) => {
+          const array = [];
+          last.forEach(par1 => {
             current.forEach(par2 => {
-              let v 
-              if(par1 instanceof Array){
+              let v
+              if (par1 instanceof Array) {
                 v = par1.concat(par2)
-              }else{
+              } else {
                 v = [par1, par2];
               }
               array.push(v)
             });
+          });
+          return array;
+        })
+        .forEach(v => {
+          rates.push({spec: v})
         });
-        return array;
-    })
-    .forEach(v=>{
-      rates.push({spec: v})
-    });
-    console.log(rates)
-    this.ratesForm.rates = rates
-  },
-    addSpecValue() {
-      this.dialogForSpec = false;
-      let specValue = this.dynamicSpec[this.currentSpec].spec_values
-        .concat(this.specValue.split(/[(\r\n)\r\n]+/))
-        .filter(v => v != "");
-      console.log(specValue)
-      this.dynamicSpec[this.currentSpec].spec_values = [...new Set(specValue)];
-      this.currentSpec = null;
-      this.buildRatesFormRates()
+      this.ratesForm.rates = rates
     },
     /** 查询分类 */
     getListCategory() {
@@ -328,9 +300,53 @@ export default {
         this.categoryList = this.handleTree(response.data, "id", "parentId");
       });
     },
-    cancel(){
-        this.$emit("closeDialog");
+    cancel() {
+      this.$emit("closeDialog");
     },
+    submit() {
+      let rates = this.ratesForm.rates;
+      // 动态规格调整字段
+      if (this.ratesForm.spec == 1) {
+        rates.forEach(r => {
+          let properties = []
+          r.spec.forEach((v, i) => {
+            let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
+            let propertie = {};
+            propertie.propertyId = this.dynamicSpec[i].specId;
+            propertie.valueId = specValue.id;
+            properties.push(propertie);
+          })
+          r.properties = properties;
+        })
+      }
+      this.baseForm.skus = rates;
+      this.baseForm.specType = this.ratesForm.spec;
+      this.baseForm.categoryId = this.baseForm.categoryIds[this.baseForm.categoryIds.length - 1];
+      console.log(this.baseForm)
+      createSpu(this.baseForm).then((response) => {
+        this.$modal.msgSuccess("新增成功");
+        this.open = false;
+        this.getList();
+        this.$emit("closeDialog");
+      });
+    },
+    /** 查询规格 */
+    getPropertyPageList() {
+      // 执行查询
+      getPropertyPage().then((response) => {
+        this.propertyPageList = response.data.list;
+      });
+    },
+    changeSpec(val) {
+      let obj = this.propertyPageList.find(o => o.id == val);
+      let dynamicSpec = this.dynamicSpec;
+      let spec = dynamicSpec.find(o => o.specId == val)
+      spec.specId = obj.id;
+      spec.specName = obj.name;
+      spec.specValue = obj.propertyValueList;
+      this.dynamicSpec = dynamicSpec;
+      this.buildRatesFormRates();
+    }
   },
 };
 </script>
@@ -349,7 +365,7 @@ export default {
 
   .spec-header {
     padding: 30px;
-    padding-bottom: 0;
+    padding-bottom: 20px;
 
     .spec-name {
       display: inline;
@@ -364,6 +380,7 @@ export default {
     width: 84%;
     padding: 25px;
     margin: auto;
+    padding-top: 5px;
 
     .spec-value {
       display: inline-block;
@@ -381,35 +398,40 @@ export default {
   }
 }
 
-.tabs{
+.tabs {
   height: 500px;
   border-bottom: 2px solid #f2f2f2;
-  .el-tab-pane{
+
+  .el-tab-pane {
     height: 445px;
     overflow-y: auto;
   }
 }
 
 // 库存价格图片样式修改
-.rates{
-.component-upload-image{
-  margin: auto;
+.rates {
+  .component-upload-image {
+    margin: auto;
+  }
+
+  .el-upload--picture-card {
+    width: 100px;
+    height: 50px;
+    line-height: 60px;
+    margin: auto;
+  }
+
+  .el-upload-list__item {
+    width: 100px !important;
+    height: 50px !important;
+  }
 }
-.el-upload--picture-card{
-  width: 100px;
-  height: 50px;
-  line-height: 60px;
-  margin: auto;
-}
-.el-upload-list__item{
-   width: 100px !important;
-  height: 50px !important;
-}
-}
-.buttons{
+
+.buttons {
   margin-top: 20px;
   height: 36px;
-  button{
+
+  button {
     float: right;
     margin-left: 15px;
   }

From 8de29d302c386758385d0a251e6480e4e239ead6 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Mon, 22 Aug 2022 21:20:49 +0800
Subject: [PATCH 36/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sku/vo/ProductSkuBaseVO.java        |  3 +--
 .../service/sku/ProductSkuServiceImpl.java    |  2 +-
 .../service/spu/ProductSpuServiceImpl.java    |  8 ++++--
 .../src/views/mall/product/spu/index.vue      |  6 ++---
 .../src/views/mall/product/spu/save.vue       | 27 ++++++++++++-------
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
index 7371ba4cc..f2636efe6 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
@@ -19,8 +19,7 @@ public class ProductSkuBaseVO {
 
     // TODO @franky：类似这种字段，有额外说明的。可以写成；    @ApiModelProperty(value = "规格值数组", required = true, notes = "json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]")
 
-    @ApiModelProperty(value = "规格值数组-json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]", required = true)
-    @NotNull(message = "规格值数组-json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]不能为空")
+    @ApiModelProperty(value = "规格值数组-json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]")
     private List<Property> properties;
 
     @ApiModelProperty(value = "销售价格，单位：分", required = true)
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 58538ebc0..36549eb3f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -91,7 +91,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
 
     @Override
     public void validateSkus(List<ProductSkuCreateReqVO> list) {
-        List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> p.getProperties().stream()).collect(Collectors.toList());
+        List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> Optional.of(p.getProperties()).orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
         // 校验规格属性以及规格值是否存在
         List<Long> propertyIds = skuPropertyList.stream().map(ProductSkuBaseVO.Property::getPropertyId).collect(Collectors.toList());
         List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(propertyIds);
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 49847f720..c3a05ce9b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -57,7 +57,9 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         categoryService.validateProductCategory(createReqVO.getCategoryId());
         // 校验SKU
         List<ProductSkuCreateReqVO> skuCreateReqList = createReqVO.getSkus();
-        productSkuService.validateSkus(skuCreateReqList);
+        if(createReqVO.getSpecType() == 1) {
+            productSkuService.validateSkus(skuCreateReqList);
+        }
         // 插入SPU
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO);
         ProductSpuMapper.insert(spu);
@@ -81,7 +83,9 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         categoryService.validateProductCategory(updateReqVO.getCategoryId());
         // 校验SKU
         List<ProductSkuCreateReqVO> skuCreateReqList = updateReqVO.getSkus();
-        productSkuService.validateSkus(skuCreateReqList);
+        if(updateReqVO.getSpecType() == 1) {
+            productSkuService.validateSkus(skuCreateReqList);
+        }
         // 更新
         ProductSpuDO updateObj = ProductSpuConvert.INSTANCE.convert(updateReqVO);
         ProductSpuMapper.updateById(updateObj);
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 23e502052..00ee1ed3f 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -178,9 +178,9 @@
     />
 
 
-<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body >
-  <save @closeDialog="open = false"/>
-</el-dialog>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close>
+      <save @closeDialog="open = false; getList()"/>
+    </el-dialog>
   </div>
 </template>
 
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index e05e651e4..556bd816b 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -309,26 +309,33 @@ export default {
       if (this.ratesForm.spec == 1) {
         rates.forEach(r => {
           let properties = []
-          r.spec.forEach((v, i) => {
-            let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
-            let propertie = {};
-            propertie.propertyId = this.dynamicSpec[i].specId;
-            propertie.valueId = specValue.id;
-            properties.push(propertie);
-          })
+          if(r.spec instanceof Array){
+            r.spec.forEach((v, i) => {
+              let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
+              let propertie = {};
+              propertie.propertyId = this.dynamicSpec[i].specId;
+              propertie.valueId = specValue.id;
+              properties.push(propertie);
+            })
+          }else{
+              let specValue = this.dynamicSpec[0].specValue.find(o => o.name == r.spec);
+              let propertie = {};
+              propertie.propertyId = this.dynamicSpec[0].specId;
+              propertie.valueId = specValue.id;
+              properties.push(propertie);
+          }
           r.properties = properties;
         })
       }
       this.baseForm.skus = rates;
       this.baseForm.specType = this.ratesForm.spec;
       this.baseForm.categoryId = this.baseForm.categoryIds[this.baseForm.categoryIds.length - 1];
-      console.log(this.baseForm)
       createSpu(this.baseForm).then((response) => {
+        console.log(response)
         this.$modal.msgSuccess("新增成功");
-        this.open = false;
-        this.getList();
         this.$emit("closeDialog");
       });
+
     },
     /** 查询规格 */
     getPropertyPageList() {

From f03d679f2cb48d3163621329f5e0d2521d42c1d3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 23 Aug 2022 00:33:28 +0800
Subject: [PATCH 37/56] =?UTF-8?q?mall=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=92=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20VO=EF=BC=9B=E5=BE=AE=E8=B0=83=E5=95=86=E5=93=81=E7=9A=84=20S?=
 =?UTF-8?q?PU/SKU=20=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sku/ProductSkuController.java       |  4 +-
 .../admin/sku/vo/ProductSkuBaseVO.java        | 70 ++++++++++++-------
 .../sku/vo/ProductSkuCreateOrUpdateReqVO.java | 14 ++++
 .../admin/sku/vo/ProductSkuCreateReqVO.java   | 14 ----
 .../admin/spu/ProductSpuController.java       | 11 ++-
 .../admin/spu/vo/ProductSpuBaseVO.java        | 68 ++++++++++++------
 .../admin/spu/vo/ProductSpuCreateReqVO.java   | 11 +--
 .../admin/spu/vo/ProductSpuUpdateReqVO.java   | 30 ++++++++
 .../admin/spu/vo/SpuUpdateReqVO.java          | 25 -------
 .../convert/sku/ProductSkuConvert.java        |  6 +-
 .../convert/spu/ProductSpuConvert.java        |  2 +-
 .../dal/dataobject/sku/ProductSkuDO.java      |  4 ++
 .../dal/dataobject/spu/ProductSpuDO.java      | 14 ++--
 .../service/sku/ProductSkuService.java        |  9 ++-
 .../service/sku/ProductSkuServiceImpl.java    |  6 +-
 .../service/spu/ProductSpuService.java        |  6 +-
 .../service/spu/ProductSpuServiceImpl.java    | 21 +++---
 .../service/sku/SkuServiceImplTest.java       |  4 +-
 .../spu/ProductSpuServiceImplTest.java        |  6 +-
 19 files changed, 186 insertions(+), 139 deletions(-)
 create mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateReqVO.java
 create mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuUpdateReqVO.java
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
index ef6d8fcac..cefa6afe0 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.product.controller.admin.sku;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
@@ -35,7 +35,7 @@ public class ProductSkuController {
     @PostMapping("/create")
     @ApiOperation("创建商品sku")
     @PreAuthorize("@ss.hasPermission('product:sku:create')")
-    public CommonResult<Long> createSku(@Valid @RequestBody ProductSkuCreateReqVO createReqVO) {
+    public CommonResult<Long> createSku(@Valid @RequestBody ProductSkuCreateOrUpdateReqVO createReqVO) {
         return success(ProductSkuService.createSku(createReqVO));
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
index cefab9a47..5b6b438e9 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
@@ -1,58 +1,80 @@
 package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
-* 商品sku Base VO，提供给添加、修改、详细的子 VO 使用
+* 商品 SKU Base VO，提供给添加、修改、详细的子 VO 使用
 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
 */
 @Data
 public class ProductSkuBaseVO {
 
-    // TODO @franky：example 要写哈；
+    @ApiModelProperty(value = "商品 SKU 名字", required = true, example = "芋道")
+    @NotEmpty(message = "商品 SKU 名字不能为空")
+    private String name;
 
-    @ApiModelProperty(value = "spu编号")
-    private Long spuId;
-
-    // TODO @franky：类似这种字段，有额外说明的。可以写成；    @ApiModelProperty(value = "规格值数组", required = true, notes = "json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]")
-
-    @ApiModelProperty(value = "规格值数组-json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]", required = true)
-    @NotNull(message = "规格值数组-json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]不能为空")
+    /**
+     * 规格值数组
+     */
+    @NotNull(message = "规格值数组不能为空")
     private List<Property> properties;
 
-    @ApiModelProperty(value = "销售价格，单位：分", required = true)
+    @ApiModelProperty(value = "销售价格，单位：分", required = true, example = "1024", notes = "单位：分")
     @NotNull(message = "销售价格，单位：分不能为空")
     private Integer price;
 
-    @ApiModelProperty(value = "原价， 单位： 分", required = true)
-    @NotNull(message = "原价， 单位： 分不能为空")
+    @ApiModelProperty(value = "市场价", example = "1024", notes = "单位：分")
     private Integer originalPrice;
 
-    @ApiModelProperty(value = "成本价，单位： 分", required = true)
-    @NotNull(message = "成本价，单位： 分不能为空")
+    @ApiModelProperty(value = "成本价", example = "1024", notes = "单位：分")
     private Integer costPrice;
 
-    @ApiModelProperty(value = "条形码", required = true)
+    @ApiModelProperty(value = "条形码", example = "haha")
     @NotNull(message = "条形码不能为空")
     private String barCode;
 
-    @ApiModelProperty(value = "图片地址", required = true)
+    @ApiModelProperty(value = "图片地址")
     @NotNull(message = "图片地址不能为空")
     private String picUrl;
 
-    @ApiModelProperty(value = "状态： 0-正常 1-禁用")
+    @ApiModelProperty(value = "SKU 状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举")
+    @NotNull(message = "SKU 状态不能为空")
+    @InEnum(CommonStatusEnum.class)
     private Integer status;
 
-    // TODO @franky 要有 swagger 注解
+    @ApiModelProperty(value = "库存", required = true, example = "1")
+    @NotNull(message = "库存不能为空")
+    private Integer stock;
+
+    @ApiModelProperty(value = "预警预存", example = "1")
+    private Integer warnStock;
+
+    @ApiModelProperty(value = "商品重量", example = "1", notes = "单位：kg 千克")
+    private Double weight;
+
+    @ApiModelProperty(value = "商品体积", example = "1024", notes = "单位：m^3 平米")
+    private Double volume;
+
+    @ApiModel("规格值")
     @Data
     public static class Property {
-        @NotNull(message = "规格属性名id不能为空")
+
+        @ApiModelProperty(value = "属性编号", required = true, example = "1")
+        @NotNull(message = "属性编号不能为空")
         private Long propertyId;
-        @NotNull(message = "规格属性值id不能为空")
+
+        @ApiModelProperty(value = "属性值编号", required = true, example = "1024")
+        @NotNull(message = "属性值编号不能为空")
         private Long valueId;
+
     }
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
new file mode 100755
index 000000000..01a09fd39
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ApiModel("管理后台 - 商品 SKU 创建/更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductSkuCreateOrUpdateReqVO extends ProductSkuBaseVO {
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateReqVO.java
deleted file mode 100755
index e01c272a4..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateReqVO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
-
-@ApiModel("管理后台 - 商品sku创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ProductSkuCreateReqVO extends ProductSkuBaseVO {
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
index cfe393caf..7aa73068f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.product.controller.admin.spu;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
@@ -23,7 +23,7 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-@Api(tags = "管理后台 - 商品spu")
+@Api(tags = "管理后台 - 商品 SPU")
 @RestController
 @RequestMapping("/product/spu")
 @Validated
@@ -33,17 +33,16 @@ public class ProductSpuController {
     private ProductSpuService spuService;
 
     @PostMapping("/create")
-    @ApiOperation("创建商品spu")
+    @ApiOperation("创建商品 SPU")
     @PreAuthorize("@ss.hasPermission('product:spu:create')")
     public CommonResult<Long> createSpu(@Valid @RequestBody ProductSpuCreateReqVO createReqVO) {
         return success(spuService.createSpu(createReqVO));
     }
 
-    // TODO @franky：SpuUpdateReqVO 缺少前缀
     @PutMapping("/update")
-    @ApiOperation("更新商品spu")
+    @ApiOperation("更新商品 SPU")
     @PreAuthorize("@ss.hasPermission('product:spu:update')")
-    public CommonResult<Boolean> updateSpu(@Valid @RequestBody SpuUpdateReqVO updateReqVO) {
+    public CommonResult<Boolean> updateSpu(@Valid @RequestBody ProductSpuUpdateReqVO updateReqVO) {
         spuService.updateSpu(updateReqVO);
         return success(true);
     }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
index e9c76805a..0fde8d976 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
@@ -1,51 +1,75 @@
 package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
 
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
-* 商品spu Base VO，提供给添加、修改、详细的子 VO 使用
+* 商品 SPU Base VO，提供给添加、修改、详细的子 VO 使用
 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
 */
 @Data
 public class ProductSpuBaseVO {
 
-    @ApiModelProperty(value = "商品名称")
+    @ApiModelProperty(value = "商品名称", required = true, example = "芋道")
+    @NotEmpty(message = "商品名称不能为空")
     private String name;
 
-    @ApiModelProperty(value = "卖点", required = true)
-    @NotNull(message = "卖点不能为空")
+    @ApiModelProperty(value = "商品编码", example = "yudaoyuanma")
+    private String code;
+
+    @ApiModelProperty(value = "商品卖点", example = "好吃！")
     private String sellPoint;
 
-    @ApiModelProperty(value = "描述", required = true)
-    @NotNull(message = "描述不能为空")
+    @ApiModelProperty(value = "商品详情", required = true, example = "我是商品描述")
+    @NotNull(message = "商品详情不能为空")
     private String description;
 
-    @ApiModelProperty(value = "分类id", required = true)
-    @NotNull(message = "分类id不能为空")
+    @ApiModelProperty(value = "商品分类编号", required = true, example = "1")
+    @NotNull(message = "商品分类编号不能为空")
     private Long categoryId;
 
-    @ApiModelProperty(value = "商品主图地址,* 数组，以逗号分隔,最多上传15张", required = true)
-    @NotNull(message = "商品主图地址,* 数组，以逗号分隔,最多上传15张不能为空")
+    @ApiModelProperty(value = "商品品牌编号", required = true, example = "1")
+    @NotNull(message = "商品品牌编号不能为空")
+    private Long brandId;
+
+    @ApiModelProperty(value = "商品图片的数组", required = true)
+    @NotNull(message = "商品图片的数组不能为空")
     private List<String> picUrls;
 
-    @ApiModelProperty(value = "排序字段", required = true)
-    @NotNull(message = "排序字段不能为空")
+    @ApiModelProperty(value = "商品视频", required = true)
+    @NotEmpty(message = "商品视频不能为空")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "排序字段", required = true, example = "1")
     private Integer sort;
 
-    @ApiModelProperty(value = "点赞初始人数")
-    private Integer likeCount;
-
-    @ApiModelProperty(value = "价格 单位使用：分")
-    private Integer price;
-
-    @ApiModelProperty(value = "库存数量")
-    private Integer quantity;
-
-    @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
+    @ApiModelProperty(value = "商品状态", required = true, example = "1", notes = "参见 ProductSpuStatusEnum 枚举类")
+    @NotNull(message = "商品状态不能为空")
+    @InEnum(ProductSpuStatusEnum.class)
     private Integer status;
 
+    // ========== SKU 相关字段 =========
+
+    @ApiModelProperty(value = "规格类型", required = true, example = "1", notes = "参见 ProductSpuSpecTypeEnum 枚举类")
+    @NotNull(message = "规格类型不能为空")
+    @InEnum(ProductSpuSpecTypeEnum.class)
+    private Integer specType;
+
+    @ApiModelProperty(value = "是否展示库存", required = true, example = "true")
+    @NotNull(message = "是否展示库存不能为空")
+    private Boolean showStock;
+
+    // ========== 统计相关字段 =========
+
+    @ApiModelProperty(value = "虚拟销量", required = true, example = "1024")
+    @NotNull(message = "虚拟销量不能为空")
+    private Integer virtualSalesCount;
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java
index 6281e20d5..87b0dd0b6 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java
@@ -1,8 +1,7 @@
 package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
 
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -10,14 +9,16 @@ import lombok.ToString;
 import javax.validation.Valid;
 import java.util.List;
 
-@ApiModel("管理后台 - 商品spu创建 Request VO")
+@ApiModel("管理后台 - 商品 SPU 创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ProductSpuCreateReqVO extends ProductSpuBaseVO {
 
-    @ApiModelProperty(value = "sku组合")
+    /**
+     * SKU 数组
+     */
     @Valid
-    List<ProductSkuCreateReqVO> skus;
+    private List<ProductSkuCreateOrUpdateReqVO> skus;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuUpdateReqVO.java
new file mode 100755
index 000000000..378a98dc6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuUpdateReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
+
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@ApiModel("管理后台 - 商品 SPU 更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductSpuUpdateReqVO extends ProductSpuBaseVO {
+
+    @ApiModelProperty(value = "商品编号", required = true, example = "1")
+    @NotNull(message = "商品编号不能为空")
+    private Long id;
+
+    /**
+     * SKU 数组
+     */
+    @Valid
+    private List<ProductSkuCreateOrUpdateReqVO> skus;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java
deleted file mode 100755
index 9e4092235..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
-
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-@ApiModel("管理后台 - 商品spu更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class SpuUpdateReqVO extends ProductSpuBaseVO {
-
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "sku组合")
-    @Valid
-    List<ProductSkuCreateReqVO> skus;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
index e11f4785f..8011ac077 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.product.convert.sku;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExcelVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
@@ -22,7 +22,7 @@ public interface ProductSkuConvert {
 
     ProductSkuConvert INSTANCE = Mappers.getMapper(ProductSkuConvert.class);
 
-    ProductSkuDO convert(ProductSkuCreateReqVO bean);
+    ProductSkuDO convert(ProductSkuCreateOrUpdateReqVO bean);
 
     ProductSkuDO convert(ProductSkuUpdateReqVO bean);
 
@@ -31,7 +31,7 @@ public interface ProductSkuConvert {
 
     List<ProductSkuRespVO> convertList(List<ProductSkuDO> list);
 
-    List<ProductSkuDO> convertSkuDOList(List<ProductSkuCreateReqVO> list);
+    List<ProductSkuDO> convertSkuDOList(List<ProductSkuCreateOrUpdateReqVO> list);
 
     PageResult<ProductSkuRespVO> convertPage(PageResult<ProductSkuDO> page);
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
index e267ba185..4ff755b93 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
@@ -22,7 +22,7 @@ public interface ProductSpuConvert {
 
     ProductSpuDO convert(ProductSpuCreateReqVO bean);
 
-    ProductSpuDO convert(SpuUpdateReqVO bean);
+    ProductSpuDO convert(ProductSpuUpdateReqVO bean);
 
     SpuRespVO convert(ProductSpuDO bean);
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index ccc3d4711..2057aa1ae 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -79,6 +79,10 @@ public class ProductSkuDO extends BaseDO {
      * 库存
      */
     private Integer stock;
+    /**
+     * 预警预存
+     */
+    private Integer warnStock;
     /**
      * 商品重量，单位：kg 千克
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index 456b231b8..a22b68a2c 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -67,11 +67,11 @@ public class ProductSpuDO extends BaseDO {
      */
     private Long brandId;
     /**
-     * 商品主图
-     */
-    private String bannerUrl;
-    /**
-     * 商品轮播图数组
+     * 商品图片的数组
+     *
+     * 1. 第一张图片将作为商品主图，支持同时上传多张图；
+     * 2. 建议使用尺寸 800x800 像素以上、大小不超过 1M 的正方形图片；
+     * 3. 至少 1 张，最多上传 10 张
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> picUrls;
@@ -123,10 +123,6 @@ public class ProductSpuDO extends BaseDO {
      * 基于其对应的 {@link ProductSkuDO#getStock()} 求和
      */
     private Integer totalStock;
-    /**
-     * 预警预存
-     */
-    private Integer warnStock;
     /**
      * 是否展示库存
      */
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index 1f5f191e1..4b299030b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -1,8 +1,7 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExportReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
@@ -24,7 +23,7 @@ public interface ProductSkuService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createSku(@Valid ProductSkuCreateReqVO createReqVO);
+    Long createSku(@Valid ProductSkuCreateOrUpdateReqVO createReqVO);
 
     /**
      * 更新商品sku
@@ -69,7 +68,7 @@ public interface ProductSkuService {
      *
      * @param list sku组合的集合
      */
-    void validateSkus(List<ProductSkuCreateReqVO> list);
+    void validateSkus(List<ProductSkuCreateOrUpdateReqVO> list);
 
     /**
      * 批量保存 sku
@@ -107,5 +106,5 @@ public interface ProductSkuService {
      * @param spuId spu 编码
      * @param skus sku 的集合
      */
-    void updateSkus(Long spuId, List<ProductSkuCreateReqVO> skus);
+    void updateSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus);
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index d15aa5c47..d9e742a1b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -38,7 +38,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     private ProductPropertyService productPropertyService;
 
     @Override
-    public Long createSku(ProductSkuCreateReqVO createReqVO) {
+    public Long createSku(ProductSkuCreateOrUpdateReqVO createReqVO) {
         // 插入
         ProductSkuDO sku = ProductSkuConvert.INSTANCE.convert(createReqVO);
         productSkuMapper.insert(sku);
@@ -87,7 +87,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     // TODO @franky：这个方法，貌似实现的还是有点问题哈。例如说，throw 异常，后面还执行逻辑~
     // TODO @艿艿 咳咳，throw 那里我是偷懒省略了{}，哈哈，我加上，然后我调试下，在优化下
     @Override
-    public void validateSkus(List<ProductSkuCreateReqVO> list) {
+    public void validateSkus(List<ProductSkuCreateOrUpdateReqVO> list) {
         List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> p.getProperties().stream()).collect(Collectors.toList());
         // 校验规格属性以及规格值是否存在
         List<Long> propertyIds = skuPropertyList.stream().map(ProductSkuBaseVO.Property::getPropertyId).collect(Collectors.toList());
@@ -139,7 +139,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
 
     @Override
     @Transactional
-    public void updateSkus(Long spuId, List<ProductSkuCreateReqVO> skus) {
+    public void updateSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus) {
         List<ProductSkuDO> allUpdateSkus = ProductSkuConvert.INSTANCE.convertSkuDOList(skus);
         // 查询 spu 下已经存在的 sku 的集合
         List<ProductSkuDO> existsSkus = productSkuMapper.selectBySpuIds(Collections.singletonList(spuId));
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
index 1cf9b79d4..b3ba4b99f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
@@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.product.service.spu;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
@@ -14,7 +14,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * 商品spu Service 接口
+ * 商品 SPU Service 接口
  *
  * @author 芋道源码
  */
@@ -33,7 +33,7 @@ public interface ProductSpuService {
      *
      * @param updateReqVO 更新信息
      */
-    void updateSpu(@Valid SpuUpdateReqVO updateReqVO);
+    void updateSpu(@Valid ProductSpuUpdateReqVO updateReqVO);
 
     /**
      * 删除商品spu
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 49847f720..95831df5e 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPrope
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyViewRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
@@ -30,7 +30,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
 
 /**
- * 商品spu Service 实现类
+ * 商品 SPU Service 实现类
  *
  * @author 芋道源码
  */
@@ -56,15 +56,11 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         // 校验分类
         categoryService.validateProductCategory(createReqVO.getCategoryId());
         // 校验SKU
-        List<ProductSkuCreateReqVO> skuCreateReqList = createReqVO.getSkus();
+        List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
         productSkuService.validateSkus(skuCreateReqList);
         // 插入SPU
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO);
         ProductSpuMapper.insert(spu);
-        // sku关联SPU属性
-        skuCreateReqList.forEach(p -> {
-            p.setSpuId(spu.getId());
-        });
         List<ProductSkuDO> skuDOList = ProductSkuConvert.INSTANCE.convertSkuDOList(skuCreateReqList);
         // 批量插入sku
         productSkuService.createSkus(skuDOList);
@@ -74,13 +70,13 @@ public class ProductSpuServiceImpl implements ProductSpuService {
 
     @Override
     @Transactional
-    public void updateSpu(SpuUpdateReqVO updateReqVO) {
+    public void updateSpu(ProductSpuUpdateReqVO updateReqVO) {
         // 校验 spu 是否存在
         this.validateSpuExists(updateReqVO.getId());
         // 校验分类
         categoryService.validateProductCategory(updateReqVO.getCategoryId());
         // 校验SKU
-        List<ProductSkuCreateReqVO> skuCreateReqList = updateReqVO.getSkus();
+        List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = updateReqVO.getSkus();
         productSkuService.validateSkus(skuCreateReqList);
         // 更新
         ProductSpuDO updateObj = ProductSpuConvert.INSTANCE.convert(updateReqVO);
@@ -165,9 +161,10 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         List<Long> spuIds = spuVOs.getList().stream().map(SpuRespVO::getId).collect(Collectors.toList());
         List<ProductSkuRespVO> skus = ProductSkuConvert.INSTANCE.convertList(productSkuService.getSkusBySpuIds(spuIds));
         // TODO @franky：使用 CollUtil 里的方法替代哈
-        Map<Long, List<ProductSkuRespVO>> skuMap = skus.stream().collect(Collectors.groupingBy(ProductSkuRespVO::getSpuId));
-        // 将 spu 和 sku 进行组装
-        spuVOs.getList().forEach(p -> p.setSkus(skuMap.get(p.getId())));
+        // TODO 芋艿：临时注释
+//        Map<Long, List<ProductSkuRespVO>> skuMap = skus.stream().collect(Collectors.groupingBy(ProductSkuRespVO::getSpuId));
+//        // 将 spu 和 sku 进行组装
+//        spuVOs.getList().forEach(p -> p.setSkus(skuMap.get(p.getId())));
         return spuVOs;
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
index 2902121e7..be3362f19 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
@@ -37,7 +37,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testCreateSku_success() {
         // 准备参数
-        ProductSkuCreateReqVO reqVO = randomPojo(ProductSkuCreateReqVO.class);
+        ProductSkuCreateOrUpdateReqVO reqVO = randomPojo(ProductSkuCreateOrUpdateReqVO.class);
 
         // 调用
         Long skuId = ProductSkuService.createSku(reqVO);
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
index 4aa0c0e68..57b7fdfeb 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuUpdateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
 import org.junit.jupiter.api.Disabled;
@@ -55,7 +55,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
         ProductSpuDO dbSpu = randomPojo(ProductSpuDO.class);
         ProductSpuMapper.insert(dbSpu);// @Sql: 先插入出一条存在的数据
         // 准备参数
-        SpuUpdateReqVO reqVO = randomPojo(SpuUpdateReqVO.class, o -> {
+        ProductSpuUpdateReqVO reqVO = randomPojo(ProductSpuUpdateReqVO.class, o -> {
             o.setId(dbSpu.getId()); // 设置更新的 ID
         });
 
@@ -69,7 +69,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testUpdateSpu_notExists() {
         // 准备参数
-        SpuUpdateReqVO reqVO = randomPojo(SpuUpdateReqVO.class);
+        ProductSpuUpdateReqVO reqVO = randomPojo(ProductSpuUpdateReqVO.class);
 
         // 调用, 并断言异常
         assertServiceException(() -> spuService.updateSpu(reqVO), SPU_NOT_EXISTS);

From 81666e3b6207e96bd4b7e7f35ad7a1ad8289adcb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 23 Aug 2022 00:38:49 +0800
Subject: [PATCH 38/56] =?UTF-8?q?mall=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=92=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20VO=EF=BC=9B=E5=BE=AE=E8=B0=83=E5=95=86=E5=93=81=E7=9A=84=20S?=
 =?UTF-8?q?PU/SKU=20=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/product/service/sku/ProductSkuServiceImpl.java   | 6 ++----
 .../module/product/service/spu/ProductSpuServiceImpl.java   | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index c8172d157..ea9e97c81 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -2,12 +2,10 @@ package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
@@ -90,7 +88,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     }
 
     @Override
-    public void validateSkus(List<ProductSkuCreateReqVO> list) {
+    public void validateSkus(List<ProductSkuCreateOrUpdateReqVO> list) {
         List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> Optional.of(p.getProperties()).orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
         // 校验规格属性以及规格值是否存在
         List<Long> propertyIds = skuPropertyList.stream().map(ProductSkuBaseVO.Property::getPropertyId).collect(Collectors.toList());
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 1ff0a0340..4fad20bbd 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -56,7 +56,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         // 校验分类
         categoryService.validateProductCategory(createReqVO.getCategoryId());
         // 校验SKU
-        List<ProductSkuCreateReqVO> skuCreateReqList = createReqVO.getSkus();
+        List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
         if(createReqVO.getSpecType() == 1) {
             productSkuService.validateSkus(skuCreateReqList);
         }
@@ -78,7 +78,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         // 校验分类
         categoryService.validateProductCategory(updateReqVO.getCategoryId());
         // 校验SKU
-        List<ProductSkuCreateReqVO> skuCreateReqList = updateReqVO.getSkus();
+        List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = updateReqVO.getSkus();
         if(updateReqVO.getSpecType() == 1) {
             productSkuService.validateSkus(skuCreateReqList);
         }

From 8ad1439fda6e05f59a710fca7b24df5887a0639c Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Tue, 23 Aug 2022 20:27:39 +0800
Subject: [PATCH 39/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sku/vo/ProductSkuBaseVO.java        |   7 +-
 .../admin/spu/vo/ProductSpuBaseVO.java        |   3 +-
 .../service/spu/ProductSpuServiceImpl.java    |  11 +-
 .../src/components/ImageUpload/index.vue      |   4 +-
 .../src/views/mall/product/spu/index.vue      |   2 +-
 .../src/views/mall/product/spu/save.vue       | 222 +++++++++++-------
 6 files changed, 156 insertions(+), 93 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
index 38bdd61bf..07fddc9ac 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
@@ -21,10 +21,7 @@ public class ProductSkuBaseVO {
     @NotEmpty(message = "商品 SKU 名字不能为空")
     private String name;
 
-    /**
-     * 规格值数组
-     */
-    @NotNull(message = "规格值数组不能为空")
+    @ApiModelProperty(value = "规格值数组-json格式 单规格中无此列表， [{propertyId: , valueId: }, {propertyId: , valueId: }]")
     private List<Property> properties;
 
     @ApiModelProperty(value = "销售价格，单位：分", required = true, example = "1024", notes = "单位：分")
@@ -32,7 +29,7 @@ public class ProductSkuBaseVO {
     private Integer price;
 
     @ApiModelProperty(value = "市场价", example = "1024", notes = "单位：分")
-    private Integer originalPrice;
+    private Integer marketPrice;
 
     @ApiModelProperty(value = "成本价", example = "1024", notes = "单位：分")
     private Integer costPrice;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
index 0fde8d976..c320f902f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
@@ -36,7 +36,7 @@ public class ProductSpuBaseVO {
     private Long categoryId;
 
     @ApiModelProperty(value = "商品品牌编号", required = true, example = "1")
-    @NotNull(message = "商品品牌编号不能为空")
+//    @NotNull(message = "商品品牌编号不能为空")
     private Long brandId;
 
     @ApiModelProperty(value = "商品图片的数组", required = true)
@@ -44,7 +44,6 @@ public class ProductSpuBaseVO {
     private List<String> picUrls;
 
     @ApiModelProperty(value = "商品视频", required = true)
-    @NotEmpty(message = "商品视频不能为空")
     private String videoUrl;
 
     @ApiModelProperty(value = "排序字段", required = true, example = "1")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 4fad20bbd..988f8e1df 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
 import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
@@ -57,13 +58,18 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         categoryService.validateProductCategory(createReqVO.getCategoryId());
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
-        if(createReqVO.getSpecType() == 1) {
+        // 多规格才需校验
+        if(Objects.equals(createReqVO.getSpecType(), ProductSpuSpecTypeEnum.DISABLE.getType())) {
             productSkuService.validateSkus(skuCreateReqList);
         }
         // 插入SPU
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO);
+        spu.setMarketPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getMarketPrice).max(Integer::compare).orElse(0));
+        spu.setMaxPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getPrice).max(Integer::compare).orElse(0));
+        spu.setMinPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getPrice).min(Integer::compare).orElse(0));
         ProductSpuMapper.insert(spu);
         List<ProductSkuDO> skuDOList = ProductSkuConvert.INSTANCE.convertSkuDOList(skuCreateReqList);
+        skuDOList.forEach(v->v.setSpuId(spu.getId()));
         // 批量插入sku
         productSkuService.createSkus(skuDOList);
         // 返回
@@ -79,7 +85,8 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         categoryService.validateProductCategory(updateReqVO.getCategoryId());
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = updateReqVO.getSkus();
-        if(updateReqVO.getSpecType() == 1) {
+        // 多规格才需校验
+        if(updateReqVO.getSpecType().equals(ProductSpuSpecTypeEnum.DISABLE.getType())) {
             productSkuService.validateSkus(skuCreateReqList);
         }
         // 更新
diff --git a/yudao-ui-admin/src/components/ImageUpload/index.vue b/yudao-ui-admin/src/components/ImageUpload/index.vue
index 3f2bda7cc..08ff0f8fe 100644
--- a/yudao-ui-admin/src/components/ImageUpload/index.vue
+++ b/yudao-ui-admin/src/components/ImageUpload/index.vue
@@ -85,8 +85,8 @@ export default {
     value: {
       handler(val) {
         if (val) {
-          // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          // 首先将值转为数组, 当只穿了一个图片时，会报map方法错误
+          const list = Array.isArray(val) ? val :  Array.isArray(this.value.split(',')) ? this.value.split(','): Array.of(this.value);
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 00ee1ed3f..e9f59febc 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -178,7 +178,7 @@
     />
 
 
-    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close :close-on-click-modal="false" >
       <save @closeDialog="open = false; getList()"/>
     </el-dialog>
   </div>
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 556bd816b..632c00744 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="container">
-    <el-tabs v-model="activeName" class="tabs">
+    <el-tabs v-model="activeName" class="tabs"  :before-leave="confirmLeave">
       <!-- 基础设置 -->
       <el-tab-pane label="基础设置" name="base">
-        <el-form ref="baseForm" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
+        <el-form ref="base" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
           <el-form-item label="商品名称" prop="name">
             <el-input v-model="baseForm.name" placeholder="请输入商品名称"/>
           </el-form-item>
-          <el-form-item label="卖点" prop="sellPoint">
+          <el-form-item label="卖点">
             <el-input v-model="baseForm.sellPoint" placeholder="请输入卖点"/>
           </el-form-item>
           <el-form-item label="分类id" prop="categoryIds">
@@ -20,30 +20,27 @@
               clearable
             ></el-cascader>
           </el-form-item>
-          <el-form-item label="商品主图" prop="bannerUrl">
-            <ImageUpload v-model="baseForm.bannerUrl" :limit="1"/>
-          </el-form-item>
           <el-form-item label="商品轮播图" prop="picUrls">
-            <ImageUpload v-model="baseForm.picUrls" :limit="10"/>
+            <ImageUpload v-model="baseForm.picUrls" :value="baseForm.picUrls" :limit="10"/>
           </el-form-item>
-          <el-form-item label="排序字段" prop="sort">
-            <el-input v-model="baseForm.sort" placeholder="请输入排序字段"/>
+          <el-form-item label="排序字段">
+            <el-input v-model="baseForm.sort" placeholder="请输入排序字段" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
           </el-form-item>
         </el-form>
       </el-tab-pane>
 
       <!-- 价格库存 -->
       <el-tab-pane label="价格库存" name="rates" class="rates">
-        <el-form :model="ratesForm" :rules="rules.ratesForm">
+        <el-form ref="rates" :model="ratesForm" :rules="rules">
           <el-form-item label="商品规格">
             <el-radio-group v-model="ratesForm.spec" @change="changeRadio">
-              <el-radio :label="0">单规格</el-radio>
-              <el-radio :label="1">多规格</el-radio>
+              <el-radio :label="1">单规格</el-radio>
+              <el-radio :label="2">多规格</el-radio>
             </el-radio-group>
           </el-form-item>
 
           <!-- 动态添加规格属性 -->
-          <div v-show="ratesForm.spec === 1">
+          <div v-show="ratesForm.spec === 2">
             <div
               v-for="(specs, index) in dynamicSpec"
               :key="index"
@@ -71,14 +68,8 @@
               </div>
               <div class="spec-values">
                 <template v-for="(v, i) in specs.specValue">
-                  <el-input v-model="v.name" class="spec-value" :key="i"/>
+                  <el-input v-model="v.name" class="spec-value" :key="i" disabled/>
                 </template>
-                <!-- <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  circle
-                  @click="dialogForSpec = true; currentSpec = index"
-                ></el-button> -->
               </div>
             </div>
             <el-button type="primary" @click="dynamicSpec.push({specValue: []}); ratesForm.rates = []"
@@ -89,9 +80,8 @@
 
           <!-- 规格明细 -->
           <el-form-item label="规格明细">
-            <el-table :data="ratesForm.rates" border style="width: 100%" ref="rates">
-
-              <template v-if="ratesForm.spec == 1">
+            <el-table :data="ratesForm.rates" border style="width: 100%" ref="ratesTable">
+              <template v-if="ratesForm.spec == 2">
                 <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v=>v.specName != undefined)"
                                  :label="item.specName">
                   <template slot-scope="scope">
@@ -103,54 +93,90 @@
                   </template>
                 </el-table-column>
               </template>
-
-              <el-table-column label="规格图片" width="120px">
+              <el-table-column label="规格图片" width="120px" :render-header="addRedStar" key="90">
                 <template slot-scope="scope">
-                  <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false"
+                    <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false"
                                style="width: 100px; height: 50px"/>
                 </template>
               </el-table-column>
-              <el-table-column label="市场价(元)">
+              <template v-if="ratesForm.spec == 2">
+               <el-table-column label="sku名称" :render-header="addRedStar" key="91">
+                  <template slot-scope="scope">
+                  <el-form-item :prop="'rates.'+ scope.$index + '.name'" :rules="[{required: true, trigger: 'change'}]">
+                      <el-input
+                        v-model="scope.row.name"
+                      ></el-input>
+                      </el-form-item>
+                  </template>
+                </el-table-column>
+                </template>
+
+              <el-table-column label="市场价(元)" :render-header="addRedStar" key="92">
                 <template slot-scope="scope">
-                  <el-input
-                    v-model="scope.row.marketPrice"
-                    type="number"
-                  ></el-input>
+                  <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'" :rules="[{required: true, trigger: 'change'}]">
+                    <el-input
+                      v-model="scope.row.marketPrice"
+                      oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"
+                    ></el-input>
+                  </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="销售价(元)" re>
+              <el-table-column label="销售价(元)" :render-header="addRedStar" key="93">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.price" type="number"></el-input>
+                 <el-form-item :prop="'rates.'+ scope.$index + '.price'" :rules="[{required: true, trigger: 'change'}]">
+                  <el-input v-model="scope.row.price" oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"></el-input>
+                  </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="成本价">
+              <el-table-column label="成本价" :render-header="addRedStar" key="94">
                 <template slot-scope="scope">
+                <el-form-item :prop="'rates.'+ scope.$index + '.costPrice'" :rules="[{required: true, trigger: 'change'}]">
                   <el-input
                     v-model="scope.row.costPrice"
-                    type="number"
+                    oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"
                   ></el-input>
+                  </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="库存">
+              <el-table-column label="库存" :render-header="addRedStar" key="95">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.stock" type="number"></el-input>
+                  <el-form-item :prop="'rates.'+ scope.$index + '.stock'" :rules="[{required: true, trigger: 'change'}]">
+                    <el-input v-model="scope.row.stock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
+                  </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="体积">
+              <el-table-column label="预警库存" key="96">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.volume" type="number"></el-input>
+                  <el-input v-model="scope.row.warnStock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column label="重量">
+              <el-table-column label="体积" key="97">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.weight" type="number"></el-input>
+                  <el-input v-model="scope.row.volume" ></el-input>
                 </template>
               </el-table-column>
-              <el-table-column label="条码">
+              <el-table-column label="重量" key="98">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.weight" ></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="条码" key="99">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.barCode"></el-input>
                 </template>
               </el-table-column>
+               <template v-if="ratesForm.spec == 2">
+                <el-table-column
+                  fixed="right"
+                  label="操作"
+                  width="50"
+                  key="100">
+                  <template slot-scope="scope">
+                    <el-button @click="scope.row.status = 1" type="text" size="small" v-show="scope.row.status == undefined || scope.row.status == 0 ">禁用</el-button>
+                    <el-button @click="scope.row.status = 0" type="text" size="small" v-show="scope.row.status == 1">启用</el-button>
+                  </template>
+                </el-table-column>
+              </template>
             </el-table>
           </el-form-item>
         </el-form>
@@ -158,16 +184,26 @@
 
       <!-- 商品详情 -->
       <el-tab-pane label="商品描述" name="third">
-        <editor v-model="baseForm.description" :min-height="400"/>
+      <el-form ref="third" :model="baseForm" :rules="rules">
+        <el-form-item prop="description">
+          <editor v-model="baseForm.description" :min-height="380"/>
+        </el-form-item>
+      </el-form>
       </el-tab-pane>
 
       <!-- 销售设置 -->
       <el-tab-pane label="销售设置" name="fourth">
-        <el-form ref="baseForm" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
-          <el-form-item label="库存数量" prop="totalStock">
-            <el-input v-model="baseForm.totalStock" placeholder="请输入库存数量"/>
+        <el-form ref="fourth" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
+          <el-form-item label="虚拟销量" prop="virtualSalesCount">
+            <el-input v-model="baseForm.virtualSalesCount" placeholder="请输入虚拟销量" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
           </el-form-item>
-          <el-form-item label="上下架状态" prop="status">
+           <el-form-item label="是否展示库存" prop="showStock">
+             <el-radio-group v-model="baseForm.showStock">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="商品状态" prop="status">
             <el-radio-group v-model="baseForm.status">
               <el-radio :label="0">上架</el-radio>
               <el-radio :label="1">下架</el-radio>
@@ -212,15 +248,15 @@ export default {
         categoryIds: null,
         sort: null,
         description: null,
-        bannerUrl: null,
-        picUrls: [],
-        totalStock: null,
-        status: 0
+        picUrls: null,
+        status: 0,
+        virtualSalesCount: 0,
+        showStock: true,
       },
       categoryList: [],
       // 价格库存
       ratesForm: {
-        spec: 0,
+        spec: 1,
         // 规格明细
         rates: [{}]
       },
@@ -239,28 +275,39 @@ export default {
 
       // 表单校验
       rules: {
-        description: [
-          {required: true, message: "描述不能为空", trigger: "blur"},
-        ],
-        categoryIds: [
-          {required: true, message: "分类id不能为空", trigger: "blur"},
-        ],
-        bannerUrl: [{required: true, message: "商品主图地址", trigger: "blur"}],
-        sort: [
-          {required: true, message: "排序字段不能为空", trigger: "blur"},
-        ],
+        name:[{required: true, message: "商品名称不能为空", trigger: "blur"},],
+        description: [{required: true, message: "描述不能为空", trigger: "blur"},],
+        categoryIds: [{required: true, message: "分类id不能为空", trigger: "blur"},],
+        status: [{required: true, message: "商品状态不能为空", trigger: "blur"}],
+        picUrls: [{required: true, message: "商品轮播图地址不能为空", trigger: "blur"}],
+        virtualSalesCount: [{required: true, message: "虚拟销量不能为空", trigger: "blur"}],
       },
     };
   },
+
   created() {
     this.getListCategory();
     this.getPropertyPageList();
   },
   methods: {
+    async confirmLeave(active, old){
+      await this.$refs[old].validate((valid) => {
+        console.log(valid)
+        if (!valid) {
+          return reject();
+        }
+      });
+    },
+    // 必选标识
+    addRedStar(h, { column }) {
+      return [
+        h('span', { style: 'color: #F56C6C' }, '*'),
+        h('span', ' ' + column.label)
+      ];
+    },
     changeRadio() {
-
-      this.$refs.rates.doLayout()
-      if (this.ratesForm.spec == 0) {
+      this.$refs.ratesTable.doLayout()
+      if (this.ratesForm.spec == 1) {
         this.ratesForm.rates = [{}]
       } else {
         this.ratesForm.rates = []
@@ -289,7 +336,7 @@ export default {
           return array;
         })
         .forEach(v => {
-          rates.push({spec: v})
+          rates.push({spec: v, status: 0, name: Array.of(v).join()})
         });
       this.ratesForm.rates = rates
     },
@@ -304,38 +351,51 @@ export default {
       this.$emit("closeDialog");
     },
     submit() {
+       this.$refs[this.activeName].validate((valid) => {
+        if (!valid) {
+          return;
+        }
       let rates = this.ratesForm.rates;
       // 动态规格调整字段
-      if (this.ratesForm.spec == 1) {
+      if (this.ratesForm.spec == 2) {
         rates.forEach(r => {
           let properties = []
-          if(r.spec instanceof Array){
-            r.spec.forEach((v, i) => {
+            Array.of(r.spec).forEach((v, i) => {
               let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
               let propertie = {};
               propertie.propertyId = this.dynamicSpec[i].specId;
               propertie.valueId = specValue.id;
               properties.push(propertie);
             })
-          }else{
-              let specValue = this.dynamicSpec[0].specValue.find(o => o.name == r.spec);
-              let propertie = {};
-              propertie.propertyId = this.dynamicSpec[0].specId;
-              propertie.valueId = specValue.id;
-              properties.push(propertie);
-          }
           r.properties = properties;
         })
+      }else{
+        rates[0].name = this.baseForm.name;
+        rates[0].status = this.baseForm.status;
       }
-      this.baseForm.skus = rates;
-      this.baseForm.specType = this.ratesForm.spec;
-      this.baseForm.categoryId = this.baseForm.categoryIds[this.baseForm.categoryIds.length - 1];
-      createSpu(this.baseForm).then((response) => {
+
+      console.log(rates)
+
+      let form = this.baseForm
+      if(form.picUrls instanceof Array){
+        form.picUrls = form.picUrls.flatMap(m=>m.split(','))
+      }else if(form.picUrls.split(',') instanceof Array){
+        form.picUrls = form.picUrls.split(',').flatMap(m=>m.split(','))
+      }else{
+        form.picUrls = Array.of(form.picUrls)
+      }
+
+      form.skus = rates;
+      form.specType = this.ratesForm.spec;
+      form.categoryId = form.categoryIds[this.baseForm.categoryIds.length - 1];
+      createSpu(form).then((response) => {
         console.log(response)
         this.$modal.msgSuccess("新增成功");
         this.$emit("closeDialog");
+        }).catch((err) => {
+          console.log(this.baseForm.picUrls)
+        });
       });
-
     },
     /** 查询规格 */
     getPropertyPageList() {

From edfe379848de5b5febbcc482f52b57acd3b836bb Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Tue, 23 Aug 2022 21:06:59 +0800
Subject: [PATCH 40/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E5=A4=9A=E8=A7=84=E6=A0=BC=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mall/product/spu/save.vue       | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 632c00744..2cd3eeaf6 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -52,9 +52,8 @@
                 icon="el-icon-delete"
                 circle
                 class="spec-delete"
-                @click="dynamicSpec.splice(index, 1)"
+                @click="removeSpec(index)"
               ></el-button>
-
               <div class="spec-header">
                 规格项：
                 <el-select v-model="specs.specId" filterable placeholder="请选择" @change="changeSpec">
@@ -286,10 +285,15 @@ export default {
   },
 
   created() {
+
     this.getListCategory();
     this.getPropertyPageList();
   },
   methods: {
+    removeSpec(index){
+        this.dynamicSpec.splice(index, 1);
+        this.changeRadio()
+    },
     async confirmLeave(active, old){
       await this.$refs[old].validate((valid) => {
         console.log(valid)
@@ -306,12 +310,13 @@ export default {
       ];
     },
     changeRadio() {
-      this.$refs.ratesTable.doLayout()
+      this.$refs.ratesTable.doLayout();
       if (this.ratesForm.spec == 1) {
         this.ratesForm.rates = [{}]
       } else {
         this.ratesForm.rates = []
         if (this.dynamicSpec.length > 0) {
+          console.log( this.dynamicSpec)
           this.buildRatesFormRates()
         }
       }
@@ -360,12 +365,16 @@ export default {
       if (this.ratesForm.spec == 2) {
         rates.forEach(r => {
           let properties = []
-            Array.of(r.spec).forEach((v, i) => {
-              let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
-              let propertie = {};
-              propertie.propertyId = this.dynamicSpec[i].specId;
-              propertie.valueId = specValue.id;
-              properties.push(propertie);
+            Array.of(r.spec).forEach(s => {
+              Array.of(s).forEach((v, i) => {
+                console.log(this.dynamicSpec, r, s, v, i)
+                let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
+                console.log(specValue)
+                let propertie = {};
+                propertie.propertyId = this.dynamicSpec[i].specId;
+                propertie.valueId = specValue.id;
+                properties.push(propertie);
+              })
             })
           r.properties = properties;
         })

From c2fd24f597003ea04ff8e726c85c169735f8e0c3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 23 Aug 2022 23:58:22 +0800
Subject: [PATCH 41/56] =?UTF-8?q?mall=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=20spu=20=E7=9A=84=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sku/vo/ProductSkuBaseVO.java        |  4 +-
 .../admin/spu/ProductSpuController.java       |  6 +--
 .../dal/mysql/sku/ProductSkuMapper.java       |  1 +
 .../service/sku/ProductSkuService.java        | 23 +++++-----
 .../service/sku/ProductSkuServiceImpl.java    | 33 ++++++++-------
 .../service/spu/ProductSpuService.java        |  8 ++--
 .../service/spu/ProductSpuServiceImpl.java    | 42 +++++++++++++------
 .../spu/ProductSpuServiceImplTest.java        |  6 +--
 8 files changed, 74 insertions(+), 49 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
index 07fddc9ac..c6d8b5459 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
@@ -21,7 +21,9 @@ public class ProductSkuBaseVO {
     @NotEmpty(message = "商品 SKU 名字不能为空")
     private String name;
 
-    @ApiModelProperty(value = "规格值数组-json格式 单规格中无此列表， [{propertyId: , valueId: }, {propertyId: , valueId: }]")
+    /**
+     * 规格值数组
+     */
     private List<Property> properties;
 
     @ApiModelProperty(value = "销售价格，单位：分", required = true, example = "1024", notes = "单位：分")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
index 7aa73068f..565a20c7b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
@@ -35,15 +35,15 @@ public class ProductSpuController {
     @PostMapping("/create")
     @ApiOperation("创建商品 SPU")
     @PreAuthorize("@ss.hasPermission('product:spu:create')")
-    public CommonResult<Long> createSpu(@Valid @RequestBody ProductSpuCreateReqVO createReqVO) {
-        return success(spuService.createSpu(createReqVO));
+    public CommonResult<Long> createProductSpu(@Valid @RequestBody ProductSpuCreateReqVO createReqVO) {
+        return success(spuService.createProductSpu(createReqVO));
     }
 
     @PutMapping("/update")
     @ApiOperation("更新商品 SPU")
     @PreAuthorize("@ss.hasPermission('product:spu:update')")
     public CommonResult<Boolean> updateSpu(@Valid @RequestBody ProductSpuUpdateReqVO updateReqVO) {
-        spuService.updateSpu(updateReqVO);
+        spuService.updateProductSpu(updateReqVO);
         return success(true);
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index eff999be0..134631650 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -44,4 +44,5 @@ public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
                 .eqIfPresent(ProductSkuDO::getSpuId, spuId);
         delete(lambdaQueryWrapperX);
     }
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index 4b299030b..20c7680bf 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -68,14 +68,22 @@ public interface ProductSkuService {
      *
      * @param list sku组合的集合
      */
-    void validateSkus(List<ProductSkuCreateOrUpdateReqVO> list);
+    void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list);
 
     /**
-     * 批量保存 sku
+     * 批量创建 SKU
      *
-     * @param list sku对象集合
+     * @param list SKU 对象集合
      */
-    void createSkus(List<ProductSkuDO> list);
+    void createProductSkus(List<ProductSkuDO> list);
+
+    /**
+     * 根据 SPU 编号，批量更新它的 SKU 信息
+     *
+     * @param spuId SPU 编码
+     * @param skus SKU 的集合
+     */
+    void updateProductSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus);
 
     /**
      * 获得商品 sku 集合
@@ -100,11 +108,4 @@ public interface ProductSkuService {
      */
     void deleteSkuBySpuId(Long spuId);
 
-    /**
-     * 根据 spuId 更新 spu 下的 sku 信息
-     *
-     * @param spuId spu 编码
-     * @param skus sku 的集合
-     */
-    void updateSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus);
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index ea9e97c81..50408bcb3 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
@@ -87,25 +86,30 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         return productSkuMapper.selectPage(pageReqVO);
     }
 
+    // TODO luowenfeng：参考下 yudao-cloud 的 checkProductAttr 方法，重构下
     @Override
-    public void validateSkus(List<ProductSkuCreateOrUpdateReqVO> list) {
+    public void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list) {
         List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> Optional.of(p.getProperties()).orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
-        // 校验规格属性以及规格值是否存在
+        // 校验规格属性存在
+        // TODO @luowenfeng：使用 CollectionUtils.convert
         List<Long> propertyIds = skuPropertyList.stream().map(ProductSkuBaseVO.Property::getPropertyId).collect(Collectors.toList());
         List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(propertyIds);
+        // TODO @luowenfeng：校验数量一致；
         if (propertyAndValueList.isEmpty()) {
-            throw ServiceExceptionUtil.exception(PROPERTY_NOT_EXISTS);
+            throw exception(PROPERTY_NOT_EXISTS);
         }
+        // 校验规格属性值存在
+        // TODO @luowenfeng：使用 CollectionUtils.convert
         Map<Long, ProductPropertyRespVO> propertyMap = propertyAndValueList.stream().collect(Collectors.toMap(ProductPropertyRespVO::getId, p -> p));
         skuPropertyList.forEach(p -> {
             ProductPropertyRespVO productPropertyRespVO = propertyMap.get(p.getPropertyId());
             // 如果对应的属性名不存在或属性名下的属性值集合为空，给出提示
             if (null == productPropertyRespVO || productPropertyRespVO.getPropertyValueList().isEmpty()) {
-                throw ServiceExceptionUtil.exception(PROPERTY_NOT_EXISTS);
+                throw exception(PROPERTY_NOT_EXISTS);
             }
             // 判断改属性名对应的属性值是否存在,不存在，给出提示
             if (!productPropertyRespVO.getPropertyValueList().stream().map(ProductPropertyValueRespVO::getId).collect(Collectors.toSet()).contains(p.getValueId())) {
-                throw ServiceExceptionUtil.exception(ErrorCodeConstants.PROPERTY_VALUE_NOT_EXISTS);
+                throw exception(ErrorCodeConstants.PROPERTY_VALUE_NOT_EXISTS);
             }
         });
         // 校验是否有重复的sku组合
@@ -114,13 +118,13 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         skuProperties.forEach(p -> {
             // 组合属性值id为 1~2~3.... 形式的字符串，通过set的特性判断是否有重复的组合
             if (!skuPropertiesConvertSet.add(p.stream().map(pr -> String.valueOf(pr.getValueId())).sorted().collect(Collectors.joining("～")))) {
-                throw ServiceExceptionUtil.exception(ErrorCodeConstants.SKU_PROPERTIES_DUPLICATED);
+                throw exception(ErrorCodeConstants.SKU_PROPERTIES_DUPLICATED);
             }
         });
     }
 
     @Override
-    public void createSkus(List<ProductSkuDO> skuDOList) {
+    public void createProductSkus(List<ProductSkuDO> skuDOList) {
         productSkuMapper.insertBatch(skuDOList);
     }
 
@@ -141,21 +145,23 @@ public class ProductSkuServiceImpl implements ProductSkuService {
 
     @Override
     @Transactional
-    public void updateSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus) {
-        List<ProductSkuDO> allUpdateSkus = ProductSkuConvert.INSTANCE.convertSkuDOList(skus);
+    public void updateProductSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus) {
         // 查询 spu 下已经存在的 sku 的集合
+        // TODO @luowenfeng：selectListBySpuId 搞个
         List<ProductSkuDO> existsSkus = productSkuMapper.selectBySpuIds(Collections.singletonList(spuId));
         // TODO @franky：使用 CollUtils 即可
         Map<Long, ProductSkuDO> existsSkuMap = existsSkus.stream().collect(Collectors.toMap(ProductSkuDO::getId, p -> p));
 
-        // 拆分三个集合， 新插入的， 需要更新的，需要删除的
+        // 拆分三个集合，新插入的、需要更新的、需要删除的
         List<ProductSkuDO> insertSkus = new ArrayList<>();
         List<ProductSkuDO> updateSkus = new ArrayList<>();
         List<ProductSkuDO> deleteSkus = new ArrayList<>();
 
         // TODO @芋艿：是不是基于规格匹配会比较好。
+        List<ProductSkuDO> allUpdateSkus = ProductSkuConvert.INSTANCE.convertSkuDOList(skus);
         allUpdateSkus.forEach(p -> {
-            if (null != p.getId()) {
+            if (p.getId() != null) {
+                // TODO @luowenfeng：contains
                 if (existsSkuMap.get(p.getId()) != null) {
                     updateSkus.add(p);
                     return;
@@ -167,14 +173,13 @@ public class ProductSkuServiceImpl implements ProductSkuService {
             insertSkus.add(p);
         });
 
+        // TODO @luowenfeng：使用 CollUtil.isNotEmpty 判断
         if (insertSkus.size() > 0) {
             productSkuMapper.insertBatch(insertSkus);
         }
-
         if (updateSkus.size() > 0) {
             updateSkus.forEach(p -> productSkuMapper.updateById(p));
         }
-
         if (deleteSkus.size() > 0) {
             productSkuMapper.deleteBatchIds(deleteSkus.stream().map(ProductSkuDO::getId).collect(Collectors.toList()));
         }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
index b3ba4b99f..37883b677 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
@@ -21,19 +21,19 @@ import java.util.List;
 public interface ProductSpuService {
 
     /**
-     * 创建商品spu
+     * 创建商品 SPU
      *
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createSpu(@Valid ProductSpuCreateReqVO createReqVO);
+    Long createProductSpu(@Valid ProductSpuCreateReqVO createReqVO);
 
     /**
-     * 更新商品spu
+     * 更新商品 SPU
      *
      * @param updateReqVO 更新信息
      */
-    void updateSpu(@Valid ProductSpuUpdateReqVO updateReqVO);
+    void updateProductSpu(@Valid ProductSpuUpdateReqVO updateReqVO);
 
     /**
      * 删除商品spu
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 988f8e1df..26c564f34 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -7,7 +7,10 @@ import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.Product
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
@@ -53,47 +56,60 @@ public class ProductSpuServiceImpl implements ProductSpuService {
 
     @Override
     @Transactional
-    public Long createSpu(ProductSpuCreateReqVO createReqVO) {
+    public Long createProductSpu(ProductSpuCreateReqVO createReqVO) {
         // 校验分类
+        // TODO @luowenfeng：可以在这个类里加个方法，校验分类；商品必须挂在三级分类下；
         categoryService.validateProductCategory(createReqVO.getCategoryId());
+        // TODO @luowenfeng：校验品牌
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
         // 多规格才需校验
+        // TODO @luowenfeng：可以把 type 传递到 productSkuService 里，通过它统一判断处理
         if(Objects.equals(createReqVO.getSpecType(), ProductSpuSpecTypeEnum.DISABLE.getType())) {
-            productSkuService.validateSkus(skuCreateReqList);
+            productSkuService.validateProductSkus(skuCreateReqList);
         }
-        // 插入SPU
+
+        // 插入 SPU
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO);
+        // TODO @luowenfeng：可以在 CollectionUtils 增加 getMaxValue 方法，增加一个 defaultValue 方法，如果为空，则返回 defaultValue
         spu.setMarketPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getMarketPrice).max(Integer::compare).orElse(0));
         spu.setMaxPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getPrice).max(Integer::compare).orElse(0));
         spu.setMinPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getPrice).min(Integer::compare).orElse(0));
+        // TODO @luowenfeng：库存求和
         ProductSpuMapper.insert(spu);
+
+        // 批量插入 SKU
+        // TODO @luowenfeng：convert 逻辑，交给 createProductSkus 一起处理
         List<ProductSkuDO> skuDOList = ProductSkuConvert.INSTANCE.convertSkuDOList(skuCreateReqList);
         skuDOList.forEach(v->v.setSpuId(spu.getId()));
-        // 批量插入sku
-        productSkuService.createSkus(skuDOList);
+        productSkuService.createProductSkus(skuDOList);
         // 返回
         return spu.getId();
     }
 
     @Override
     @Transactional
-    public void updateSpu(ProductSpuUpdateReqVO updateReqVO) {
-        // 校验 spu 是否存在
-        this.validateSpuExists(updateReqVO.getId());
+    public void updateProductSpu(ProductSpuUpdateReqVO updateReqVO) {
+        // 校验 SPU 是否存在
+        validateSpuExists(updateReqVO.getId());
         // 校验分类
         categoryService.validateProductCategory(updateReqVO.getCategoryId());
+        // TODO @luowenfeng：校验品牌
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = updateReqVO.getSkus();
         // 多规格才需校验
+        // TODO @luowenfeng：可以把 type 传递到 productSkuService 里，通过它统一判断处理
         if(updateReqVO.getSpecType().equals(ProductSpuSpecTypeEnum.DISABLE.getType())) {
-            productSkuService.validateSkus(skuCreateReqList);
+            productSkuService.validateProductSkus(skuCreateReqList);
         }
-        // 更新
+
+        // 更新 SPU
         ProductSpuDO updateObj = ProductSpuConvert.INSTANCE.convert(updateReqVO);
+        // TODO @计算各种字段
         ProductSpuMapper.updateById(updateObj);
-        // 更新 sku
-        productSkuService.updateSkus(updateObj.getId(), updateReqVO.getSkus());
+
+        // 更新 SKU
+        productSkuService.updateProductSkus(updateObj.getId(), updateReqVO.getSkus());
     }
 
     @Override
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
index 57b7fdfeb..e2b3a3d98 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
@@ -41,7 +41,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
         ProductSpuCreateReqVO reqVO = randomPojo(ProductSpuCreateReqVO.class);
 
         // 调用
-        Long spuId = spuService.createSpu(reqVO);
+        Long spuId = spuService.createProductSpu(reqVO);
         // 断言
         assertNotNull(spuId);
         // 校验记录的属性是否正确
@@ -60,7 +60,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
         });
 
         // 调用
-        spuService.updateSpu(reqVO);
+        spuService.updateProductSpu(reqVO);
         // 校验是否更新正确
         ProductSpuDO spu = ProductSpuMapper.selectById(reqVO.getId()); // 获取最新的
         assertPojoEquals(reqVO, spu);
@@ -72,7 +72,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
         ProductSpuUpdateReqVO reqVO = randomPojo(ProductSpuUpdateReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> spuService.updateSpu(reqVO), SPU_NOT_EXISTS);
+        assertServiceException(() -> spuService.updateProductSpu(reqVO), SPU_NOT_EXISTS);
     }
 
     @Test

From 0bc2ef1d39ad12b1f3ba8b0adf9d185b9f57619d Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Wed, 24 Aug 2022 14:08:32 +0800
Subject: [PATCH 42/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/collection/CollectionUtils.java      | 17 +++++
 .../product/enums/ErrorCodeConstants.java     |  5 ++
 .../category/ProductCategoryServiceImpl.java  | 12 ++++
 .../service/sku/ProductSkuService.java        |  4 +-
 .../service/sku/ProductSkuServiceImpl.java    | 71 +++++++++++--------
 .../service/spu/ProductSpuServiceImpl.java    | 30 +++-----
 6 files changed, 86 insertions(+), 53 deletions(-)

diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
index 6b83bb3d6..d57fb21b9 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
@@ -173,6 +173,23 @@ public class CollectionUtils {
         return valueFunc.apply(t);
     }
 
+    public static <T, V extends Comparable<? super V>> V getMinValue(List<T> from, Function<T, V> valueFunc) {
+        if (CollUtil.isEmpty(from)) {
+            return null;
+        }
+        assert from.size() > 0; // 断言，避免告警
+        T t = from.stream().min(Comparator.comparing(valueFunc)).get();
+        return valueFunc.apply(t);
+    }
+
+    public static <T, V extends Comparable<? super V>> V getSumValue(List<T> from, Function<T, V> valueFunc, BinaryOperator<V> accumulator) {
+        if (CollUtil.isEmpty(from)) {
+            return null;
+        }
+        assert from.size() > 0; // 断言，避免告警
+        return from.stream().map(valueFunc).reduce(accumulator).get();
+    }
+
     public static <T> void addIfNotNull(Collection<T> coll, T item) {
         if (item == null) {
             return;
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
index 0c47d9406..454314e78 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
@@ -15,6 +15,7 @@ public interface ErrorCodeConstants {
     ErrorCode PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL = new ErrorCode(1008001002, "父分类不能是二级分类");
     ErrorCode PRODUCT_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1008001003, "存在子分类，无法删除");
     ErrorCode PRODUCT_CATEGORY_DISABLED = new ErrorCode(1008001004, "商品分类({})已禁用，无法使用");
+    ErrorCode PRODUCT_CATEGORY_LEVEL = new ErrorCode(1008001005, "商品需挂在三级分类下");
 
     // ========== 品牌相关编号 1008002000 ==========
     ErrorCode PRODUCT_BRAND_NOT_EXISTS = new ErrorCode(1008002000, "品牌不存在");
@@ -31,4 +32,8 @@ public interface ErrorCodeConstants {
     // ========== 商品sku 1008006000 ==========
     ErrorCode SKU_NOT_EXISTS = new ErrorCode(1008006000, "商品sku不存在");
     ErrorCode SKU_PROPERTIES_DUPLICATED = new ErrorCode(1008006001, "商品sku的属性组合存在重复");
+
+    ErrorCode PRODUCT_SPU_ATTR_NUMBERS_MUST_BE_EQUALS = new ErrorCode(1008006002, "一个 Spu 下的每个 SKU ，其规格数必须一致");
+
+    ErrorCode PRODUCT_SPU_SKU_NOT_DUPLICATE = new ErrorCode(1008006003, "一个 SPU 下的每个 SKU ，必须不重复");
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
index 95364f75a..7f1da8553 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
@@ -93,6 +93,14 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
 
     @Override
     public void validateProductCategory(Long id) {
+        Integer level = categoryLevel(id, 1);
+        if(level < 3){
+          throw exception(PRODUCT_CATEGORY_LEVEL);
+        }
+    }
+
+    // 校验分类级别
+    private Integer categoryLevel(Long id, int level){
         ProductCategoryDO category = productCategoryMapper.selectById(id);
         if (category == null) {
             throw exception(PRODUCT_CATEGORY_NOT_EXISTS);
@@ -100,6 +108,10 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         if (ObjectUtil.notEqual(category.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
             throw exception(PRODUCT_CATEGORY_DISABLED);
         }
+        if(category.getParentId() == 0) {
+            return level;
+        }
+        return categoryLevel(category.getParentId(), ++level);
     }
 
     @Override
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index 20c7680bf..59e8a04d7 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -68,14 +68,14 @@ public interface ProductSkuService {
      *
      * @param list sku组合的集合
      */
-    void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list);
+    void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list, Integer specType);
 
     /**
      * 批量创建 SKU
      *
      * @param list SKU 对象集合
      */
-    void createProductSkus(List<ProductSkuDO> list);
+    void createProductSkus(List<ProductSkuCreateOrUpdateReqVO> list, Long spuId);
 
     /**
      * 根据 SPU 编号，批量更新它的 SKU 信息
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 50408bcb3..18a9ec7df 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
@@ -11,6 +12,7 @@ import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
 import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,45 +88,52 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         return productSkuMapper.selectPage(pageReqVO);
     }
 
-    // TODO luowenfeng：参考下 yudao-cloud 的 checkProductAttr 方法，重构下
     @Override
-    public void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list) {
-        List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> Optional.of(p.getProperties()).orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
-        // 校验规格属性存在
-        // TODO @luowenfeng：使用 CollectionUtils.convert
-        List<Long> propertyIds = skuPropertyList.stream().map(ProductSkuBaseVO.Property::getPropertyId).collect(Collectors.toList());
-        List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(propertyIds);
-        // TODO @luowenfeng：校验数量一致；
-        if (propertyAndValueList.isEmpty()) {
-            throw exception(PROPERTY_NOT_EXISTS);
-        }
-        // 校验规格属性值存在
-        // TODO @luowenfeng：使用 CollectionUtils.convert
-        Map<Long, ProductPropertyRespVO> propertyMap = propertyAndValueList.stream().collect(Collectors.toMap(ProductPropertyRespVO::getId, p -> p));
-        skuPropertyList.forEach(p -> {
-            ProductPropertyRespVO productPropertyRespVO = propertyMap.get(p.getPropertyId());
-            // 如果对应的属性名不存在或属性名下的属性值集合为空，给出提示
-            if (null == productPropertyRespVO || productPropertyRespVO.getPropertyValueList().isEmpty()) {
+    public void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list, Integer specType) {
+        // 多规格才需校验
+        if(specType.equals(ProductSpuSpecTypeEnum.DISABLE.getType())){
+            List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> Optional.of(p.getProperties()).orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
+            // 1、校验规格属性存在
+            List<Long> propertyIds = CollectionUtils.convertList(skuPropertyList, ProductSkuBaseVO.Property::getPropertyId);
+            List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(propertyIds);
+            if (propertyAndValueList.size() == propertyIds.size()){
                 throw exception(PROPERTY_NOT_EXISTS);
             }
-            // 判断改属性名对应的属性值是否存在,不存在，给出提示
-            if (!productPropertyRespVO.getPropertyValueList().stream().map(ProductPropertyValueRespVO::getId).collect(Collectors.toSet()).contains(p.getValueId())) {
-                throw exception(ErrorCodeConstants.PROPERTY_VALUE_NOT_EXISTS);
+            // 2. 校验，一个 Sku 下，没有重复的规格。校验方式是，遍历每个 Sku ，看看是否有重复的规格 attrId
+            List<ProductPropertyValueRespVO> collect = propertyAndValueList.stream()
+                            .flatMap(v -> Optional.of(v.getPropertyValueList())
+                            .orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
+            Map<Long, ProductPropertyValueRespVO> propertyValueRespVOMap = CollectionUtils.convertMap(collect, ProductPropertyValueRespVO::getId);
+            list.forEach(v->{
+                Set<Long> keys = v.getProperties().stream().map(k -> propertyValueRespVOMap.get(k.getValueId()).getPropertyId()).collect(Collectors.toSet());
+                if(keys.size() != v.getProperties().size()){
+                    throw exception(ErrorCodeConstants.SKU_PROPERTIES_DUPLICATED);
+                }
+            });
+
+            // 3. 再校验，每个 Sku 的规格值的数量，是一致的。
+            int attrValueIdsSize = list.get(0).getProperties().size();
+            for (int i = 1; i < list.size(); i++) {
+                if (attrValueIdsSize != list.get(i).getProperties().size()) {
+                    throw exception(ErrorCodeConstants.PRODUCT_SPU_ATTR_NUMBERS_MUST_BE_EQUALS);
+                }
             }
-        });
-        // 校验是否有重复的sku组合
-        List<List<ProductSkuBaseVO.Property>> skuProperties = list.stream().map(ProductSkuBaseVO::getProperties).collect(Collectors.toList());
-        Set<String> skuPropertiesConvertSet = new HashSet<>();
-        skuProperties.forEach(p -> {
-            // 组合属性值id为 1~2~3.... 形式的字符串，通过set的特性判断是否有重复的组合
-            if (!skuPropertiesConvertSet.add(p.stream().map(pr -> String.valueOf(pr.getValueId())).sorted().collect(Collectors.joining("～")))) {
-                throw exception(ErrorCodeConstants.SKU_PROPERTIES_DUPLICATED);
+
+            // 4. 最后校验，每个 Sku 之间不是重复的
+            Set<Set<Long>> skuAttrValues = new HashSet<>(); // 每个元素，都是一个 Sku 的 attrValueId 集合。这样，通过最外层的 Set ，判断是否有重复的.
+            for (ProductSkuCreateOrUpdateReqVO sku : list) {
+                if (!skuAttrValues.add(sku.getProperties().stream().map(ProductSkuBaseVO.Property::getValueId).collect(Collectors.toSet()))) { // 添加失败，说明重复
+                    throw exception(ErrorCodeConstants.PRODUCT_SPU_SKU_NOT_DUPLICATE);
+                }
             }
-        });
+        }
     }
 
     @Override
-    public void createProductSkus(List<ProductSkuDO> skuDOList) {
+    public void createProductSkus(List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList, Long spuId) {
+        // 批量插入 SKU
+        List<ProductSkuDO> skuDOList = ProductSkuConvert.INSTANCE.convertSkuDOList(skuCreateReqList);
+        skuDOList.forEach(v->v.setSpuId(spuId));
         productSkuMapper.insertBatch(skuDOList);
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 26c564f34..dec092856 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.product.service.spu;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyViewRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
@@ -58,31 +59,23 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     @Transactional
     public Long createProductSpu(ProductSpuCreateReqVO createReqVO) {
         // 校验分类
-        // TODO @luowenfeng：可以在这个类里加个方法，校验分类；商品必须挂在三级分类下；
         categoryService.validateProductCategory(createReqVO.getCategoryId());
         // TODO @luowenfeng：校验品牌
+
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
-        // 多规格才需校验
-        // TODO @luowenfeng：可以把 type 传递到 productSkuService 里，通过它统一判断处理
-        if(Objects.equals(createReqVO.getSpecType(), ProductSpuSpecTypeEnum.DISABLE.getType())) {
-            productSkuService.validateProductSkus(skuCreateReqList);
-        }
+        productSkuService.validateProductSkus(skuCreateReqList, createReqVO.getSpecType());
 
         // 插入 SPU
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO);
-        // TODO @luowenfeng：可以在 CollectionUtils 增加 getMaxValue 方法，增加一个 defaultValue 方法，如果为空，则返回 defaultValue
-        spu.setMarketPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getMarketPrice).max(Integer::compare).orElse(0));
-        spu.setMaxPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getPrice).max(Integer::compare).orElse(0));
-        spu.setMinPrice(skuCreateReqList.stream().map(ProductSkuCreateOrUpdateReqVO::getPrice).min(Integer::compare).orElse(0));
-        // TODO @luowenfeng：库存求和
+        spu.setMarketPrice(CollectionUtils.getMaxValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getMarketPrice));
+        spu.setMaxPrice(CollectionUtils.getMaxValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getPrice));
+        spu.setMinPrice(CollectionUtils.getMinValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getPrice));
+        spu.setTotalStock(CollectionUtils.getSumValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getStock, Integer::sum));
         ProductSpuMapper.insert(spu);
 
-        // 批量插入 SKU
-        // TODO @luowenfeng：convert 逻辑，交给 createProductSkus 一起处理
-        List<ProductSkuDO> skuDOList = ProductSkuConvert.INSTANCE.convertSkuDOList(skuCreateReqList);
-        skuDOList.forEach(v->v.setSpuId(spu.getId()));
-        productSkuService.createProductSkus(skuDOList);
+        // 插入 SKU
+        productSkuService.createProductSkus(skuCreateReqList, spu.getId());
         // 返回
         return spu.getId();
     }
@@ -98,10 +91,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = updateReqVO.getSkus();
         // 多规格才需校验
-        // TODO @luowenfeng：可以把 type 传递到 productSkuService 里，通过它统一判断处理
-        if(updateReqVO.getSpecType().equals(ProductSpuSpecTypeEnum.DISABLE.getType())) {
-            productSkuService.validateProductSkus(skuCreateReqList);
-        }
+        productSkuService.validateProductSkus(skuCreateReqList, updateReqVO.getSpecType());
 
         // 更新 SPU
         ProductSpuDO updateObj = ProductSpuConvert.INSTANCE.convert(updateReqVO);

From 4a39f2d9f8bfd7d104dd53c3060d9ff7c3d14d13 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Thu, 25 Aug 2022 17:10:26 +0800
Subject: [PATCH 43/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/mall.sql                    | 113 ++++++++----------
 .../dal/mysql/sku/ProductSkuMapper.java       |   5 +
 .../service/sku/ProductSkuServiceImpl.java    |  25 ++--
 .../service/spu/ProductSpuServiceImpl.java    |   2 +-
 yudao-ui-app/manifest.json                    |   2 +-
 5 files changed, 70 insertions(+), 77 deletions(-)

diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql
index f6b3542e3..6ba64e747 100644
--- a/sql/optional/mall/mall.sql
+++ b/sql/optional/mall/mall.sql
@@ -211,24 +211,29 @@ COMMIT;
 -- Table structure for product_sku
 -- ----------------------------
 DROP TABLE IF EXISTS `product_sku`;
-CREATE TABLE `product_sku`  (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `spu_id` bigint NOT NULL COMMENT 'spu编号',
-  `properties` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]',
-  `price` int NOT NULL DEFAULT -1 COMMENT '销售价格，单位：分',
-  `original_price` int NOT NULL DEFAULT -1 COMMENT '原价， 单位： 分',
-  `cost_price` int NOT NULL DEFAULT -1 COMMENT '成本价，单位： 分',
-  `bar_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '条形码',
-  `pic_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '图片地址',
-  `status` tinyint NULL DEFAULT NULL COMMENT '状态： 0-正常 1-禁用',
-  `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品sku';
+CREATE TABLE `product_sku` (
+`id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+`spu_id` bigint NOT NULL COMMENT 'spu编号',
+`tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号',
+`name` varchar(128)  DEFAULT NULL COMMENT '商品 SKU 名字',
+`properties` varchar(128)  DEFAULT NULL COMMENT '规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]',
+`price` int NOT NULL DEFAULT '-1' COMMENT '销售价格，单位：分',
+`market_price` int DEFAULT NULL COMMENT '市场价',
+`cost_price` int NOT NULL DEFAULT '-1' COMMENT '成本价，单位： 分',
+`pic_url` varchar(128)  NOT NULL COMMENT '图片地址',
+`stock` int DEFAULT NULL COMMENT '库存',
+`warn_stock` int DEFAULT NULL COMMENT '预警库存',
+`volume` double DEFAULT NULL COMMENT '商品体积',
+`weight` double DEFAULT NULL COMMENT '商品重量',
+`bar_code` varchar(64)  DEFAULT NULL COMMENT '条形码',
+`status` tinyint DEFAULT NULL COMMENT '状态： 0-正常 1-禁用',
+`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+`update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+`creator` varchar(64) DEFAULT NULL COMMENT '创建人',
+`updater` double(64,0) DEFAULT NULL COMMENT '更新人',
+`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品sku';
 
 -- ----------------------------
 -- Records of product_sku
@@ -240,26 +245,35 @@ COMMIT;
 -- Table structure for product_spu
 -- ----------------------------
 DROP TABLE IF EXISTS `product_spu`;
-CREATE TABLE `product_spu`  (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称',
-  `sell_point` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '卖点',
-  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '描述',
-  `category_id` bigint NOT NULL COMMENT '分类id',
-  `pic_urls` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '商品主图地址\n     *\n     * 数组，以逗号分隔\n 最多上传15张',
-  `sort` int NOT NULL DEFAULT 0 COMMENT '排序字段',
-  `like_count` int NULL DEFAULT NULL COMMENT '点赞初始人数',
-  `price` int NULL DEFAULT NULL COMMENT '价格 单位使用：分',
-  `quantity` int NULL DEFAULT NULL COMMENT '库存数量',
-  `status` bit(1) NULL DEFAULT NULL COMMENT '上下架状态： 0 上架（开启） 1 下架（禁用）',
-  `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
-  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品spu';
+CREATE TABLE `product_spu` (
+`id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+`tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号',
+`brand_id` int DEFAULT NULL COMMENT '商品品牌编号',
+`category_id` bigint NOT NULL COMMENT '分类id',
+`spec_type` int NOT NULL COMMENT '规格类型：0 单规格 1 多规格',
+`code` varchar(128)  DEFAULT NULL COMMENT '商品编码',
+`name` varchar(128)  NOT NULL COMMENT '商品名称',
+`sell_point` varchar(128)  DEFAULT NULL COMMENT '卖点',
+`description` text  COMMENT '描述',
+`pic_urls` varchar(1024)  DEFAULT '' COMMENT '商品轮播图地址\n 数组，以逗号分隔\n 最多上传15张',
+`video_url` varchar(128)  DEFAULT NULL COMMENT '商品视频',
+`market_price` int DEFAULT NULL COMMENT '市场价，单位使用：分',
+`min_price` int DEFAULT NULL COMMENT '最小价格，单位使用：分',
+`max_price` int DEFAULT NULL COMMENT '最大价格，单位使用：分',
+`total_stock` int NOT NULL DEFAULT '0' COMMENT '总库存',
+`show_stock` int DEFAULT '0' COMMENT '是否展示库存',
+`sales_count` int DEFAULT '0' COMMENT '商品销量',
+`virtual_sales_count` int DEFAULT '0' COMMENT '虚拟销量',
+`click_count` int DEFAULT '0' COMMENT '商品点击量',
+`status` bit(1) DEFAULT NULL COMMENT '上下架状态： 0 上架（开启） 1 下架（禁用）-1 回收',
+`sort` int NOT NULL DEFAULT '0' COMMENT '排序字段',
+`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+`update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+`creator` varchar(64)  DEFAULT NULL COMMENT '创建人',
+`updater` varchar(64)  DEFAULT NULL COMMENT '更新人',
+`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品spu';
 
 -- ----------------------------
 -- Records of product_spu
@@ -299,26 +313,3 @@ INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `
 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2028, 'Banner更新', 'market:banner:update', 3, 3, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
 INSERT INTO `ruoyi-vue-pro`.`system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2029, 'Banner删除', 'market:banner:delete', 3, 4, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
 
-alter table product_spu add `code` varchar(128) COMMENT '商品编码';
-alter table product_spu add  total_stock int COMMENT '总库存';
-alter table product_spu add  warn_stock int COMMENT '预警预存';
-alter table product_spu add  show_stock int COMMENT '是否展示库存';
-alter table product_spu add  sales_count int COMMENT '商品销量';
-alter table product_spu add  virtual_sales_count int COMMENT '虚拟销量';
-alter table product_spu add  click_count int COMMENT '商品点击量';
-alter table product_spu add  banner_url  varchar(128) COMMENT '主图地址';
-alter table product_spu add  spec_type int COMMENT '规格类型';
-alter table product_spu add  brand_id int COMMENT '商品品牌编号';
-alter table product_spu add  video_url varchar(128) COMMENT '商品视频';
-alter table product_spu add  min_price int COMMENT '最小价格，单位使用：分';
-alter table product_spu add  max_price int COMMENT '最大价格，单位使用：分';
-alter table product_spu add  market_price int COMMENT '市场价，单位使用：分';
-
-
-alter table product_sku add `name` varchar(128) COMMENT '商品 SKU 名字';
-alter table product_sku add `stock` int COMMENT '库存';
-alter table product_sku add `weight` double COMMENT '商品重量';
-alter table product_sku add `volume` double COMMENT '商品体积';
-
-
-alter table product_sku DROP `original_price`;
\ No newline at end of file
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index 134631650..7651e0c8c 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReq
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -38,6 +39,10 @@ public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
                 .inIfPresent(ProductSkuDO::getSpuId, spuIds));
     }
 
+    default List<ProductSkuDO> selectBySpuId(Long spuIds) {
+        return selectBySpuIds(Collections.singletonList(spuIds));
+    }
+
     default void deleteBySpuId(Long spuId) {
         // TODO @franky：直接 delete(new XXX) 即可，更简洁一些
         LambdaQueryWrapperX<ProductSkuDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<ProductSkuDO>()
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 18a9ec7df..1843617aa 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
@@ -91,22 +92,22 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     @Override
     public void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list, Integer specType) {
         // 多规格才需校验
-        if(specType.equals(ProductSpuSpecTypeEnum.DISABLE.getType())){
+        if (specType.equals(ProductSpuSpecTypeEnum.DISABLE.getType())) {
             List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> Optional.of(p.getProperties()).orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
             // 1、校验规格属性存在
             List<Long> propertyIds = CollectionUtils.convertList(skuPropertyList, ProductSkuBaseVO.Property::getPropertyId);
             List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(propertyIds);
-            if (propertyAndValueList.size() == propertyIds.size()){
+            if (propertyAndValueList.size() == propertyIds.size()) {
                 throw exception(PROPERTY_NOT_EXISTS);
             }
             // 2. 校验，一个 Sku 下，没有重复的规格。校验方式是，遍历每个 Sku ，看看是否有重复的规格 attrId
             List<ProductPropertyValueRespVO> collect = propertyAndValueList.stream()
-                            .flatMap(v -> Optional.of(v.getPropertyValueList())
+                    .flatMap(v -> Optional.of(v.getPropertyValueList())
                             .orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
             Map<Long, ProductPropertyValueRespVO> propertyValueRespVOMap = CollectionUtils.convertMap(collect, ProductPropertyValueRespVO::getId);
-            list.forEach(v->{
+            list.forEach(v -> {
                 Set<Long> keys = v.getProperties().stream().map(k -> propertyValueRespVOMap.get(k.getValueId()).getPropertyId()).collect(Collectors.toSet());
-                if(keys.size() != v.getProperties().size()){
+                if (keys.size() != v.getProperties().size()) {
                     throw exception(ErrorCodeConstants.SKU_PROPERTIES_DUPLICATED);
                 }
             });
@@ -133,7 +134,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     public void createProductSkus(List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList, Long spuId) {
         // 批量插入 SKU
         List<ProductSkuDO> skuDOList = ProductSkuConvert.INSTANCE.convertSkuDOList(skuCreateReqList);
-        skuDOList.forEach(v->v.setSpuId(spuId));
+        skuDOList.forEach(v -> v.setSpuId(spuId));
         productSkuMapper.insertBatch(skuDOList);
     }
 
@@ -156,10 +157,8 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     @Transactional
     public void updateProductSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus) {
         // 查询 spu 下已经存在的 sku 的集合
-        // TODO @luowenfeng：selectListBySpuId 搞个
-        List<ProductSkuDO> existsSkus = productSkuMapper.selectBySpuIds(Collections.singletonList(spuId));
-        // TODO @franky：使用 CollUtils 即可
-        Map<Long, ProductSkuDO> existsSkuMap = existsSkus.stream().collect(Collectors.toMap(ProductSkuDO::getId, p -> p));
+        List<ProductSkuDO> existsSkus = productSkuMapper.selectBySpuId(spuId);
+        Map<Long, ProductSkuDO> existsSkuMap = CollectionUtils.convertMap(existsSkus, ProductSkuDO::getId);
 
         // 拆分三个集合，新插入的、需要更新的、需要删除的
         List<ProductSkuDO> insertSkus = new ArrayList<>();
@@ -170,8 +169,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         List<ProductSkuDO> allUpdateSkus = ProductSkuConvert.INSTANCE.convertSkuDOList(skus);
         allUpdateSkus.forEach(p -> {
             if (p.getId() != null) {
-                // TODO @luowenfeng：contains
-                if (existsSkuMap.get(p.getId()) != null) {
+                if (existsSkuMap.containsKey(p.getId())) {
                     updateSkus.add(p);
                     return;
                 }
@@ -182,8 +180,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
             insertSkus.add(p);
         });
 
-        // TODO @luowenfeng：使用 CollUtil.isNotEmpty 判断
-        if (insertSkus.size() > 0) {
+        if (CollectionUtil.isNotEmpty(insertSkus)) {
             productSkuMapper.insertBatch(insertSkus);
         }
         if (updateSkus.size() > 0) {
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index dec092856..ad27ead18 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -60,7 +60,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     public Long createProductSpu(ProductSpuCreateReqVO createReqVO) {
         // 校验分类
         categoryService.validateProductCategory(createReqVO.getCategoryId());
-        // TODO @luowenfeng：校验品牌
+        // TODO @：校验品牌
 
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
diff --git a/yudao-ui-app/manifest.json b/yudao-ui-app/manifest.json
index 7cce06e5f..0f85730b8 100644
--- a/yudao-ui-app/manifest.json
+++ b/yudao-ui-app/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx48d7c38b46f2e81c",
         "setting" : {
             "urlCheck" : false
         },

From 19a703b8c943cb1c6532c4c968802dd28b12d55f Mon Sep 17 00:00:00 2001
From: "ex_yang.li@ca-nio.com" <ex_yang.li@ca-nio.com>
Date: Fri, 26 Aug 2022 17:47:43 +0800
Subject: [PATCH 44/56] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/order.sql                   |  76 ++++++++++
 .../framework/common/enums/TerminalEnum.java  |   1 +
 .../module/product/api/sku/ProductSkuApi.java |  30 ++++
 .../sku/dto/SkuDecrementStockBatchReqDTO.java |  45 ++++++
 .../product/api/sku/dto/SkuInfoRespDTO.java   |  93 ++++++++++++
 .../module/product/api/spu/ProductSpuApi.java |  23 +++
 .../product/api/spu/dto/SpuInfoRespDTO.java   | 124 ++++++++++++++++
 .../trade/enums/enums/ErrorCodeConstants.java |  23 +++
 .../yudao-module-trade-biz/pom.xml            |  13 ++
 .../app/order/AppTradeOrderController.java    |  21 ++-
 .../order/vo/AppTradeOrderCreateReqVO.java    |   2 +-
 .../convert/order/TradeOrderConvert.java      |  20 +++
 .../convert/order/TradeOrderItemConvert.java  |  33 +++++
 .../trade/convert/pay/PayOrderConvert.java    |  17 +++
 .../trade/convert/price/PriceConvert.java     |  23 +++
 .../trade/convert/sku/ProductSkuConvert.java  |  20 +++
 .../dal/mysql/order/TradeOrderMapper.java     |  11 ++
 .../mysql/orderitem/TradeOrderItemMapper.java |  11 ++
 .../service/order/TradeOrderService.java      |  19 +++
 .../service/order/TradeOrderServiceImpl.java  | 138 ++++++++++++++++++
 yudao-module-pay/yudao-module-pay-api/pom.xml |   7 +
 .../module/pay/api/order/PayOrderApi.java     |  20 +++
 .../api/order/PayOrderDataCreateReqDTO.java   |  65 +++++++++
 23 files changed, 831 insertions(+), 4 deletions(-)
 create mode 100644 sql/optional/mall/order.sql
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApi.java
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuDecrementStockBatchReqDTO.java
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuInfoRespDTO.java
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApi.java
 create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/SpuInfoRespDTO.java
 create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/enums/ErrorCodeConstants.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/pay/PayOrderConvert.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/price/PriceConvert.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/sku/ProductSkuConvert.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderService.java
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
 create mode 100644 yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java
 create mode 100644 yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderDataCreateReqDTO.java

diff --git a/sql/optional/mall/order.sql b/sql/optional/mall/order.sql
new file mode 100644
index 000000000..21e60200d
--- /dev/null
+++ b/sql/optional/mall/order.sql
@@ -0,0 +1,76 @@
+/**todo cancelType 设置默认值 0?*/
+CREATE TABLE `trade_order`
+(
+    `id`                      bigint          NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+    `sn`                      varchar(32)     NOT NULL COMMENT '订单流水号',
+    `type`                    int             NOT NULL DEFAULT '0' COMMENT '订单类型：[0:普通订单 1:秒杀订单 2:拼团订单 3:砍价订单]',
+    `terminal`                int             NOT NULL COMMENT '订单来源终端：[1:小程序 2:H5 3:iOS 4:安卓]',
+    `user_id`                 bigint unsigned NOT NULL COMMENT '用户编号',
+    `user_ip`                 varchar(30)     NOT NULL DEFAULT '' COMMENT '用户 IP',
+    `user_remark`             varchar(200)             DEFAULT NULL COMMENT '用户备注',
+    `status`                  int             NOT NULL DEFAULT '0' COMMENT '订单状态：[0:待付款 1:待发货 2:待收货 3:已完成 4:已关闭]',
+    `product_count`           int             NOT NULL COMMENT '购买的商品数量',
+    `cancel_type`             int             NOT NULL COMMENT '取消类型：[10:超时未支付 20:退款关闭 30:买家取消 40:已通过货到付款交易]',
+    `remark`                  varchar(200)             DEFAULT NULL COMMENT '商家备注',
+    `payed`                   bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否已支付：[0:未支付 1:已经支付过]',
+    `finish_time`             datetime                 DEFAULT NULL COMMENT '订单完成时间',
+    `cancel_time`             datetime                 DEFAULT NULL COMMENT '订单取消时间',
+    `sku_original_price`      int             NOT NULL DEFAULT '0' COMMENT '商品原价（总），单位：分',
+    `sku_promotion_price`     int             NOT NULL DEFAULT '0' COMMENT '商品优惠（总），单位：分',
+    `order_promotion_price`   int             NOT NULL DEFAULT '0' COMMENT '订单优惠（总），单位：分',
+    `delivery_price`          int             NOT NULL DEFAULT '0' COMMENT '运费金额，单位：分',
+    `pay_price`               int             NOT NULL DEFAULT '0' COMMENT '应付金额（总），单位：分',
+    `pay_order_id`            int             NOT NULL COMMENT '支付订单编号',
+    `pay_channel`             int             NOT NULL COMMENT '支付成功的支付渠道',
+    `delivery_type`           int             NOT NULL DEFAULT '1' COMMENT '配送方式:[1:快递发货 2:自提]',
+    `actual_delivery_type`    int             NOT NULL DEFAULT '1' COMMENT '实际的配送方式:[1:快递发货 2:自提]',
+    `delivery_templateid`     int                      DEFAULT NULL COMMENT '配置模板的编号',
+    `express_no`              int                      DEFAULT NULL COMMENT '物流公司单号',
+    `delivery_status`         bit(1)          NOT NULL DEFAULT b'0' COMMENT '发货状态[0:未发货 1:已发货]',
+    `delivery_time`           datetime                 DEFAULT NULL COMMENT '发货时间',
+    `receive_time`            datetime                 DEFAULT NULL COMMENT '收货时间',
+    `receiver_name`           varchar(20)     NOT NULL COMMENT '收件人名称',
+    `receiver_mobile`         varchar(20)     NOT NULL COMMENT '收件人手机',
+    `receiver_area_id`        int             NOT NULL COMMENT '收件人地区编号',
+    `receiver_post_code`      int                      DEFAULT NULL COMMENT '收件人邮编',
+    `receiver_detail_address` varchar(255)    NOT NULL COMMENT '收件人详细地址',
+    `refund_status`           int             NOT NULL DEFAULT '0' COMMENT '订单状态：[0:未退款 1:部分退款 2:全部退款]',
+    `refund_price`            int             NOT NULL DEFAULT '0' COMMENT '退款金额，单位：分',
+    `coupon_id`               bigint unsigned NOT NULL COMMENT '优惠劵编号',
+    `creator`                 varchar(64)              DEFAULT '' COMMENT '创建者',
+    `create_time`             datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`                 varchar(64)              DEFAULT '' COMMENT '更新者',
+    `update_time`             datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`                 bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='交易订单表';
+
+
+DROP TABLE IF EXISTS `trade_order_item`;
+CREATE TABLE `trade_order_item`
+(
+    `id`                    bigint          NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+    `user_id`               bigint unsigned NOT NULL COMMENT '用户编号',
+    `order_Id`              bigint unsigned NOT NULL COMMENT '订单编号',
+    `spu_id`                bigint unsigned NOT NULL COMMENT '商品 SPU 编号',
+    `sku_id`                bigint unsigned NOT NULL COMMENT '商品 SKU 编号',
+    `properties`            json                     DEFAULT NULL COMMENT '规格值数组，JSON 格式',
+    `name`                  varchar(128)    NOT NULL DEFAULT '' COMMENT '商品名称',
+    `pic_url`               varchar(200)             DEFAULT NULL COMMENT '商品图片',
+    `count`                 int             NOT NULL COMMENT '购买数量',
+    `commented`             bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否评论：[0:未评论 1:已评论]',
+    `original_price`        int             NOT NULL DEFAULT '0' COMMENT '商品原价（单），单位：分',
+    `total_original_price`  int             NOT NULL DEFAULT '0' COMMENT '商品原价（总），单位：分',
+    `total_promotion_price` int             NOT NULL DEFAULT '0' COMMENT '商品级优惠（总），单位：分',
+    `present_price`         int             NOT NULL DEFAULT '0' COMMENT '最终购买金额（单），单位：分。',
+    `total_present_price`   int             NOT NULL DEFAULT '0' COMMENT '最终购买金额（总），单位：分。',
+    `total_pay_price`       int             NOT NULL DEFAULT '0' COMMENT '应付金额（总），单位：分',
+    `refund_status`         int             NOT NULL DEFAULT '0' COMMENT '退款状态:[0:未申请退款 1:申请退款 2:等待退款 3:退款成功]',
+    `refund_total`          int             NOT NULL DEFAULT '0' COMMENT '退款总金额，单位：分',
+    `creator`               varchar(64)              DEFAULT '' COMMENT '创建者',
+    `create_time`           datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`               varchar(64)              DEFAULT '' COMMENT '更新者',
+    `update_time`           datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`               bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='交易订单明细表';
\ No newline at end of file
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java
index 7a9cd1ec6..cb9e530b7 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/TerminalEnum.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
 @Getter
 public enum TerminalEnum implements IntArrayValuable {
 
+    //TODO terminal 重复，请参考 '订单来源终端：[1:小程序 2:H5 3:iOS 4:安卓]'
     MINI_PROGRAM(1, "小程序"),
     H5(2, "H5"),
     IOS(3, "iOS"),
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApi.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApi.java
new file mode 100644
index 000000000..b3915407f
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApi.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.product.api.sku;
+
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuDecrementStockBatchReqDTO;
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuInfoRespDTO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface ProductSkuApi {
+
+
+    /**
+     * 根据skuId列表 查询sku信息
+     *
+     * @param skuIds sku ID列表
+     * @return sku信息列表
+     */
+    List<SkuInfoRespDTO> getSkusByIds(Collection<Long> skuIds);
+
+    /**
+     * 批量扣减sku库存
+     *
+     * @param batchReqDTO sku库存信息列表
+     */
+    void decrementStockBatch(SkuDecrementStockBatchReqDTO batchReqDTO);
+}
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuDecrementStockBatchReqDTO.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuDecrementStockBatchReqDTO.java
new file mode 100644
index 000000000..c0cee91ba
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuDecrementStockBatchReqDTO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.product.api.sku.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SkuDecrementStockBatchReqDTO {
+
+
+    private List<Item> items;
+
+    @Data
+    public static class Item {
+
+        /**
+         * 商品 SPU 编号，自增
+         */
+        private Long productId;
+
+        /**
+         * 商品 SKU 编号，自增
+         */
+        private Long skuId;
+
+        /**
+         * 数量
+         */
+        private Integer count;
+
+    }
+
+    public static SkuDecrementStockBatchReqDTO of(List<Item> items) {
+        return new SkuDecrementStockBatchReqDTO(items);
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuInfoRespDTO.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuInfoRespDTO.java
new file mode 100644
index 000000000..f9d349e48
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/SkuInfoRespDTO.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.product.api.sku.dto;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Data
+public class SkuInfoRespDTO {
+
+    /**
+     * 商品 SKU 编号，自增
+     */
+    private Long id;
+    /**
+     * 商品 SKU 名字
+     */
+    private String name;
+    /**
+     * SPU 编号
+     */
+    private Long spuId;
+
+    /**
+     * 规格值数组，JSON 格式
+     */
+    private List<Property> properties;
+    /**
+     * 销售价格，单位：分
+     */
+    private Integer price;
+    /**
+     * 市场价，单位：分
+     */
+    private Integer marketPrice;
+    /**
+     * 成本价，单位：分
+     */
+    private Integer costPrice;
+    /**
+     * SKU 的条形码
+     */
+    private String barCode;
+    /**
+     * 图片地址
+     */
+    private String picUrl;
+    /**
+     * SKU 状态
+     * <p>
+     * 枚举 {@link CommonStatusEnum}
+     */
+    private Integer status;
+    /**
+     * 库存
+     */
+    private Integer stock;
+    /**
+     * 预警预存
+     */
+    private Integer warnStock;
+    /**
+     * 商品重量，单位：kg 千克
+     */
+    private Double weight;
+    /**
+     * 商品体积，单位：m^3 平米
+     */
+    private Double volume;
+
+    /**
+     * 商品属性
+     */
+    @Data
+    public static class Property {
+
+        /**
+         * 属性编号
+         */
+        private Long propertyId;
+        /**
+         * 属性值编号
+         */
+        private Long valueId;
+
+    }
+
+
+}
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApi.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApi.java
new file mode 100644
index 000000000..5dc2bf4cf
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApi.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.product.api.spu;
+
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuInfoRespDTO;
+import cn.iocoder.yudao.module.product.api.spu.dto.SpuInfoRespDTO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface ProductSpuApi {
+
+
+    /**
+     * 根据spuId列表 查询spu信息
+     *
+     * @param spuIds spu ID列表
+     * @return spu信息列表
+     */
+    List<SpuInfoRespDTO> getSpusByIds(Collection<Long> spuIds);
+}
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/SpuInfoRespDTO.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/SpuInfoRespDTO.java
new file mode 100644
index 000000000..6d0206b7d
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/SpuInfoRespDTO.java
@@ -0,0 +1,124 @@
+package cn.iocoder.yudao.module.product.api.spu.dto;
+
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuInfoRespDTO;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Data
+public class SpuInfoRespDTO {
+
+    /**
+     * 商品 SPU 编号，自增
+     */
+    private Long id;
+
+    // ========== 基本信息 =========
+
+    /**
+     * 商品名称
+     */
+    private String name;
+    /**
+     * 商品编码
+     */
+    private String code;
+    /**
+     * 商品卖点
+     */
+    private String sellPoint;
+    /**
+     * 商品详情
+     */
+    private String description;
+    /**
+     * 商品分类编号
+     */
+    private Long categoryId;
+    /**
+     * 商品品牌编号
+     */
+    private Long brandId;
+    /**
+     * 商品图片的数组
+     * <p>
+     * 1. 第一张图片将作为商品主图，支持同时上传多张图；
+     * 2. 建议使用尺寸 800x800 像素以上、大小不超过 1M 的正方形图片；
+     * 3. 至少 1 张，最多上传 10 张
+     */
+    private List<String> picUrls;
+    /**
+     * 商品视频
+     */
+    private String videoUrl;
+
+    /**
+     * 排序字段
+     */
+    private Integer sort;
+    /**
+     * 商品状态
+     * <p>
+     * 枚举 {@link ProductSpuStatusEnum}
+     */
+    private Integer status;
+
+    // ========== SKU 相关字段 =========
+
+    /**
+     * 规格类型
+     * <p>
+     * 枚举 {@link ProductSpuSpecTypeEnum}
+     */
+    private Integer specType;
+    /**
+     * 最小价格，单位使用：分
+     * <p>
+     * 基于其对应的 {@link SkuInfoRespDTO#getPrice()} 最小值
+     */
+    private Integer minPrice;
+    /**
+     * 最大价格，单位使用：分
+     * <p>
+     * 基于其对应的 {@link SkuInfoRespDTO#getPrice()} 最大值
+     */
+    private Integer maxPrice;
+    /**
+     * 市场价，单位使用：分
+     * <p>
+     * 基于其对应的 {@link SkuInfoRespDTO#getMarketPrice()} 最大值
+     */
+    private Integer marketPrice;
+    /**
+     * 总库存
+     * <p>
+     * 基于其对应的 {@link SkuInfoRespDTO#getStock()} 求和
+     */
+    private Integer totalStock;
+    /**
+     * 是否展示库存
+     */
+    private Boolean showStock;
+
+    // ========== 统计相关字段 =========
+
+    /**
+     * 商品销量
+     */
+    private Integer salesCount;
+    /**
+     * 虚拟销量
+     */
+    private Integer virtualSalesCount;
+    /**
+     * 商品点击量
+     */
+    private Integer clickCount;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/enums/ErrorCodeConstants.java
new file mode 100644
index 000000000..5bdc0ff82
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/enums/ErrorCodeConstants.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.trade.enums.enums;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+
+/**
+ * Trade-Order 错误码 Core 枚举类
+ * <p>
+ * Trade-Order 系统，使用 1-011-000-000 段
+ *
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface ErrorCodeConstants {
+
+    /**
+     * ========== Order 模块 1-011-000-000 ==========
+     */
+    ErrorCode ORDER_SKU_NOT_FOUND = new ErrorCode(1011000001, "商品不存在");
+    ErrorCode ORDER_SPU_NOT_SALE = new ErrorCode(1011000002, "商品不可售卖");
+    ErrorCode ORDER_SKU_NOT_SALE = new ErrorCode(1011000003, "商品Sku不可售卖");
+    ErrorCode ORDER_SKU_STOCK_NOT_ENOUGH = new ErrorCode(1011000004, "商品库存不足");
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/pom.xml b/yudao-module-mall/yudao-module-trade-biz/pom.xml
index ee95393a9..c9b582d93 100644
--- a/yudao-module-mall/yudao-module-trade-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-trade-biz/pom.xml
@@ -23,12 +23,25 @@
             <artifactId>yudao-module-trade-api</artifactId>
             <version>${revision}</version>
         </dependency>
+
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-module-product-api</artifactId>
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-pay-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-market-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <!-- 业务组件 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
index da027e1fa..7b7ed4b83 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -1,15 +1,19 @@
 package cn.iocoder.yudao.module.trade.controller.app.order;
 
+import cn.hutool.extra.servlet.ServletUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderGetCreateInfoRespVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.TradeOrderPageReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.TradeOrderRespVO;
+import cn.iocoder.yudao.module.trade.service.order.TradeOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -19,12 +23,16 @@ import javax.servlet.http.HttpServletRequest;
 @Api(tags = "用户 App - 交易订单")
 @RestController
 @RequestMapping("/trade/order")
+@RequiredArgsConstructor
 @Validated
 @Slf4j
 public class AppTradeOrderController {
 
     // TODO 在思考下；
 
+    private final TradeOrderService tradeOrderService;
+
+
     @GetMapping("/get-create-info")
     @ApiOperation("基于商品，确认创建订单")
     @PreAuthenticated
@@ -36,11 +44,18 @@ public class AppTradeOrderController {
     @PostMapping("/create")
     @ApiOperation("创建订单")
     @PreAuthenticated
-    public CommonResult<Integer> createTradeOrder(@RequestBody AppTradeOrderCreateReqVO createReqVO,
-                                                  HttpServletRequest servletRequest) {
+    public CommonResult<Long> createTradeOrder(@RequestBody AppTradeOrderCreateReqVO createReqVO,
+                                               HttpServletRequest servletRequest) {
 //        return success(tradeOrderService.createTradeOrder(UserSecurityContextHolder.getUserId(),
 //                HttpUtil.getIp(servletRequest), createReqVO));
-        return null;
+        // 获取登录用户
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // 获取用户ip地址
+        String clientIp = ServletUtil.getClientIP(servletRequest);
+        // 创建交易订单，预支付记录
+        Long result = tradeOrderService.createTradeOrder(loginUserId, clientIp, createReqVO);
+
+        return CommonResult.success(result);
     }
 
     @GetMapping("/get")
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
index 85edde55d..d454fd63c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
@@ -38,7 +38,7 @@ public class AppTradeOrderCreateReqVO {
 
         @ApiModelProperty(name = "商品 SKU 编号", required = true, example = "111")
         @NotNull(message = "商品 SKU 编号不能为空")
-        private Integer skuId;
+        private Long skuId;
 
         @ApiModelProperty(name = "商品 SKU 购买数量", required = true, example = "1024")
         @NotNull(message = "商品 SKU 购买数量不能为空")
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
new file mode 100644
index 000000000..dd3cca38e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.trade.convert.order;
+
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateRespDTO;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Mapper
+public interface TradeOrderConvert {
+
+    TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
+
+
+    TradeOrderDO convert(AppTradeOrderCreateReqVO createReqVO, PriceCalculateRespDTO.Order order);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
new file mode 100644
index 000000000..f9c44b4a6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.trade.convert.order;
+
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateRespDTO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Mapper
+public interface TradeOrderItemConvert {
+
+    TradeOrderItemConvert INSTANCE = Mappers.getMapper(TradeOrderItemConvert.class);
+
+    /**
+     *
+     * @param tradeOrder 交易订单
+     * @param items sku列表价格
+     * @return 订单项
+     */
+    @Mappings({
+            @Mapping(source = "tradeOrder.userId", target = "userId"),
+            @Mapping(source = "tradeOrder.orderId", target = "orderId")
+    })
+    List<TradeOrderItemDO> convertList(TradeOrderDO tradeOrder, List<PriceCalculateRespDTO.Item> items);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/pay/PayOrderConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/pay/PayOrderConvert.java
new file mode 100644
index 000000000..22dd11fe9
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/pay/PayOrderConvert.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.trade.convert.pay;
+
+import cn.iocoder.yudao.module.pay.api.order.PayOrderDataCreateReqDTO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface PayOrderConvert {
+
+    PayOrderConvert INSTANCE = Mappers.getMapper(PayOrderConvert.class);
+
+
+    PayOrderDataCreateReqDTO convert(TradeOrderDO tradeOrderDO);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/price/PriceConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/price/PriceConvert.java
new file mode 100644
index 000000000..3b2d173c3
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/price/PriceConvert.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.trade.convert.price;
+
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateReqDTO;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Mapper
+public interface PriceConvert {
+
+    PriceConvert INSTANCE = Mappers.getMapper(PriceConvert.class);
+
+    @Mappings(
+            @Mapping(source = "userId" , target = "userId")
+    )
+    PriceCalculateReqDTO convert(AppTradeOrderCreateReqVO createReqVO , Long userId);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/sku/ProductSkuConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/sku/ProductSkuConvert.java
new file mode 100644
index 000000000..fffc6fa42
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/sku/ProductSkuConvert.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.trade.convert.sku;
+
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuDecrementStockBatchReqDTO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Mapper
+public interface ProductSkuConvert {
+
+    ProductSkuConvert INSTANCE = Mappers.getMapper(ProductSkuConvert.class);
+
+    List<SkuDecrementStockBatchReqDTO.Item> convert(List<TradeOrderItemDO> tradeOrderItems);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
new file mode 100644
index 000000000..ed74f9b6c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.trade.dal.mysql.order;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java
new file mode 100644
index 000000000..4e33cddd1
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.trade.dal.mysql.orderitem;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface TradeOrderItemMapper extends BaseMapperX<TradeOrderItemDO> {
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderService.java
new file mode 100644
index 000000000..f3fc4b5e1
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderService.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.trade.service.order;
+
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface TradeOrderService {
+
+    /**
+     * 创建交易订单
+     * @param loginUserId 登录用户
+     * @param clientIp 用户ip地址
+     * @param createReqVO 创建交易订单请求模型
+     * @return 交易订单创建结果
+     */
+    Long createTradeOrder(Long loginUserId, String clientIp, AppTradeOrderCreateReqVO createReqVO);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
new file mode 100644
index 000000000..3554e7d4c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
@@ -0,0 +1,138 @@
+package cn.iocoder.yudao.module.trade.service.order;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.market.api.price.PriceApi;
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateReqDTO;
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateRespDTO;
+import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
+import cn.iocoder.yudao.module.pay.api.order.PayOrderDataCreateReqDTO;
+import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuDecrementStockBatchReqDTO;
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuInfoRespDTO;
+import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
+import cn.iocoder.yudao.module.product.api.spu.dto.SpuInfoRespDTO;
+import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO.Item;
+import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
+import cn.iocoder.yudao.module.trade.convert.order.TradeOrderItemConvert;
+import cn.iocoder.yudao.module.trade.convert.pay.PayOrderConvert;
+import cn.iocoder.yudao.module.trade.convert.price.PriceConvert;
+import cn.iocoder.yudao.module.trade.convert.sku.ProductSkuConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper;
+import cn.iocoder.yudao.module.trade.dal.mysql.orderitem.TradeOrderItemMapper;
+import cn.iocoder.yudao.module.trade.enums.enums.ErrorCodeConstants;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Service
+@RequiredArgsConstructor
+public class TradeOrderServiceImpl implements TradeOrderService {
+
+    private final TradeOrderMapper tradeOrderMapper;
+
+    private final TradeOrderItemMapper tradeOrderItemMapper;
+
+    private final PriceApi priceApi;
+
+    private final ProductSkuApi productSkuApi;
+
+    private final ProductSpuApi productSpuApi;
+
+    private final PayOrderApi payOrderApi;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createTradeOrder(Long loginUserId, String clientIp, AppTradeOrderCreateReqVO createReqVO) {
+
+        List<Item> items = createReqVO.getItems();
+        //  商品SKU检查 sku可售状态,库存
+        List<SkuInfoRespDTO> skuInfos = productSkuApi.getSkusByIds(CollectionUtils.convertSet(items, Item::getSkuId));
+        Map<Long, SkuInfoRespDTO> skuInfoMap = CollectionUtils.convertMap(skuInfos, SkuInfoRespDTO::getId);
+        checkSaleableAndStockFromSpu(skuInfoMap, items);
+
+        //  商品SPU检查 sku可售状态,库存
+        List<SpuInfoRespDTO> spuInfos = productSpuApi.getSpusByIds(CollectionUtils.convertSet(skuInfos, SkuInfoRespDTO::getSpuId));
+        checkSaleableFromSpu(spuInfos);
+
+        // 价格计算
+        PriceCalculateReqDTO priceCalculateReqDTO = PriceConvert.INSTANCE.convert(createReqVO, loginUserId);
+        PriceCalculateRespDTO priceResp = priceApi.calculatePrice(priceCalculateReqDTO);
+
+        // 订单信息记录
+        TradeOrderDO tradeOrderDO = TradeOrderConvert.INSTANCE.convert(createReqVO, priceResp.getOrder());
+        tradeOrderMapper.insert(tradeOrderDO);
+
+        // 订单项信息记录
+        List<TradeOrderItemDO> tradeOrderItems = TradeOrderItemConvert.INSTANCE.convertList(tradeOrderDO, priceResp.getItems());
+        //-填充订单项-SKU信息
+        fillItemsInfoFromSku(tradeOrderItems, skuInfoMap);
+        tradeOrderItemMapper.insertBatch(tradeOrderItems);
+
+        // 库存扣减
+        List<SkuDecrementStockBatchReqDTO.Item> skuDecrementStockItems = ProductSkuConvert.INSTANCE.convert(tradeOrderItems);
+        productSkuApi.decrementStockBatch(SkuDecrementStockBatchReqDTO.of(skuDecrementStockItems));
+        // 生成预支付
+
+        PayOrderDataCreateReqDTO payOrderCreateReqDTO = PayOrderConvert.INSTANCE.convert(tradeOrderDO);
+        return payOrderApi.createPayOrder(payOrderCreateReqDTO);
+    }
+
+    private void fillItemsInfoFromSku(List<TradeOrderItemDO> tradeOrderItems,
+                                      Map<Long, SkuInfoRespDTO> spuInfos) {
+        for (TradeOrderItemDO tradeOrderItem : tradeOrderItems) {
+            // 填充SKU信息
+            SkuInfoRespDTO skuInfoRespDTO = spuInfos.get(tradeOrderItem.getSkuId());
+            tradeOrderItem.setSpuId(skuInfoRespDTO.getSpuId());
+            tradeOrderItem.setPicUrl(skuInfoRespDTO.getPicUrl());
+            tradeOrderItem.setName(skuInfoRespDTO.getName());
+            // todo
+            List<TradeOrderItemDO.Property> property =
+                    BeanUtil.copyToList(skuInfoRespDTO.getProperties(), TradeOrderItemDO.Property.class);
+            tradeOrderItem.setProperties(property);
+        }
+    }
+
+    private void checkSaleableFromSpu(List<SpuInfoRespDTO> spuInfos) {
+        SpuInfoRespDTO spu = CollectionUtils.findFirst(spuInfos,
+                spuInfoDTO -> !Objects.equals(ProductSpuStatusEnum.ENABLE.getStyle(), spuInfoDTO.getStatus()));
+        if (Objects.isNull(spu)) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_SPU_NOT_SALE);
+        }
+    }
+
+    private void checkSaleableAndStockFromSpu(Map<Long, SkuInfoRespDTO> skuInfoMap,
+                                              List<Item> items) {
+        // sku 不存在
+        if (items.size() != skuInfoMap.size()) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_SKU_NOT_FOUND);
+        }
+        for (Item item : items) {
+            SkuInfoRespDTO skuInfoDTO = skuInfoMap.get(item.getSkuId());
+            // sku禁用
+            if (!Objects.equals(CommonStatusEnum.ENABLE.getStatus(), skuInfoDTO.getStatus())) {
+                throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_SKU_NOT_SALE);
+            }
+            // sku库存不足
+            if (item.getCount() > skuInfoDTO.getStock()) {
+                throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_SKU_STOCK_NOT_ENOUGH);
+            }
+        }
+
+    }
+}
diff --git a/yudao-module-pay/yudao-module-pay-api/pom.xml b/yudao-module-pay/yudao-module-pay-api/pom.xml
index a7bebc2f1..0903abed5 100644
--- a/yudao-module-pay/yudao-module-pay-api/pom.xml
+++ b/yudao-module-pay/yudao-module-pay-api/pom.xml
@@ -21,6 +21,13 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-common</artifactId>
         </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java
new file mode 100644
index 000000000..204ce7a32
--- /dev/null
+++ b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.pay.api.order;
+
+import javax.validation.Valid;
+
+/**
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+public interface PayOrderApi {
+
+
+    /**
+     * 创建支付单
+     *
+     * @param reqDTO 创建请求
+     * @return 支付单编号
+     */
+    Long createPayOrder(@Valid PayOrderDataCreateReqDTO reqDTO);
+
+}
diff --git a/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderDataCreateReqDTO.java b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderDataCreateReqDTO.java
new file mode 100644
index 000000000..acdfa7a20
--- /dev/null
+++ b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderDataCreateReqDTO.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.pay.api.order;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 支付单创建 Request DTO
+ * @author LeeYan9
+ */
+@Data
+public class PayOrderDataCreateReqDTO implements Serializable {
+
+    /**
+     * 应用编号
+     */
+    @NotNull(message = "应用编号不能为空")
+    private Long appId;
+    /**
+     * 用户 IP
+     */
+    @NotEmpty(message = "用户 IP 不能为空")
+    private String userIp;
+
+    // ========== 商户相关字段 ==========
+
+    /**
+     * 商户订单编号
+     */
+    @NotEmpty(message = "商户订单编号不能为空")
+    private String merchantOrderId;
+    /**
+     * 商品标题
+     */
+    @NotEmpty(message = "商品标题不能为空")
+    @Length(max = 32, message = "商品标题不能超过 32")
+    private String subject;
+    /**
+     * 商品描述
+     */
+    @NotEmpty(message = "商品描述信息不能为空")
+    @Length(max = 128, message = "商品描述信息长度不能超过128")
+    private String body;
+
+    // ========== 订单相关字段 ==========
+
+    /**
+     * 支付金额，单位：分
+     */
+    @NotNull(message = "支付金额不能为空")
+    @DecimalMin(value = "0", inclusive = false, message = "支付金额必须大于零")
+    private Integer amount;
+
+    /**
+     * 支付过期时间
+     */
+    @NotNull(message = "支付过期时间不能为空")
+    private Date expireTime;
+
+}
\ No newline at end of file

From 4207b2b61d6c8b0573b2ceb2e62db9bd8884a7df Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Wed, 31 Aug 2022 18:52:26 +0800
Subject: [PATCH 45/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/brand/ProductBrandController.java   |  15 +++
 .../admin/brand/vo/ProductBrandListReqVO.java |  14 +++
 .../dal/dataobject/sku/ProductSkuDO.java      |   8 +-
 .../dal/mysql/brand/ProductBrandMapper.java   |   9 ++
 .../service/brand/ProductBrandService.java    |  18 ++-
 .../brand/ProductBrandServiceImpl.java        |  18 ++-
 .../service/sku/ProductSkuServiceImpl.java    |   3 +-
 .../service/spu/ProductSpuServiceImpl.java    |  52 +++++----
 yudao-ui-admin/src/api/mall/product/brand.js  |   9 ++
 .../src/views/mall/product/spu/index.vue      | 109 +++---------------
 .../src/views/mall/product/spu/save.vue       |  65 +++++++++--
 11 files changed, 187 insertions(+), 133 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandListReqVO.java

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
index 14ffef881..c159883be 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
@@ -5,8 +5,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryRespVO;
 import cn.iocoder.yudao.module.product.convert.brand.ProductBrandConvert;
+import cn.iocoder.yudao.module.product.convert.category.ProductCategoryConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.service.brand.ProductBrandService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,6 +23,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -74,4 +79,14 @@ public class ProductBrandController {
         return success(ProductBrandConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @GetMapping("/list")
+    @ApiOperation("获得品牌列表")
+    @PreAuthorize("@ss.hasPermission('product:brand:query')")
+    public CommonResult<List<ProductBrandRespVO>> getProductCategoryList(@Valid ProductBrandListReqVO listVO) {
+        List<ProductBrandDO> list = brandService.getBrandList(listVO);
+        list.sort(Comparator.comparing(ProductBrandDO::getSort));
+        return success(ProductBrandConvert.INSTANCE.convertList(list));
+    }
+
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandListReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandListReqVO.java
new file mode 100644
index 000000000..5367e2dfe
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandListReqVO.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.product.controller.admin.brand.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "管理后台 - 商品品牌分页 Request VO")
+@Data
+public class ProductBrandListReqVO {
+
+    @ApiModelProperty(value = "品牌名称", example = "芋道")
+    private String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index 2057aa1ae..6d3d374fc 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -40,7 +40,7 @@ public class ProductSkuDO extends BaseDO {
     private String name;
     /**
      * SPU 编号
-     *
+     * <p>
      * 关联 {@link ProductSpuDO#getId()}
      */
     private Long spuId;
@@ -71,7 +71,7 @@ public class ProductSkuDO extends BaseDO {
     private String picUrl;
     /**
      * SKU 状态
-     *
+     * <p>
      * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
@@ -100,13 +100,13 @@ public class ProductSkuDO extends BaseDO {
 
         /**
          * 属性编号
-         *
+         * <p>
          * 关联 {@link ProductPropertyDO#getId()}
          */
         private Long propertyId;
         /**
          * 属性值编号
-         *
+         * <p>
          * 关联 {@link ProductPropertyValueDO#getId()}
          */
         private Long valueId;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
index e33884d1c..38558564c 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
@@ -3,10 +3,14 @@ package cn.iocoder.yudao.module.product.dal.mysql.brand;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandBaseVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandListReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ProductBrandMapper extends BaseMapperX<ProductBrandDO> {
 
@@ -18,4 +22,9 @@ public interface ProductBrandMapper extends BaseMapperX<ProductBrandDO> {
                 .orderByDesc(ProductBrandDO::getId));
     }
 
+
+    default List<ProductBrandDO> selectList(ProductBrandListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<ProductBrandDO>()
+                .likeIfPresent(ProductBrandDO::getName, reqVO.getName()));
+    }
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
index 6d54cd26f..4c9060055 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
@@ -1,9 +1,7 @@
 package cn.iocoder.yudao.module.product.service.brand;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 
 import javax.validation.Valid;
@@ -55,6 +53,20 @@ public interface ProductBrandService {
      */
     List<ProductBrandDO> getBrandList(Collection<Long> ids);
 
+    /**
+     * 获得品牌列表
+     * @param listVo 请求参数
+     * @return 品牌列表
+     */
+    List<ProductBrandDO> getBrandList(ProductBrandListReqVO listVo);
+
+    /**
+     * 验证选择的商品分类是否合法
+     *
+     * @param id 分类编号
+     */
+    void validateProductBrand(Long id);
+
     /**
      * 获得品牌分页
      *
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
index 8adfa71c3..be67260ff 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.product.service.brand;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
 import cn.iocoder.yudao.module.product.convert.brand.ProductBrandConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.mysql.brand.ProductBrandMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -16,6 +15,7 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_BRAND_NOT_EXISTS;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_CATEGORY_LEVEL;
 
 /**
  * 品牌 Service 实现类
@@ -71,6 +71,18 @@ public class ProductBrandServiceImpl implements ProductBrandService {
         return brandMapper.selectBatchIds(ids);
     }
 
+    @Override
+    public List<ProductBrandDO> getBrandList(ProductBrandListReqVO listVo) {
+        return brandMapper.selectList(listVo);
+    }
+
+    @Override
+    public void validateProductBrand(Long id) {
+        if(getBrand(id) == null){
+            throw exception(PRODUCT_BRAND_NOT_EXISTS);
+        }
+    }
+
     @Override
     public PageResult<ProductBrandDO> getBrandPage(ProductBrandPageReqVO pageReqVO) {
         return brandMapper.selectPage(pageReqVO);
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 1843617aa..60191d1b0 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -140,7 +140,8 @@ public class ProductSkuServiceImpl implements ProductSkuService {
 
     @Override
     public List<ProductSkuDO> getSkusBySpuId(Long spuId) {
-        return productSkuMapper.selectBySpuIds(Collections.singletonList(spuId));
+        List<ProductSkuDO> productSkuDOS = productSkuMapper.selectBySpuIds(Collections.singletonList(spuId));
+        return productSkuDOS;
     }
 
     @Override
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index ad27ead18..253fb93ae 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -20,6 +20,7 @@ import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
 import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
+import cn.iocoder.yudao.module.product.service.brand.ProductBrandService;
 import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
@@ -55,17 +56,19 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     @Resource
     private ProductPropertyService productPropertyService;
 
+    @Resource
+    private ProductBrandService brandService;
+
     @Override
     @Transactional
     public Long createProductSpu(ProductSpuCreateReqVO createReqVO) {
         // 校验分类
         categoryService.validateProductCategory(createReqVO.getCategoryId());
-        // TODO @：校验品牌
-
+        // 校验品牌
+        brandService.validateProductBrand(createReqVO.getBrandId());
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
         productSkuService.validateProductSkus(skuCreateReqList, createReqVO.getSpecType());
-
         // 插入 SPU
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO);
         spu.setMarketPrice(CollectionUtils.getMaxValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getMarketPrice));
@@ -73,7 +76,6 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         spu.setMinPrice(CollectionUtils.getMinValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getPrice));
         spu.setTotalStock(CollectionUtils.getSumValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getStock, Integer::sum));
         ProductSpuMapper.insert(spu);
-
         // 插入 SKU
         productSkuService.createProductSkus(skuCreateReqList, spu.getId());
         // 返回
@@ -128,27 +130,29 @@ public class ProductSpuServiceImpl implements ProductSpuService {
             spuVO.setSkus(skuReqs);
             List<ProductSkuRespVO.Property> properties = new ArrayList<>();
             // 组合 sku 规格属性
-            for (ProductSkuRespVO productSkuRespVO : skuReqs) {
-                properties.addAll(productSkuRespVO.getProperties());
-            }
-            Map<Long, List<ProductSkuBaseVO.Property>> propertyMaps = properties.stream().collect(Collectors.groupingBy(ProductSkuBaseVO.Property::getPropertyId));
-            List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(new ArrayList<>(propertyMaps.keySet()));
-            // 装载组装过后的属性
-            List<ProductPropertyViewRespVO> productPropertyViews = new ArrayList<>();
-            propertyAndValueList.forEach(p -> {
-                ProductPropertyViewRespVO productPropertyViewRespVO = new ProductPropertyViewRespVO();
-                productPropertyViewRespVO.setPropertyId(p.getId());
-                productPropertyViewRespVO.setName(p.getName());
-                Set<ProductPropertyViewRespVO.Tuple2> propertyValues = new HashSet<>();
-                Map<Long, ProductPropertyValueRespVO> propertyValueMaps = p.getPropertyValueList().stream().collect(Collectors.toMap(ProductPropertyValueRespVO::getId, pv -> pv));
-                propertyMaps.get(p.getId()).forEach(pv -> {
-                    ProductPropertyViewRespVO.Tuple2 tuple2 = new ProductPropertyViewRespVO.Tuple2(pv.getValueId(), propertyValueMaps.get(pv.getValueId()).getName());
-                    propertyValues.add(tuple2);
+            if(spu.getSpecType().equals(ProductSpuSpecTypeEnum.DISABLE.getType())) {
+                for (ProductSkuRespVO productSkuRespVO : skuReqs) {
+                    properties.addAll(productSkuRespVO.getProperties());
+                }
+                Map<Long, List<ProductSkuBaseVO.Property>> propertyMaps = properties.stream().collect(Collectors.groupingBy(ProductSkuBaseVO.Property::getPropertyId));
+                List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(new ArrayList<>(propertyMaps.keySet()));
+                // 装载组装过后的属性
+                List<ProductPropertyViewRespVO> productPropertyViews = new ArrayList<>();
+                propertyAndValueList.forEach(p -> {
+                    ProductPropertyViewRespVO productPropertyViewRespVO = new ProductPropertyViewRespVO();
+                    productPropertyViewRespVO.setPropertyId(p.getId());
+                    productPropertyViewRespVO.setName(p.getName());
+                    Set<ProductPropertyViewRespVO.Tuple2> propertyValues = new HashSet<>();
+                    Map<Long, ProductPropertyValueRespVO> propertyValueMaps = p.getPropertyValueList().stream().collect(Collectors.toMap(ProductPropertyValueRespVO::getId, pv -> pv));
+                    propertyMaps.get(p.getId()).forEach(pv -> {
+                        ProductPropertyViewRespVO.Tuple2 tuple2 = new ProductPropertyViewRespVO.Tuple2(pv.getValueId(), propertyValueMaps.get(pv.getValueId()).getName());
+                        propertyValues.add(tuple2);
+                    });
+                    productPropertyViewRespVO.setPropertyValues(propertyValues);
+                    productPropertyViews.add(productPropertyViewRespVO);
                 });
-                productPropertyViewRespVO.setPropertyValues(propertyValues);
-                productPropertyViews.add(productPropertyViewRespVO);
-            });
-            spuVO.setProductPropertyViews(productPropertyViews);
+                spuVO.setProductPropertyViews(productPropertyViews);
+            }
             // 组合分类
             if (null != spuVO.getCategoryId()) {
                 LinkedList<Long> categoryArray = new LinkedList<>();
diff --git a/yudao-ui-admin/src/api/mall/product/brand.js b/yudao-ui-admin/src/api/mall/product/brand.js
index 69cb61c08..2218f42cb 100644
--- a/yudao-ui-admin/src/api/mall/product/brand.js
+++ b/yudao-ui-admin/src/api/mall/product/brand.js
@@ -34,6 +34,15 @@ export function getBrand(id) {
   })
 }
 
+// 获得品牌list
+export function getBrandList() {
+  return request({
+    url: '/product/brand/list',
+    method: 'get'
+  })
+}
+
+
 // 获得品牌分页
 export function getBrandPage(query) {
   return request({
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index e9f59febc..801f7870f 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -179,7 +179,7 @@
 
 
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close :close-on-click-modal="false" >
-      <save @closeDialog="open = false; getList()"/>
+      <save @closeDialog="closeDialog" :type="dialogType" :obj="dialogObj" v-if="open" />
     </el-dialog>
   </div>
 </template>
@@ -257,6 +257,10 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 弹出层类型
+      dialogType: "add",
+      // 弹出层参数
+      dialogObj:{},
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
@@ -570,75 +574,25 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.dialogType = "add";
+      this.dialogObj={};
       this.open = true;
       this.title = "添加商品spu";
-      this.getPropertyPageList();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getSpu(id).then((response) => {
-        let dataSpu = response.data;
-        this.form = {
-          id: dataSpu.id,
-          name: dataSpu.name,
-          sellPoint: dataSpu.sellPoint,
-          description: dataSpu.sellPoint,
-          categoryId: dataSpu.sellPoint,
-          categoryIds: dataSpu.categoryIds,
-          picUrls: dataSpu.picUrls,
-          sort: dataSpu.sort,
-          likeCount: dataSpu.likeCount,
-          price: dataSpu.price,
-          quantity: dataSpu.quantity,
-          status: dataSpu.status,
-          isShowTagInput: undefined,
-          skus: [],
-          skusList: dataSpu.skus,
-          productPropertyViews: dataSpu.productPropertyViews,
-          // skus:dataSpu.productSkuRespVOS,
-        };
-        this.getDataHandle();
-        this.open = true;
-        this.title = "修改商品spu";
-      });
+      this.dialogType = "upd";
+      this.dialogObj.id = row.id;
+      this.open = true;
+      console.log("修改")
+      this.title = "修改商品spu";
     },
-    getDataHandle() {
-      let that = this;
-      let productPropertyViews = JSON.parse(
-        JSON.stringify(this.form.productPropertyViews)
-      );
-      productPropertyViews = productPropertyViews.sort(
-        (a, b) => a.propertyId - b.propertyId
-      );
-      productPropertyViews.forEach((item) => {
-        item.propertyValues = item.propertyValues.sort((a, b) => a.v1 - b.v1);
-      });
-      let skuIds = [];
-      for (let i = 0; i < productPropertyViews.length; i++) {
-        let han = {
-          name: productPropertyViews[i].name,
-          propertyId: productPropertyViews[i].propertyId,
-          selectValues: [],
-          selectValueIds: [],
-        };
-        for (
-          let j = 0;
-          j < productPropertyViews[i].propertyValues.length;
-          j++
-        ) {
-          han.selectValues.push(productPropertyViews[i].propertyValues[j].v2);
-          han.selectValueIds.push(productPropertyViews[i].propertyValues[j].v1);
-        }
-        skuIds.push(han);
-      }
-      this.skuTags = skuIds;
-      this.unUseTags = this.allhistoryTags.filter((v) =>
-        skuIds.every((val) => val.name != v.name)
-      );
-      this.getHandleTable();
+    closeDialog(){
+      console.log("关闭")
+      this.dialogType = "add";
+      this.dialogObj={};
+      this.open = false;
+      this.getList()
     },
     getHandleTable() {
       this.form.skus = [];
@@ -699,33 +653,6 @@ export default {
         }
       });
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (!valid) {
-          return;
-        }
-        this.form.picUrls = this.form.picUrls.split(",");
-        this.form.categoryId =
-          this.form.categoryIds[this.form.categoryIds.length - 1];
-        this.form.status = Number(this.form.status);
-        // 修改的提交
-        if (this.form.id != null) {
-          updateSpu(this.form).then((response) => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createSpu(this.form).then((response) => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 2cd3eeaf6..089b2d128 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -193,6 +193,16 @@
       <!-- 销售设置 -->
       <el-tab-pane label="销售设置" name="fourth">
         <el-form ref="fourth" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
+          <el-form-item label="所属品牌" prop="brandId">
+            <el-select v-model="baseForm.brandId" placeholder="请选择">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="虚拟销量" prop="virtualSalesCount">
             <el-input v-model="baseForm.virtualSalesCount" placeholder="请输入虚拟销量" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
           </el-form-item>
@@ -221,8 +231,10 @@
 </template>
 
 <script>
+
+import {getBrandList} from "@/api/mall/product/brand";
 import {getProductCategoryList} from "@/api/mall/product/category";
-import {createSpu,} from "@/api/mall/product/spu";
+import {createSpu, getSpu} from "@/api/mall/product/spu";
 import {getPropertyPage,} from "@/api/mall/product/property";
 import Editor from "@/components/Editor";
 import ImageUpload from "@/components/ImageUpload";
@@ -232,6 +244,13 @@ export default {
     Editor,
     ImageUpload
   },
+  props:{//props列表
+    type:{
+      type:String,
+      default:"add" //定义参数默认值
+    },
+    obj: Object
+  },
   data() {
     return {
       activeName: "base",
@@ -251,6 +270,7 @@ export default {
         status: 0,
         virtualSalesCount: 0,
         showStock: true,
+        brandId: null
       },
       categoryList: [],
       // 价格库存
@@ -270,6 +290,7 @@ export default {
         // },
       ],
       propertyPageList: [],
+      brandList: [],
       specValue: null,
 
       // 表单校验
@@ -283,11 +304,13 @@ export default {
       },
     };
   },
-
   created() {
-
+    this.getListBrand();
     this.getListCategory();
     this.getPropertyPageList();
+    if(this.type == 'upd'){
+      this.updateType(this.obj.id)
+    }
   },
   methods: {
     removeSpec(index){
@@ -351,6 +374,13 @@ export default {
       getProductCategoryList().then((response) => {
         this.categoryList = this.handleTree(response.data, "id", "parentId");
       });
+    },
+     /** 查询品牌列表 */
+    getListBrand() {
+      // 执行查询
+      getBrandList().then((response) => {
+        this.brandList = response.data;
+      });
     },
     cancel() {
       this.$emit("closeDialog");
@@ -366,7 +396,13 @@ export default {
         rates.forEach(r => {
           let properties = []
             Array.of(r.spec).forEach(s => {
-              Array.of(s).forEach((v, i) => {
+              let obj;
+               if (s instanceof Array) {
+                  obj = s;
+               }else{
+                  obj = Array.of(s);
+               }
+              obj.forEach((v, i) => {
                 console.log(this.dynamicSpec, r, s, v, i)
                 let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
                 console.log(specValue)
@@ -382,9 +418,6 @@ export default {
         rates[0].name = this.baseForm.name;
         rates[0].status = this.baseForm.status;
       }
-
-      console.log(rates)
-
       let form = this.baseForm
       if(form.picUrls instanceof Array){
         form.picUrls = form.picUrls.flatMap(m=>m.split(','))
@@ -422,6 +455,24 @@ export default {
       spec.specValue = obj.propertyValueList;
       this.dynamicSpec = dynamicSpec;
       this.buildRatesFormRates();
+    },
+    updateType(id){
+        getSpu(id).then((response) =>{
+            console.log(response)
+            let data = response.data;
+            this.baseForm.name=data.name;
+            this.baseForm.sellPoint=data.sellPoint;
+            this.baseForm.categoryIds=data.categoryIds;
+            this.baseForm.sort=data.sort;
+            this.baseForm.description=data.description;
+            this.baseForm.picUrls=data.picUrls;
+            this.baseForm.status=data.status;
+            this.baseForm.virtualSalesCount=data.virtualSalesCount;
+            this.baseForm.showStock=data.showStock;
+            this.baseForm.brandId=data.brandId;
+            this.ratesForm.spec=data.specType;
+            this.ratesForm.rates=data.skus
+        })
     }
   },
 };

From 96db6b97ad1868938e92b4a79e37f2622a3fc0e0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 31 Aug 2022 23:26:17 +0800
Subject: [PATCH 46/56] =?UTF-8?q?mall=EF=BC=9A=E8=A7=A3=E5=86=B3=20Product?=
 =?UTF-8?q?SkuDO.properties=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/sku/ProductSkuDO.java      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index 6d3d374fc..72daba257 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.sku;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyValueDO;
@@ -9,7 +10,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
 import lombok.*;
 
 import java.util.List;
@@ -47,7 +48,7 @@ public class ProductSkuDO extends BaseDO {
     /**
      * 规格值数组，JSON 格式
      */
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    @TableField(typeHandler = PropertyTypeHandler.class)
     private List<Property> properties;
     /**
      * 销售价格，单位：分
@@ -113,6 +114,21 @@ public class ProductSkuDO extends BaseDO {
 
     }
 
+    // TODO @芋艿：可以找一些新的思路
+    public static class PropertyTypeHandler extends AbstractJsonTypeHandler<Object> {
+
+        @Override
+        protected Object parse(String json) {
+            return JsonUtils.parseArray(json, Property.class);
+        }
+
+        @Override
+        protected String toJson(Object obj) {
+            return JsonUtils.toJsonString(obj);
+        }
+
+    }
+
     // TODO ========== 待定字段：yv =========
     // TODO brokerage：一级返佣
     // TODO brokerage_two：二级返佣

From 198b1189e896e97fa3f08f874d991e8f1bb8f922 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Thu, 1 Sep 2022 11:00:40 +0800
Subject: [PATCH 47/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/vo/ProductPropertyViewRespVO.java  | 15 ++++++++-------
 .../dal/dataobject/sku/ProductSkuDO.java        |  2 +-
 .../service/spu/ProductSpuServiceImpl.java      |  3 ++-
 .../src/views/mall/product/spu/save.vue         | 17 +++++++++++++++++
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
index 0499138a9..9bdc70bd7 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
-import java.util.Set;
+import java.util.List;
 
 /**
  * @Description: ProductPropertyViewRespVO
@@ -25,16 +25,17 @@ public class ProductPropertyViewRespVO {
     public String name;
 
     @ApiModelProperty(value = "规格属性值集合", example = "[{\"v1\":11,\"v2\":\"64G\"},{\"v1\":10,\"v2\":\"32G\"}]")
-    public Set<Tuple2> propertyValues;
+    public List<Tuple2> propertyValues;
 
     @Data
     @ApiModel(value = "规格属性值元组")
     public static class Tuple2 {
-        private final long v1;
-        private final String v2;
-        public Tuple2(Long v1, String v2) {
-            this.v1 = v1;
-            this.v2 = v2;
+        private final long id;
+        private final String name;
+
+        public Tuple2(Long id, String name) {
+            this.id = id;
+            this.name = name;
         }
 
     }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
index 72daba257..fc7bbe9ec 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
@@ -20,7 +20,7 @@ import java.util.List;
  *
  * @author 芋道源码
  */
-@TableName("product_sku")
+@TableName(value = "product_sku",autoResultMap = true)
 @KeySequence("product_sku_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 253fb93ae..df6d3171f 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -30,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -142,7 +143,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
                     ProductPropertyViewRespVO productPropertyViewRespVO = new ProductPropertyViewRespVO();
                     productPropertyViewRespVO.setPropertyId(p.getId());
                     productPropertyViewRespVO.setName(p.getName());
-                    Set<ProductPropertyViewRespVO.Tuple2> propertyValues = new HashSet<>();
+                    List<ProductPropertyViewRespVO.Tuple2> propertyValues = new ArrayList<>();
                     Map<Long, ProductPropertyValueRespVO> propertyValueMaps = p.getPropertyValueList().stream().collect(Collectors.toMap(ProductPropertyValueRespVO::getId, pv -> pv));
                     propertyMaps.get(p.getId()).forEach(pv -> {
                         ProductPropertyViewRespVO.Tuple2 tuple2 = new ProductPropertyViewRespVO.Tuple2(pv.getValueId(), propertyValueMaps.get(pv.getValueId()).getName());
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 089b2d128..9c619be3e 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -471,6 +471,23 @@ export default {
             this.baseForm.showStock=data.showStock;
             this.baseForm.brandId=data.brandId;
             this.ratesForm.spec=data.specType;
+            if(this.ratesForm.spec == 2){
+              data.productPropertyViews.forEach(p=>{
+                let obj = {};
+                obj.specId = p.propertyId;
+                obj.specName = p.name;
+                obj.specValue = p.propertyValues;
+                this.dynamicSpec.push(obj);
+              })
+              data.skus.forEach(s=>{
+                s.spec = [];
+                s.properties.forEach(sp=>{
+                  let spec = data.productPropertyViews.find(o=>o.propertyId == sp.propertyId).propertyValues.find(v=>v.id == sp.valueId).name;
+                   s.spec.push(spec)
+                })
+              })
+            }
+            console.log(data.skus);
             this.ratesForm.rates=data.skus
         })
     }

From ab6fd305516e6e63fee6c0f481a3b21e9b87f826 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Thu, 1 Sep 2022 15:28:05 +0800
Subject: [PATCH 48/56] =?UTF-8?q?feature(uniapp=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sku/vo/ProductSkuCreateOrUpdateReqVO.java |   6 +
 .../admin/spu/vo/ProductSpuBaseVO.java        |  11 +
 .../controller/admin/spu/vo/SpuPageReqVO.java |   2 +-
 .../dal/mysql/spu/ProductSpuMapper.java       |   7 +-
 .../service/spu/ProductSpuServiceImpl.java    |  12 +-
 yudao-ui-admin/src/main.js                    |   3 +-
 yudao-ui-admin/src/utils/ruoyi.js             |  14 +
 .../src/views/mall/product/spu/index.vue      | 384 +-----------------
 .../src/views/mall/product/spu/save.vue       |  43 +-
 9 files changed, 84 insertions(+), 398 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
index 01a09fd39..c9d059578 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
@@ -1,14 +1,20 @@
 package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import javax.validation.constraints.NotEmpty;
+
 @ApiModel("管理后台 - 商品 SKU 创建/更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ProductSkuCreateOrUpdateReqVO extends ProductSkuBaseVO {
 
+    @ApiModelProperty(value = "商品 id 更新时须有", example = "1")
+    private Long id;
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
index c320f902f..5f6c69e94 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
@@ -65,10 +65,21 @@ public class ProductSpuBaseVO {
     @NotNull(message = "是否展示库存不能为空")
     private Boolean showStock;
 
+    @ApiModelProperty(value = "库存", required = true, example = "true")
+    private Integer totalStock;
+
+    @ApiModelProperty(value = " 最小价格，单位使用：分", required = true, example = "1024")
+    private Integer minPrice;
+
+    @ApiModelProperty(value = "最大价格，单位使用：分", required = true, example = "1024")
+    private Integer maxPrice;
+
     // ========== 统计相关字段 =========
 
     @ApiModelProperty(value = "虚拟销量", required = true, example = "1024")
     @NotNull(message = "虚拟销量不能为空")
     private Integer virtualSalesCount;
 
+    @ApiModelProperty(value = "点击量", example = "1024")
+    private Integer clickCount;
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java
index 12eff36c7..1af946ebe 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java
@@ -42,7 +42,7 @@ public class SpuPageReqVO extends PageParam {
     private Integer quantity;
 
     @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
-    private Boolean status;
+    private Integer status;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "创建时间")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
index a1d919ef2..fa4bc36ba 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
@@ -19,16 +19,11 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductSpuDO>()
                 .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
                 .eqIfPresent(ProductSpuDO::getSellPoint, reqVO.getSellPoint())
-                .eqIfPresent(ProductSpuDO::getDescription, reqVO.getDescription())
                 .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
                 .eqIfPresent(ProductSpuDO::getPicUrls, reqVO.getPicUrls())
-                .eqIfPresent(ProductSpuDO::getSort, reqVO.getSort())
-//                .eqIfPresent(ProductSpuDO::getLikeCount, reqVO.getLikeCount())
-//                .eqIfPresent(ProductSpuDO::getPrice, reqVO.getPrice())
-//                .eqIfPresent(ProductSpuDO::getQuantity, reqVO.getQuantity())
                 .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ProductSpuDO::getId));
+                .orderByDesc(ProductSpuDO::getSort));
     }
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index df6d3171f..f583f8685 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -90,17 +90,19 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         validateSpuExists(updateReqVO.getId());
         // 校验分类
         categoryService.validateProductCategory(updateReqVO.getCategoryId());
-        // TODO @luowenfeng：校验品牌
+        // 校验品牌
+        brandService.validateProductBrand(updateReqVO.getBrandId());
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = updateReqVO.getSkus();
         // 多规格才需校验
         productSkuService.validateProductSkus(skuCreateReqList, updateReqVO.getSpecType());
-
         // 更新 SPU
         ProductSpuDO updateObj = ProductSpuConvert.INSTANCE.convert(updateReqVO);
-        // TODO @计算各种字段
+        updateObj.setMarketPrice(CollectionUtils.getMaxValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getMarketPrice));
+        updateObj.setMaxPrice(CollectionUtils.getMaxValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getPrice));
+        updateObj.setMinPrice(CollectionUtils.getMinValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getPrice));
+        updateObj.setTotalStock(CollectionUtils.getSumValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getStock, Integer::sum));
         ProductSpuMapper.updateById(updateObj);
-
         // 更新 SKU
         productSkuService.updateProductSkus(updateObj.getId(), updateReqVO.getSkus());
     }
@@ -149,7 +151,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
                         ProductPropertyViewRespVO.Tuple2 tuple2 = new ProductPropertyViewRespVO.Tuple2(pv.getValueId(), propertyValueMaps.get(pv.getValueId()).getName());
                         propertyValues.add(tuple2);
                     });
-                    productPropertyViewRespVO.setPropertyValues(propertyValues);
+                    productPropertyViewRespVO.setPropertyValues(propertyValues.stream().distinct().collect(Collectors.toList()));
                     productPropertyViews.add(productPropertyViewRespVO);
                 });
                 spuVO.setProductPropertyViews(productPropertyViews);
diff --git a/yudao-ui-admin/src/main.js b/yudao-ui-admin/src/main.js
index 2ce318cc0..2b94d6c7c 100644
--- a/yudao-ui-admin/src/main.js
+++ b/yudao-ui-admin/src/main.js
@@ -16,7 +16,7 @@ import './permission' // permission control
 import './tongji' // 百度统计
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/infra/config";
-import { parseTime, resetForm, handleTree, addBeginAndEndTime} from "@/utils/ruoyi";
+import { parseTime, resetForm, handleTree, addBeginAndEndTime, divide} from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
@@ -36,6 +36,7 @@ Vue.prototype.getDictDataLabel = getDictDataLabel
 Vue.prototype.DICT_TYPE = DICT_TYPE
 Vue.prototype.handleTree = handleTree
 Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
+Vue.prototype.divide = divide
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
diff --git a/yudao-ui-admin/src/utils/ruoyi.js b/yudao-ui-admin/src/utils/ruoyi.js
index 7096e1fdc..fa8307e22 100644
--- a/yudao-ui-admin/src/utils/ruoyi.js
+++ b/yudao-ui-admin/src/utils/ruoyi.js
@@ -222,3 +222,17 @@ export function getPath(path) {
   }
   return basePath + path;
 }
+
+/**
+ * 除法保留两位小数
+ *
+ * @param {*} divisor 除数
+ * @param {*} dividend 被除数
+ * @returns
+ */
+ export function divide(divisor, dividend) {
+  if(divisor == null || dividend == null || dividend == 0){
+    return null;
+  }
+  return Math.floor(divisor/dividend*100)/100;
+}
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 801f7870f..4cac422a1 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="卖点" prop="sellPoint">
-        <el-input
-          v-model="queryParams.sellPoint"
-          placeholder="请输入卖点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="分类id" prop="categoryId">
         <el-input
           v-model="queryParams.categoryId"
@@ -33,22 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="价格(分)" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入价格 单位使用：分"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存数量" prop="quantity">
-        <el-input
-          v-model="queryParams.quantity"
-          placeholder="请输入库存数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -115,8 +91,6 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="商品名称" align="center" prop="name" />
-      <!--      <el-table-column label="卖点" align="center" prop="sellPoint"/>-->
-      <!--      <el-table-column label="描述" align="center" prop="description"/>-->
       <el-table-column label="分类id" align="center" prop="categoryId" />
       <el-table-column label="商品主图地址" align="center" prop="picUrls">
         <template slot-scope="scope">
@@ -129,10 +103,14 @@
         </template>
       </el-table-column>
       <el-table-column label="排序字段" align="center" prop="sort" />
-      <el-table-column label="点赞初始人数" align="center" prop="likeCount" />
-      <el-table-column label="价格 (分)" align="center" prop="price" />
-      <el-table-column label="库存数量" align="center" prop="quantity" />
-      <!--      <el-table-column label="状态" align="center" prop="status"/>-->
+      <el-table-column label="点击量" align="center" prop="clickCount" />
+      <el-table-column label="价格区间" align="center" prop="price" />
+      <el-table-column label="总库存" align="center" prop="totalStock" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -186,29 +164,10 @@
 
 <script>
 import {
-  createSpu,
-  updateSpu,
   deleteSpu,
-  getSpu,
   getSpuPage,
   exportSpuExcel,
 } from "@/api/mall/product/spu";
-import {
-  createProductCategory,
-  deleteProductCategory,
-  exportCategoryExcel,
-  getProductCategory,
-  getProductCategoryList,
-  updateProductCategory,
-} from "@/api/mall/product/category";
-import {
-  createProperty,
-  updateProperty,
-  deleteProperty,
-  getProperty,
-  getPropertyPage,
-  exportPropertyExcel,
-} from "@/api/mall/product/property";
 
 import Editor from "@/components/Editor";
 import ImageUpload from "@/components/ImageUpload";
@@ -237,11 +196,6 @@ export default {
         selectObect: [],
       },
       skuTags: [],
-      propName: {
-        checkStrictly: true,
-        label: "name",
-        value: "id",
-      },
       categoryList: [],
       // 遮罩层
       loading: true,
@@ -277,251 +231,13 @@ export default {
         quantity: null,
         status: null,
       },
-      // 表单参数
-      form: {
-        id: undefined,
-        name: undefined,
-        sellPoint: undefined,
-        description: undefined,
-        categoryId: undefined,
-        categoryIds: [],
-        picUrls: undefined,
-        sort: undefined,
-        likeCount: undefined,
-        price: undefined,
-        quantity: undefined,
-        status: undefined,
-        isShowTagInput: undefined,
-        skus: [],
-      },
-      // 表单校验
-      rules: {
-        sellPoint: [
-          { required: true, message: "卖点不能为空", trigger: "blur" },
-        ],
-        description: [
-          { required: true, message: "描述不能为空", trigger: "blur" },
-        ],
-        categoryIds: [
-          { required: true, message: "分类id不能为空", trigger: "blur" },
-        ],
-        picUrls: [{ required: true, message: "商品主图地址", trigger: "blur" }],
-        sort: [
-          { required: true, message: "排序字段不能为空", trigger: "blur" },
-        ],
-      },
       tagIndex: 0,
     };
   },
   created() {
     this.getList();
-    this.getPropertyPageList();
-    this.getListCategory();
   },
   methods: {
-    getTableSpecData() {
-      return this.value;
-    },
-    tableSpanMethod({ row, column, rowIndex, columnIndex }) {},
-    changeSkuStatus(tagIndex) {
-      if (this.form.skus[tagIndex].status == 0) {
-        this.form.skus[tagIndex].status = 1;
-      } else {
-        this.form.skus[tagIndex].status = 0;
-      }
-    },
-    skuAddProdName() {
-      if (this.initing) {
-        return;
-      }
-      let skuList = [];
-      for (let i = 0; i < this.value.length; i++) {
-        const sku = Object.assign({}, this.value[i]);
-        if (!sku.properties) {
-          return;
-        }
-        sku.skuName = "";
-        let properties = sku.properties.split(";");
-        for (const propertiesKey in properties) {
-          sku.skuName += properties[propertiesKey].split(":")[1] + " ";
-        }
-        sku.prodName = this.prodName + " " + sku.skuName;
-        skuList.push(sku);
-      }
-      this.$emit("input", skuList);
-    },
-    handleTagClose(tagIndex, tagItemIndex) {},
-    //确定添加sku规格
-    addTag() {
-      let skus = this.unUseTags.map(function (item, index) {
-        return item.name;
-      });
-      let index = skus.indexOf(this.addTagInput.name);
-
-      this.addTagInput.propertyId = this.unUseTags[index].id;
-      for (let i = 0; i < this.addTagInput.selectValues.length; i++) {
-        for (
-          let j = 0;
-          j < this.unUseTags[index].propertyValueList.length;
-          j++
-        ) {
-          if (
-            this.addTagInput.selectValues[i] ===
-            this.unUseTags[index].propertyValueList[j].name
-          ) {
-            this.addTagInput.selectValueIds.push(
-              this.unUseTags[index].propertyValueList[j].id
-            );
-            this.addTagInput.selectObect.push({
-              id: this.unUseTags[index].propertyValueList[j].id,
-              name: this.unUseTags[index].propertyValueList[j].name,
-            });
-          }
-        }
-      }
-      let addTagInput = JSON.parse(JSON.stringify(this.addTagInput));
-      this.skuTags.push(addTagInput);
-
-      // if (this.skuTags.length > 1) {
-      this.skuTags = this.skuTags.sort((a, b) => a.propertyId - b.propertyId);
-      this.skuTags.forEach(function (item, index) {
-        item.selectObect = item.selectObect.sort((a, b) => a.id - b.id);
-      });
-
-      for (let i = 0; i < this.skuTags.length; i++) {
-        let selectValueIds = [];
-        let selectValues = [];
-        for (let j = 0; j < this.skuTags[i].selectObect.length; j++) {
-          selectValueIds.push(this.skuTags[i].selectObect[j].id);
-          selectValues.push(this.skuTags[i].selectObect[j].name);
-        }
-        this.skuTags[i].selectValues = selectValues;
-        this.skuTags[i].selectValueIds = selectValueIds;
-      }
-
-      this.unUseTags.splice(index, 1);
-      this.isShowTagInput = false;
-      this.getTable();
-    },
-    getTable() {
-      this.form.skus = [];
-      let skuTags = JSON.parse(JSON.stringify(this.skuTags));
-      let sku1s = [];
-      let skuIds = [];
-      let propertyIds = [];
-      let propertyNames = [];
-      for (let i = 0; i < skuTags.length; i++) {
-        sku1s.push(skuTags[i].selectValues);
-        skuIds.push(skuTags[i].selectValueIds);
-        propertyIds.push(skuTags[i].propertyId);
-        propertyNames.push(skuTags[i].name);
-      }
-
-      let skuAll = sku1s.reduce(
-        (x, y) => {
-          let arr = [];
-          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
-          return arr;
-        },
-        [[]]
-      );
-
-      let skuIdAll = skuIds.reduce(
-        (x, y) => {
-          let arr = [];
-          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
-          return arr;
-        },
-        [[]]
-      );
-
-      for (let i = 0; i < skuAll.length; i++) {
-        let han = {
-          propertyNames: propertyNames,
-          propertyIds: propertyIds,
-          propertyChildNames: skuAll[i],
-          propertyChildIds: skuIdAll[i],
-          properties: [],
-          picUrl: "",
-          costPrice: "",
-          originalPrice: "",
-          spuId: "",
-          prodName: "",
-          price: "",
-          barCode: "",
-          status: "0",
-        };
-        this.form.skus.push(han);
-      }
-      this.form.skus.forEach((x) => {
-        x.properties = [];
-        for (let i = 0; i < x.propertyIds.length; i++) {
-          x.properties.push({
-            propertyId: x.propertyIds[i],
-            valueId: x.propertyChildIds[i],
-          });
-        }
-      });
-    },
-    hideTagInput() {
-      this.isShowTagInput = false;
-      this.addTagInput = {
-        name: "",
-        propertyId: "",
-        selectValues: [],
-        selectValueIds: [],
-        selectObect: [],
-      };
-    },
-    shopTagInput() {
-      if (this.unUseTags.length <= 0) {
-        return this.$message.error("规格已经添加完毕");
-      }
-      this.isShowTagInput = true;
-      this.addTagInput = {
-        name: "",
-        propertyId: "",
-        selectValues: [],
-        selectValueIds: [],
-        selectObect: [],
-      };
-    },
-    //删除已选的规格
-    removeTag(row) {
-      let skus = this.allhistoryTags.map(function (item, index) {
-        return item.name;
-      });
-      let index = skus.indexOf(this.skuTags[row].name);
-      this.unUseTags.push(this.allhistoryTags[index]);
-      this.skuTags.splice(row, 1);
-      this.getTable();
-    },
-    handleTagClick(row) {
-      for (let i = 0; i < this.propertyPageList.length; i++) {
-        if (row == this.propertyPageList[i].name) {
-          this.dbTagValues = this.propertyPageList[i].propertyValueList;
-        }
-      }
-    },
-    /** 查询规格 */
-    getPropertyPageList() {
-      // 执行查询
-      getPropertyPage().then((response) => {
-        this.propertyPageList = response.data.list;
-
-        this.unUseTags = this.propertyPageList.map(function (item, index) {
-          return item;
-        });
-        this.allhistoryTags = JSON.parse(JSON.stringify(this.unUseTags));
-      });
-    },
-    /** 查询分类 */
-    getListCategory() {
-      // 执行查询
-      getProductCategoryList().then((response) => {
-        this.categoryList = this.handleTree(response.data, "id", "parentId");
-      });
-    },
     /** 查询列表 */
     getList() {
       this.loading = true;
@@ -530,37 +246,20 @@ export default {
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
       getSpuPage(params).then((response) => {
+        response.data.list.forEach(element => {
+          element.price = this.divide(element.minPrice, 100)+"~"+this.divide(element.maxPrice, 100)
+        });
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
       });
     },
+
     /** 取消按钮 */
     cancel() {
       this.open = false;
       this.reset();
     },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        sellPoint: undefined,
-        description: undefined,
-        categoryId: undefined,
-        categoryIds: [],
-        picUrls: undefined,
-        sort: undefined,
-        likeCount: undefined,
-        price: undefined,
-        quantity: undefined,
-        status: undefined,
-        isShowTagInput: undefined,
-        skus: [],
-      };
-      this.skuTags = [];
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
@@ -594,65 +293,6 @@ export default {
       this.open = false;
       this.getList()
     },
-    getHandleTable() {
-      this.form.skus = [];
-      let skuTags = JSON.parse(JSON.stringify(this.skuTags));
-      let sku1s = [];
-      let skuIds = [];
-      let propertyIds = [];
-      let propertyNames = [];
-      for (let i = 0; i < skuTags.length; i++) {
-        sku1s.push(skuTags[i].selectValues);
-        skuIds.push(skuTags[i].selectValueIds);
-        propertyIds.push(skuTags[i].propertyId);
-        propertyNames.push(skuTags[i].name);
-      }
-      let skuAll = sku1s.reduce(
-        (x, y) => {
-          let arr = [];
-          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
-          return arr;
-        },
-        [[]]
-      );
-
-      let skuIdAll = skuIds.reduce(
-        (x, y) => {
-          let arr = [];
-          x.forEach((m) => y.forEach((y) => arr.push(m.concat([y]))));
-          return arr;
-        },
-        [[]]
-      );
-
-      for (let i = 0; i < skuAll.length; i++) {
-        let han = {
-          propertyNames: propertyNames,
-          propertyIds: propertyIds,
-          propertyChildNames: skuAll[i],
-          propertyChildIds: skuIdAll[i],
-          properties: this.form.skusList[i].properties,
-          picUrl: this.form.skusList[i].picUrl,
-          costPrice: this.form.skusList[i].costPrice,
-          originalPrice: this.form.skusList[i].originalPrice,
-          spuId: this.form.skusList[i].spuId,
-          prodName: this.form.skusList[i].prodName,
-          price: this.form.skusList[i].price,
-          barCode: this.form.skusList[i].barCode,
-          status: this.form.skusList[i].status,
-        };
-        this.form.skus.push(han);
-      }
-      this.form.skus.forEach((x) => {
-        x.properties = [];
-        for (let i = 0; i < x.propertyIds.length; i++) {
-          x.properties.push({
-            propertyId: x.propertyIds[i],
-            valueId: x.propertyChildIds[i],
-          });
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 9c619be3e..a8ce18852 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -234,7 +234,7 @@
 
 import {getBrandList} from "@/api/mall/product/brand";
 import {getProductCategoryList} from "@/api/mall/product/category";
-import {createSpu, getSpu} from "@/api/mall/product/spu";
+import {createSpu, updateSpu, getSpu} from "@/api/mall/product/spu";
 import {getPropertyPage,} from "@/api/mall/product/property";
 import Editor from "@/components/Editor";
 import ImageUpload from "@/components/ImageUpload";
@@ -261,6 +261,7 @@ export default {
       },
       // 基础设置
       baseForm: {
+        id: null,
         name: null,
         sellPoint: null,
         categoryIds: null,
@@ -391,6 +392,14 @@ export default {
           return;
         }
       let rates = this.ratesForm.rates;
+
+      // 价格元转分
+      rates.forEach(r=>{
+        r.marketPrice = r.marketPrice*100;
+        r.price = r.price*100;
+        r.costPrice = r.costPrice*100;
+      })
+
       // 动态规格调整字段
       if (this.ratesForm.spec == 2) {
         rates.forEach(r => {
@@ -403,9 +412,7 @@ export default {
                   obj = Array.of(s);
                }
               obj.forEach((v, i) => {
-                console.log(this.dynamicSpec, r, s, v, i)
                 let specValue = this.dynamicSpec[i].specValue.find(o => o.name == v);
-                console.log(specValue)
                 let propertie = {};
                 propertie.propertyId = this.dynamicSpec[i].specId;
                 propertie.valueId = specValue.id;
@@ -419,6 +426,7 @@ export default {
         rates[0].status = this.baseForm.status;
       }
       let form = this.baseForm
+
       if(form.picUrls instanceof Array){
         form.picUrls = form.picUrls.flatMap(m=>m.split(','))
       }else if(form.picUrls.split(',') instanceof Array){
@@ -426,18 +434,23 @@ export default {
       }else{
         form.picUrls = Array.of(form.picUrls)
       }
-
+      console.log(rates)
       form.skus = rates;
       form.specType = this.ratesForm.spec;
       form.categoryId = form.categoryIds[this.baseForm.categoryIds.length - 1];
-      createSpu(form).then((response) => {
-        console.log(response)
-        this.$modal.msgSuccess("新增成功");
-        this.$emit("closeDialog");
-        }).catch((err) => {
-          console.log(this.baseForm.picUrls)
-        });
+
+
+      if(form.id == null){
+        createSpu(form).then((response) => {
+          this.$modal.msgSuccess("新增成功");
+        })
+      }else{
+        updateSpu(form).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+        })
+      }
       });
+      this.$emit("closeDialog");
     },
     /** 查询规格 */
     getPropertyPageList() {
@@ -458,8 +471,8 @@ export default {
     },
     updateType(id){
         getSpu(id).then((response) =>{
-            console.log(response)
             let data = response.data;
+            this.baseForm.id=data.id;
             this.baseForm.name=data.name;
             this.baseForm.sellPoint=data.sellPoint;
             this.baseForm.categoryIds=data.categoryIds;
@@ -471,6 +484,11 @@ export default {
             this.baseForm.showStock=data.showStock;
             this.baseForm.brandId=data.brandId;
             this.ratesForm.spec=data.specType;
+            data.skus.forEach(r=>{
+              r.marketPrice = this.divide(r.marketPrice, 100)
+              r.price = this.divide(r.price, 100)
+              r.costPrice = this.divide(r.costPrice, 100)
+            })
             if(this.ratesForm.spec == 2){
               data.productPropertyViews.forEach(p=>{
                 let obj = {};
@@ -487,7 +505,6 @@ export default {
                 })
               })
             }
-            console.log(data.skus);
             this.ratesForm.rates=data.skus
         })
     }

From 02aede0417d80cdaa7d770869feb032e63bc807b Mon Sep 17 00:00:00 2001
From: wuxiran <wuxiran@outlook.com>
Date: Sun, 4 Sep 2022 22:52:28 +0800
Subject: [PATCH 49/56] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9coupon?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E3=80=81=E4=BB=A5=E5=8F=8A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0coupon=E7=9A=84enum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-module-mall/pom.xml                     |  7 +-
 .../yudao-module-coupon-api/pom.xml           |  7 ++
 .../enums/CouponExpireTimeTypeEnum.java       |  3 +-
 .../enums/CouponFetchTypeEnum.java            |  3 +-
 ...m.java => CouponForbidPreferenceEnum.java} |  9 +--
 .../enums/CouponGoodsTypeEnum.java            | 30 +++++++
 .../enums/CouponStatusTypeEnum.java           |  8 +-
 .../enums/CouponUseLimitEnum.java             |  6 +-
 .../enums/CouponValidityTypeEnum.java         |  2 +-
 .../yudao-module-coupon-biz/pom.xml           |  9 +--
 .../admin/coupon/CouponController.java        |  4 +-
 .../admin/coupon/vo/CouponBaseVO.java         |  2 +-
 .../CouponTempleteController.java             | 81 -------------------
 .../templete/CouponTempleteController.java    | 81 +++++++++++++++++++
 .../vo/CouponTempleteBaseVO.java              |  6 +-
 .../vo/CouponTempleteCreateReqVO.java         |  2 +-
 .../vo/CouponTempleteExcelVO.java             |  6 +-
 .../vo/CouponTempleteExportReqVO.java         |  2 +-
 .../vo/CouponTempletePageReqVO.java           |  2 +-
 .../vo/CouponTempleteRespVO.java              |  2 +-
 .../vo/CouponTempleteUpdateReqVO.java         |  2 +-
 .../CouponTemplete/CouponTempleteConvert.java |  8 +-
 .../CouponTemplete/CouponTempleteDO.java      |  4 +-
 .../CouponTemplete/CouponTempleteMapper.java  |  4 +-
 .../yudao/module/coupon/package-info.java     |  6 ++
 .../CouponTemplete/CouponTempleteService.java |  2 +-
 .../CouponTempleteServiceImpl.java            | 11 ++-
 yudao-server/pom.xml                          |  5 ++
 .../api/mall/CouponTemplete/CouponTemplete.js | 12 +--
 .../src/views/mall/CouponTemplete/index.vue   |  5 +-
 30 files changed, 191 insertions(+), 140 deletions(-)
 rename yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/{CouponProductTypeEnum.java => CouponForbidPreferenceEnum.java} (66%)
 create mode 100644 yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponGoodsTypeEnum.java
 delete mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/CouponTempleteController.java
 rename yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/{coupontemplete => templete}/vo/CouponTempleteBaseVO.java (97%)
 rename yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/{coupontemplete => templete}/vo/CouponTempleteCreateReqVO.java (77%)
 rename yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/{coupontemplete => templete}/vo/CouponTempleteExcelVO.java (95%)
 rename yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/{coupontemplete => templete}/vo/CouponTempleteExportReqVO.java (98%)
 rename yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/{coupontemplete => templete}/vo/CouponTempletePageReqVO.java (98%)
 rename yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/{coupontemplete => templete}/vo/CouponTempleteRespVO.java (85%)
 rename yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/{coupontemplete => templete}/vo/CouponTempleteUpdateReqVO.java (84%)
 create mode 100644 yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/package-info.java

diff --git a/yudao-module-mall/pom.xml b/yudao-module-mall/pom.xml
index 23812b4cc..68c1825cc 100644
--- a/yudao-module-mall/pom.xml
+++ b/yudao-module-mall/pom.xml
@@ -15,17 +15,18 @@
     <name>${project.artifactId}</name>
 
     <description>
-        商城大模块，由 product 商品、market 营销、trade 交易等组成
+        商城大模块，由 product 商品、market 营销、trade 交易 coupon等组成
     </description>
     <modules>
+        <module>yudao-module-coupon-api</module>
+        <module>yudao-module-coupon-biz</module>
         <module>yudao-module-market-api</module>
         <module>yudao-module-market-biz</module>
         <module>yudao-module-product-api</module>
         <module>yudao-module-product-biz</module>
         <module>yudao-module-trade-api</module>
         <module>yudao-module-trade-biz</module>
-        <module>yudao-module-coupon-api</module>
-        <module>yudao-module-coupon-biz</module>
+
     </modules>
 
 </project>
diff --git a/yudao-module-mall/yudao-module-coupon-api/pom.xml b/yudao-module-mall/yudao-module-coupon-api/pom.xml
index e98526f9c..6dab80613 100644
--- a/yudao-module-mall/yudao-module-coupon-api/pom.xml
+++ b/yudao-module-mall/yudao-module-coupon-api/pom.xml
@@ -23,6 +23,13 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-common</artifactId>
         </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java
index be6d2a90e..0e1e17ece 100644
--- a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponExpireTimeTypeEnum.java
@@ -14,7 +14,8 @@ import lombok.RequiredArgsConstructor;
 @Getter
 public enum CouponExpireTimeTypeEnum {
 
-    OPEN(1,"不开启"),CLOSE(0,"开启"),;
+    OPEN(1,"不开启"),
+    CLOSE(0,"开启"),;
 
     /**
      * 是否开启过期提醒
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java
index ffdd99c28..66a86bc84 100644
--- a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponFetchTypeEnum.java
@@ -14,7 +14,8 @@ import lombok.RequiredArgsConstructor;
 @Getter
 public enum CouponFetchTypeEnum {
 
-    LIMIT(0,"否"),NOT_LIMIT(0,"开启"),;
+    LIMIT(1,"限制"),
+    NOT_LIMIT(0,"不限制"),;
 
     /**
      * 是否开启过期提醒
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponProductTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponForbidPreferenceEnum.java
similarity index 66%
rename from yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponProductTypeEnum.java
rename to yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponForbidPreferenceEnum.java
index f5e6cf995..1ac9e9f68 100644
--- a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponProductTypeEnum.java
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponForbidPreferenceEnum.java
@@ -6,17 +6,16 @@ import lombok.RequiredArgsConstructor;
 
 
 /**
- * 优惠券 - 优惠券类型
+ * 优惠券 - 优惠叠加类型
  *
  * @author Sin
  */
 @RequiredArgsConstructor
 @Getter
-public enum CouponProductTypeEnum {
+public enum CouponForbidPreferenceEnum {
 
-    PROCESSING(1,"进行中"),
-    END(2,"已结束"),
-    CLOSE(3,"已关闭"),;
+    UN_FORBID(0,"不限制"),
+    FORBID(1,"优惠券仅原价购买商品时可用");
 
     /**
      * 优惠券类型
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponGoodsTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponGoodsTypeEnum.java
new file mode 100644
index 000000000..e0946b7a0
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponGoodsTypeEnum.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.CouponTemplete.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 优惠券 - 优惠券商品使用类型
+ *
+ * @author Sin
+ */
+@RequiredArgsConstructor
+@Getter
+public enum CouponGoodsTypeEnum {
+
+    ALL(1,"全部商品可用"),
+    POINT_PRODUCT(2,"指定商品可用"),
+    POINT_PRODUCT_NOT(3,"指定商品不可用"),;
+
+    /**
+     * 优惠券商品使用类型
+     */
+    private final Integer type;
+    /**
+     * 优惠券商品使用类型名
+     */
+    private final String name;
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java
index c58ce36b4..813084731 100644
--- a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponStatusTypeEnum.java
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 
 
 /**
- * 优惠券 - 优惠券类型
+ * 优惠券 - 优惠券状态类型
  *
  * @author Sin
  */
@@ -14,9 +14,9 @@ import lombok.RequiredArgsConstructor;
 @Getter
 public enum CouponStatusTypeEnum {
 
-    ALL(1,"全部商品可用"),
-    POINT_PRODUCT(2,"指定商品可用"),
-    POINT_PRODUCT_NOT(3,"指定商品不可用不能为空"),;
+    PROCESSING(1,"进行中"),
+    END(2,"已结束"),
+    CLOSE(3,"已关闭"),;
 
     /**
      * 优惠券类型
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java
index 61d2f429b..beb530f0c 100644
--- a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponUseLimitEnum.java
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 
 
 /**
- * 优惠券 - 优惠券类型
+ * 优惠券使用类型 - 优惠券使用类型类型
  *
  * @author Sin
  */
@@ -18,11 +18,11 @@ public enum CouponUseLimitEnum {
     NO_LIMIT(2,"有门槛"),;
 
     /**
-     * 优惠券类型
+     * 优惠券使用类型
      */
     private final Integer type;
     /**
-     * 优惠券类型名
+     * 优惠券使用类型名
      */
     private final String name;
 
diff --git a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java
index 6411ecbf9..798cf1e0f 100644
--- a/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java
+++ b/yudao-module-mall/yudao-module-coupon-api/src/main/java/cn/iocoder/yudao/module/CouponTemplete/enums/CouponValidityTypeEnum.java
@@ -14,7 +14,7 @@ public enum CouponValidityTypeEnum {
 
     TIME_RANGE_EXPIRTED(1,"时间范围过期"),
     EXPIRES_AFTER_FIXED_DATE(2,"领取之日固定日期后过期"),
-    EXPIRES_DATE_NEXT_FIEXD_DATE(3,"领取次日固定日期后过期不能为空"),;
+    EXPIRES_DATE_NEXT_FIEXD_DATE(3,"领取次日固定日期后过期"),;
 
 
     /**
diff --git a/yudao-module-mall/yudao-module-coupon-biz/pom.xml b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
index 735d5180d..eda16bd16 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
@@ -3,19 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yudao-module-mall</artifactId>
         <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-mall</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-module-coupon-biz</artifactId>
     <packaging>jar</packaging>
-
+    <artifactId>yudao-module-coupon-biz</artifactId>
 
     <name>${project.artifactId}</name>
+
     <description>
-        trade 模块，主要实现交易相关功能
-        例如：订单、退款、购物车等功能。
+        coupon模块，主要负责优惠券的一些业务，含发布优惠券模板，分发优惠券等
     </description>
 
     <dependencies>
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
index 6e099269a..8ee02c366 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/CouponController.java
@@ -21,7 +21,7 @@ import cn.iocoder.yudao.module.coupon.service.coupon.CouponService;
 
 @Api(tags = "管理后台 - 优惠券")
 @RestController
-@RequestMapping("/coupon/coupon/")
+@RequestMapping("/coupon/item")
 @Validated
 public class CouponController {
 
@@ -69,7 +69,7 @@ public class CouponController {
 
     @GetMapping("/list")
     @ApiOperation("获得优惠券列表")
-//    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
     @PreAuthorize("@ss.hasPermission('coupon::query')")
     public CommonResult<List<CouponRespVO>> getList(@RequestParam("ids") Collection<Long> ids) {
         List<CouponDO> list = couponService.getList(ids);
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
index 20dba42d8..31cc828f7 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
@@ -68,7 +68,7 @@ public class CouponBaseVO {
     private Boolean whetherForbidPreference;
 
     @ApiModelProperty(value = "是否开启过期提醒0-不开启 1-开启", required = true)
-    @NotNull(message = "是否开启过期提醒0-不开启 1-开启不能为空")
+    @NotNull(message = "是否开启过期提醒0-不开启 1-开启")
     private Boolean whetherExpireNotice;
 
     @ApiModelProperty(value = "过期前N天提醒", required = true)
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
deleted file mode 100644
index 40d9ac429..000000000
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/CouponTempleteController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete;
-
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.*;
-import cn.iocoder.yudao.module.coupon.convert.CouponTemplete.CouponTempleteConvert;
-import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
-import cn.iocoder.yudao.module.coupon.service.CouponTemplete.CouponTempleteService;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.annotations.*;
-
-import javax.validation.*;
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Api(tags = "管理后台 - 优惠券模板")
-@RestController
-@RequestMapping("/coupon/CouponTemplete/")
-@Validated
-public class CouponTempleteController {
-
-    @Resource
-    private CouponTempleteService Service;
-
-    @PostMapping("/create")
-    @ApiOperation("创建优惠券模板")
-    @PreAuthorize("@ss.hasPermission('CouponTemplete::create')")
-    public CommonResult<Long> create(@Valid @RequestBody CouponTempleteCreateReqVO createReqVO) {
-        return success(Service.create(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新优惠券模板")
-    @PreAuthorize("@ss.hasPermission('CouponTemplete::update')")
-    public CommonResult<Boolean> update(@Valid @RequestBody CouponTempleteUpdateReqVO updateReqVO) {
-        Service.update(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除优惠券模板")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('CouponTemplete::delete')")
-    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
-        Service.delete(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @ApiOperation("获得优惠券模板")
-//    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
-    public CommonResult<CouponTempleteRespVO> get(@RequestParam("id") Long id) {
-        CouponTempleteDO couponTempleteDO = Service.get(id);
-        return success(CouponTempleteConvert.INSTANCE.convert(couponTempleteDO));
-    }
-
-    @GetMapping("/list")
-    @ApiOperation("获得优惠券模板列表")
-//    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
-    public CommonResult<List<CouponTempleteRespVO>> getList(@RequestParam("ids") Collection<Long> ids) {
-        List<CouponTempleteDO> list = Service.getList(ids);
-        return success(CouponTempleteConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @ApiOperation("获得优惠券模板分页")
-    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
-    public CommonResult<PageResult<CouponTempleteRespVO>> getPage(@Valid CouponTempletePageReqVO pageVO) {
-        PageResult<CouponTempleteDO> pageResult = Service.getPage(pageVO);
-        return success(CouponTempleteConvert.INSTANCE.convertPage(pageResult));
-    }
-
-
-
-}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/CouponTempleteController.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/CouponTempleteController.java
new file mode 100644
index 000000000..a81f53c09
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/CouponTempleteController.java
@@ -0,0 +1,81 @@
+package cn.iocoder.yudao.module.coupon.controller.admin.templete;
+
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.*;
+import cn.iocoder.yudao.module.coupon.convert.CouponTemplete.CouponTempleteConvert;
+import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
+import cn.iocoder.yudao.module.coupon.service.CouponTemplete.CouponTempleteService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.annotations.*;
+
+import javax.validation.*;
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "管理后台 - 优惠券模板")
+@RestController
+@RequestMapping("/coupon/template")
+@Validated
+public class CouponTempleteController {
+
+    @Resource
+    private CouponTempleteService couponTempleteServiceService;
+
+    @PostMapping("/create")
+    @ApiOperation("创建优惠券模板")
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::create')")
+    public CommonResult<Long> create(@Valid @RequestBody CouponTempleteCreateReqVO createReqVO) {
+        return success(couponTempleteServiceService.create(createReqVO));
+    }
+
+//    @PutMapping("/update")
+//    @ApiOperation("更新优惠券模板")
+//    @PreAuthorize("@ss.hasPermission('CouponTemplete::update')")
+//    public CommonResult<Boolean> update(@Valid @RequestBody CouponTempleteUpdateReqVO updateReqVO) {
+//        couponTempleteServiceService.update(updateReqVO);
+//        return success(true);
+//    }
+//
+//    @DeleteMapping("/delete")
+//    @ApiOperation("删除优惠券模板")
+//    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+//    @PreAuthorize("@ss.hasPermission('CouponTemplete::delete')")
+//    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+//        couponTempleteServiceService.delete(id);
+//        return success(true);
+//    }
+//
+//    @GetMapping("/get")
+//    @ApiOperation("获得优惠券模板")
+//    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+//    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
+//    public CommonResult<CouponTempleteRespVO> get(@RequestParam("id") Long id) {
+//        CouponTempleteDO couponTempleteDO = couponTempleteServiceService.get(id);
+//        return success(CouponTempleteConvert.INSTANCE.convert(couponTempleteDO));
+//    }
+//
+//    @GetMapping("/list")
+//    @ApiOperation("获得优惠券模板列表")
+//    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+//    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
+//    public CommonResult<List<CouponTempleteRespVO>> getList(@RequestParam("ids") Collection<Long> ids) {
+//        List<CouponTempleteDO> list = couponTempleteServiceService.getList(ids);
+//        return success(CouponTempleteConvert.INSTANCE.convertList(list));
+//    }
+//
+    @GetMapping("/page")
+    @ApiOperation("获得优惠券模板分页")
+    @PreAuthorize("@ss.hasPermission('CouponTemplete::query')")
+    public CommonResult<PageResult<CouponTempleteRespVO>> getPage(@Valid CouponTempletePageReqVO pageVO) {
+        PageResult<CouponTempleteDO> pageResult = couponTempleteServiceService.getPage(pageVO);
+        return success(CouponTempleteConvert.INSTANCE.convertPage(pageResult));
+    }
+
+
+
+}
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
similarity index 97%
rename from yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
rename to yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
index d9818344f..942abe896 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteBaseVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+package cn.iocoder.yudao.module.coupon.controller.admin.templete.vo;
 
 import lombok.*;
 import java.util.*;
@@ -34,7 +34,7 @@ public class CouponTempleteBaseVO {
 
     @ApiModelProperty(value = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用", required = true)
     @NotNull(message = "适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用不能为空")
-    private Boolean goodsType;
+    private Integer goodsType;
 
     @ApiModelProperty(value = "适用商品id")
     private String productIds;
@@ -104,7 +104,7 @@ public class CouponTempleteBaseVO {
 
 
     @ApiModelProperty(value = "领取是否无限制0-否 1是", required = true)
-    @NotNull(message = "是否无限制0-否 1是 不能为空")
+    @NotNull(message = "是否无限制0-否 1是")
     private Boolean whetherLimitless;
 
     @ApiModelProperty(value = "每人最大领取个数", required = true)
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteCreateReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteCreateReqVO.java
similarity index 77%
rename from yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteCreateReqVO.java
rename to yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteCreateReqVO.java
index fa13b77a5..8e1d9a51a 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteCreateReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+package cn.iocoder.yudao.module.coupon.controller.admin.templete.vo;
 
 import lombok.*;
 import io.swagger.annotations.*;
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExcelVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
similarity index 95%
rename from yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExcelVO.java
rename to yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
index a09b3ff71..1101f9b61 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExcelVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+package cn.iocoder.yudao.module.coupon.controller.admin.templete.vo;
 
 import lombok.*;
 import java.util.*;
@@ -39,7 +39,7 @@ public class CouponTempleteExcelVO {
     private Integer usedCount;
 
     @ExcelProperty("适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用")
-    private Boolean goodsType;
+    private Integer goodsType;
 
     @ExcelProperty("适用商品id")
     private String productIds;
@@ -66,7 +66,7 @@ public class CouponTempleteExcelVO {
     private BigDecimal maxMoney;
 
     @ExcelProperty("过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期")
-    private Boolean validityType;
+    private Integer validityType;
 
     @ExcelProperty("使用开始日期 过期类型1时必填")
     private Date startUseTime;
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExportReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExportReqVO.java
rename to yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
index b8b8fced1..0420e3d9e 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteExportReqVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+package cn.iocoder.yudao.module.coupon.controller.admin.templete.vo;
 
 import lombok.*;
 
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempletePageReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempletePageReqVO.java
rename to yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
index 92622d793..3ff5710c7 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempletePageReqVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+package cn.iocoder.yudao.module.coupon.controller.admin.templete.vo;
 
 import lombok.*;
 
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteRespVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
similarity index 85%
rename from yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteRespVO.java
rename to yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
index 318492a24..b65f7c259 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteRespVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+package cn.iocoder.yudao.module.coupon.controller.admin.templete.vo;
 
 import lombok.*;
 import java.util.*;
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteUpdateReqVO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteUpdateReqVO.java
similarity index 84%
rename from yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteUpdateReqVO.java
rename to yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteUpdateReqVO.java
index 7d0fb7544..1ee8b539d 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupontemplete/vo/CouponTempleteUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteUpdateReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo;
+package cn.iocoder.yudao.module.coupon.controller.admin.templete.vo;
 
 import lombok.*;
 import io.swagger.annotations.*;
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java
index ddd774053..a7f37919d 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/convert/CouponTemplete/CouponTempleteConvert.java
@@ -4,10 +4,10 @@ import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteCreateReqVO;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteExcelVO;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteRespVO;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteUpdateReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteCreateReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteExcelVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteRespVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteUpdateReqVO;
 import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
index 106c459a1..e33771808 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
@@ -57,7 +57,7 @@ public class CouponTempleteDO extends BaseDO {
     /**
      * 适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用
      */
-    private Boolean goodsType;
+    private Integer goodsType;
     /**
      * 适用商品id
      */
@@ -93,7 +93,7 @@ public class CouponTempleteDO extends BaseDO {
     /**
      * 过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期
      */
-    private Boolean validityType;
+    private Integer validityType;
     /**
      * 使用开始日期 过期类型1时必填
      */
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java
index b930f113f..3243ce17a 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/mysql/CouponTemplete/CouponTempleteMapper.java
@@ -5,8 +5,8 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteExportReqVO;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempletePageReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteExportReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempletePageReqVO;
 import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/package-info.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/package-info.java
new file mode 100644
index 000000000..6743fd141
--- /dev/null
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * coupon模块，主要负责麦一些优惠券的额增删
+ *
+ * 1. Controller URL：以 /coumon/ 开头，避免和其它 Module 冲突
+ */
+package cn.iocoder.yudao.module.coupon;
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java
index f0ad215c8..0527d11b7 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteService.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.coupon.service.CouponTemplete;
 
 import java.util.*;
 import javax.validation.*;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.*;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
 
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
index f3f826b81..6f07c4b2a 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/CouponTemplete/CouponTempleteServiceImpl.java
@@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.coupon.service.CouponTemplete;
 
 import cn.iocoder.yudao.module.CouponTemplete.enums.CouponTypeEnum;
 import cn.iocoder.yudao.module.CouponTemplete.enums.CouponValidityTypeEnum;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteCreateReqVO;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteExportReqVO;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempletePageReqVO;
-import cn.iocoder.yudao.module.coupon.controller.admin.coupontemplete.vo.CouponTempleteUpdateReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteCreateReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteExportReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempletePageReqVO;
+import cn.iocoder.yudao.module.coupon.controller.admin.templete.vo.CouponTempleteUpdateReqVO;
 import cn.iocoder.yudao.module.coupon.convert.CouponTemplete.CouponTempleteConvert;
 import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
 import cn.iocoder.yudao.module.coupon.dal.mysql.CouponTemplete.CouponTempleteMapper;
-import cn.iocoder.yudao.module.coupon.service.CouponTemplete.CouponTempleteService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -41,7 +40,7 @@ public class CouponTempleteServiceImpl implements CouponTempleteService {
         /* 验证类型、判断必填*/
         checkCouponType(createReqVO);
 
-        /*todo 验证过期类型、判断必填*/
+        /*验证过期类型、判断必填*/
         checkValidityType(createReqVO);
 
 
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index c7090aa6e..852a9dff0 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -56,6 +56,11 @@
             <artifactId>yudao-module-trade-biz</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-coupon-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <!-- 数据报表 -->
 <!--        <dependency>-->
 <!--            <groupId>cn.iocoder.boot</groupId>-->
diff --git a/yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js b/yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js
index 429dfb8dc..639a75a1d 100644
--- a/yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js
+++ b/yudao-ui-admin/src/api/mall/CouponTemplete/CouponTemplete.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建优惠券模板
 export function create(data) {
   return request({
-    url: '/coupon/CouponTemplete/create',
+    url: '/coupon/template/create',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function create(data) {
 // 更新优惠券模板
 export function update(data) {
   return request({
-    url: '/coupon/CouponTemplete/update',
+    url: '/coupon/template/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function update(data) {
 // 删除优惠券模板
 export function deleteCouponTemplete (id) {
   return request({
-    url: '/coupon/CouponTemplete/delete?id=' + id,
+    url: '/coupon/template/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteCouponTemplete (id) {
 // 获得优惠券模板
 export function get(id) {
   return request({
-    url: '/coupon/CouponTemplete/get?id=' + id,
+    url: '/coupon/template/get?id=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function get(id) {
 // 获得优惠券模板分页
 export function getPage(query) {
   return request({
-    url: '/coupon/CouponTemplete/page',
+    url: '/coupon/template/page',
     method: 'get',
     params: query
   })
@@ -46,7 +46,7 @@ export function getPage(query) {
 // 导出优惠券模板 Excel
 export function exportExcel(query) {
   return request({
-    url: '/coupon/CouponTemplete/export-excel',
+    url: '/coupon/template/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'
diff --git a/yudao-ui-admin/src/views/mall/CouponTemplete/index.vue b/yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
index 47be4afd3..945bb03ea 100644
--- a/yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
+++ b/yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
@@ -43,7 +43,6 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="用户ID" align="center" prop="id" />
 
     <!--      todo 优惠券类型-->
       <el-table-column label="优惠券类型" align="center" prop="type" />
@@ -229,6 +228,7 @@
 
 <script>
 import { create, update, deleteCouponTemplete, get, getPage, exportExcel } from "@/api/mall/CouponTemplete/CouponTemplete.js";
+import {getDictDatas} from "@/utils/dict";
 
 export default {
   name: "",
@@ -288,6 +288,9 @@ export default {
         endTime: [],
         createTime: [],
       },
+      //数据字典
+      datas:getDictDatas(),
+
       // 表单参数
       form: {},
       // 表单校验

From f4324a22f267da7b16d1725dab8df37b683c6aab Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 4 Sep 2022 23:15:29 +0800
Subject: [PATCH 50/56] =?UTF-8?q?mall=EF=BC=9A=20code=20review=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E5=9D=97=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/enums/ErrorCodeConstants.java     | 33 ++++---
 .../admin/brand/ProductBrandController.java   | 10 --
 .../category/ProductCategoryController.java   | 10 +-
 .../property/ProductPropertyController.java   |  6 +-
 .../vo/ProductPropertyAndValueRespVO.java     | 30 ++++++
 .../property/vo/ProductPropertyBaseVO.java    |  7 +-
 .../property/vo/ProductPropertyRespVO.java    | 23 -----
 .../sku/vo/ProductSkuCreateOrUpdateReqVO.java |  3 +-
 .../admin/spu/ProductSpuController.java       |  4 +-
 .../controller/admin/spu/vo/SpuRespVO.java    |  2 +
 .../app/category/AppCategoryController.java   |  2 +-
 .../property/ProductPropertyConvert.java      |  6 +-
 .../dal/mysql/brand/ProductBrandMapper.java   |  2 +-
 .../dal/mysql/sku/ProductSkuMapper.java       | 10 +-
 .../service/brand/ProductBrandService.java    |  5 +-
 .../brand/ProductBrandServiceImpl.java        | 17 ++--
 .../category/ProductCategoryService.java      | 19 ++--
 .../category/ProductCategoryServiceImpl.java  | 48 ++++++----
 .../property/ProductPropertyService.java      | 22 +++--
 .../property/ProductPropertyServiceImpl.java  | 22 ++---
 .../service/sku/ProductSkuService.java        |  9 +-
 .../service/sku/ProductSkuServiceImpl.java    | 94 ++++++++++---------
 .../service/spu/ProductSpuService.java        |  4 +-
 .../service/spu/ProductSpuServiceImpl.java    | 30 +++---
 .../brand/ProductBrandServiceImplTest.java    |  6 +-
 .../ProductCategoryServiceImplTest.java       | 14 +--
 .../spu/ProductSpuServiceImplTest.java        |  6 +-
 27 files changed, 228 insertions(+), 216 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyAndValueRespVO.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyRespVO.java

diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
index 454314e78..af97bb9c3 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
@@ -10,30 +10,29 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 public interface ErrorCodeConstants {
 
     // ========== 商品分类相关 1008001000 ============
-    ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1008001000, "商品分类不存在");
-    ErrorCode PRODUCT_CATEGORY_PARENT_NOT_EXISTS = new ErrorCode(1008001001, "父分类不存在");
-    ErrorCode PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL = new ErrorCode(1008001002, "父分类不能是二级分类");
-    ErrorCode PRODUCT_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1008001003, "存在子分类，无法删除");
-    ErrorCode PRODUCT_CATEGORY_DISABLED = new ErrorCode(1008001004, "商品分类({})已禁用，无法使用");
-    ErrorCode PRODUCT_CATEGORY_LEVEL = new ErrorCode(1008001005, "商品需挂在三级分类下");
+    ErrorCode CATEGORY_NOT_EXISTS = new ErrorCode(1008001000, "商品分类不存在");
+    ErrorCode CATEGORY_PARENT_NOT_EXISTS = new ErrorCode(1008001001, "父分类不存在");
+    ErrorCode CATEGORY_PARENT_NOT_FIRST_LEVEL = new ErrorCode(1008001002, "父分类不能是二级分类");
+    ErrorCode CATEGORY_EXISTS_CHILDREN = new ErrorCode(1008001003, "存在子分类，无法删除");
+    ErrorCode CATEGORY_DISABLED = new ErrorCode(1008001004, "商品分类({})已禁用，无法使用");
+    ErrorCode CATEGORY_LEVEL_ERROR = new ErrorCode(1008001005, "商品分类不正确，原因：必须使用第三级的商品分类下");
 
-    // ========== 品牌相关编号 1008002000 ==========
-    ErrorCode PRODUCT_BRAND_NOT_EXISTS = new ErrorCode(1008002000, "品牌不存在");
+    // ========== 商品品牌相关编号 1008002000 ==========
+    ErrorCode BRAND_NOT_EXISTS = new ErrorCode(1008002000, "品牌不存在");
 
-    // ========== 规格名称 1008003000 ==========
+    // ========== 商品规格名称 1008003000 ==========
     ErrorCode PROPERTY_NOT_EXISTS = new ErrorCode(1008003000, "规格名称不存在");
 
     // ========== 规格值 1008004000 ==========
     ErrorCode PROPERTY_VALUE_NOT_EXISTS = new ErrorCode(1008004000, "规格值不存在");
 
-    // ========== 商品spu 1008005000 ==========
-    ErrorCode SPU_NOT_EXISTS = new ErrorCode(1008005000, "商品spu不存在");
+    // ========== 商品 SPU 1008005000 ==========
+    ErrorCode SPU_NOT_EXISTS = new ErrorCode(1008005000, "商品 SPU 不存在");
 
-    // ========== 商品sku 1008006000 ==========
-    ErrorCode SKU_NOT_EXISTS = new ErrorCode(1008006000, "商品sku不存在");
-    ErrorCode SKU_PROPERTIES_DUPLICATED = new ErrorCode(1008006001, "商品sku的属性组合存在重复");
+    // ========== 商品 SKU 1008006000 ==========
+    ErrorCode SKU_NOT_EXISTS = new ErrorCode(1008006000, "商品 SKU 不存在");
+    ErrorCode SKU_PROPERTIES_DUPLICATED = new ErrorCode(1008006001, "商品 SKU 的属性组合存在重复");
+    ErrorCode SPU_ATTR_NUMBERS_MUST_BE_EQUALS = new ErrorCode(1008006002, "一个 SPU 下的每个 SKU，其规格数必须一致");
+    ErrorCode SPU_SKU_NOT_DUPLICATE = new ErrorCode(1008006003, "一个 SPU 下的每个 SKU，必须不重复");
 
-    ErrorCode PRODUCT_SPU_ATTR_NUMBERS_MUST_BE_EQUALS = new ErrorCode(1008006002, "一个 Spu 下的每个 SKU ，其规格数必须一致");
-
-    ErrorCode PRODUCT_SPU_SKU_NOT_DUPLICATE = new ErrorCode(1008006003, "一个 SPU 下的每个 SKU ，必须不重复");
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
index c159883be..0558d9866 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
@@ -2,15 +2,9 @@ package cn.iocoder.yudao.module.product.controller.admin.brand;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryRespVO;
 import cn.iocoder.yudao.module.product.convert.brand.ProductBrandConvert;
-import cn.iocoder.yudao.module.product.convert.category.ProductCategoryConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.service.brand.ProductBrandService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -20,14 +14,11 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.Comparator;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Api(tags = "管理后台 - 商品品牌")
 @RestController
@@ -88,5 +79,4 @@ public class ProductBrandController {
         return success(ProductBrandConvert.INSTANCE.convertList(list));
     }
 
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
index 4467d392a..2a93a5a26 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
@@ -35,14 +35,14 @@ public class ProductCategoryController {
     @ApiOperation("创建商品分类")
     @PreAuthorize("@ss.hasPermission('product:category:create')")
     public CommonResult<Long> createProductCategory(@Valid @RequestBody ProductCategoryCreateReqVO createReqVO) {
-        return success(categoryService.createProductCategory(createReqVO));
+        return success(categoryService.createCategory(createReqVO));
     }
 
     @PutMapping("/update")
     @ApiOperation("更新商品分类")
     @PreAuthorize("@ss.hasPermission('product:category:update')")
     public CommonResult<Boolean> updateProductCategory(@Valid @RequestBody ProductCategoryUpdateReqVO updateReqVO) {
-        categoryService.updateProductCategory(updateReqVO);
+        categoryService.updateCategory(updateReqVO);
         return success(true);
     }
 
@@ -51,7 +51,7 @@ public class ProductCategoryController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:category:delete')")
     public CommonResult<Boolean> deleteProductCategory(@RequestParam("id") Long id) {
-        categoryService.deleteProductCategory(id);
+        categoryService.deleteCategory(id);
         return success(true);
     }
 
@@ -60,7 +60,7 @@ public class ProductCategoryController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:category:query')")
     public CommonResult<ProductCategoryRespVO> getProductCategory(@RequestParam("id") Long id) {
-        ProductCategoryDO category = categoryService.getProductCategory(id);
+        ProductCategoryDO category = categoryService.getCategory(id);
         return success(ProductCategoryConvert.INSTANCE.convert(category));
     }
 
@@ -68,7 +68,7 @@ public class ProductCategoryController {
     @ApiOperation("获得商品分类列表")
     @PreAuthorize("@ss.hasPermission('product:category:query')")
     public CommonResult<List<ProductCategoryRespVO>> getProductCategoryList(@Valid ProductCategoryListReqVO treeListReqVO) {
-        List<ProductCategoryDO> list = categoryService.getEnableProductCategoryList(treeListReqVO);
+        List<ProductCategoryDO> list = categoryService.getEnableCategoryList(treeListReqVO);
         list.sort(Comparator.comparing(ProductCategoryDO::getSort));
         return success(ProductCategoryConvert.INSTANCE.convertList(list));
     }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
index f1d31acab..6ed0ec1d1 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
@@ -62,7 +62,7 @@ public class ProductPropertyController {
     @ApiOperation("获得规格名称")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<ProductPropertyRespVO> getProperty(@RequestParam("id") Long id) {
+    public CommonResult<ProductPropertyAndValueRespVO> getProperty(@RequestParam("id") Long id) {
         return success(productPropertyService.getPropertyResp(id));
     }
 
@@ -70,7 +70,7 @@ public class ProductPropertyController {
     @ApiOperation("获得规格名称列表")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
     @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<List<ProductPropertyRespVO>> getPropertyList(@RequestParam("ids") Collection<Long> ids) {
+    public CommonResult<List<ProductPropertyAndValueRespVO>> getPropertyList(@RequestParam("ids") Collection<Long> ids) {
         List<ProductPropertyDO> list = productPropertyService.getPropertyList(ids);
         return success(ProductPropertyConvert.INSTANCE.convertList(list));
     }
@@ -78,7 +78,7 @@ public class ProductPropertyController {
     @GetMapping("/page")
     @ApiOperation("获得规格名称分页")
     @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<PageResult<ProductPropertyRespVO>> getPropertyPage(@Valid ProductPropertyPageReqVO pageVO) {
+    public CommonResult<PageResult<ProductPropertyAndValueRespVO>> getPropertyPage(@Valid ProductPropertyPageReqVO pageVO) {
         return success(productPropertyService.getPropertyListPage(pageVO));
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyAndValueRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyAndValueRespVO.java
new file mode 100644
index 000000000..7a73ca35f
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyAndValueRespVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.product.controller.admin.property.vo;
+
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.Date;
+import java.util.List;
+
+@ApiModel("管理后台 - 规格 + 规格值 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductPropertyAndValueRespVO extends ProductPropertyBaseVO {
+
+    @ApiModelProperty(value = "规格的编号", required = true, example = "1024")
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+    /**
+     * 规格值的集合
+     */
+    private List<ProductPropertyValueRespVO> values;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyBaseVO.java
index 4d38763f9..e3deb8838 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyBaseVO.java
@@ -1,10 +1,9 @@
 package cn.iocoder.yudao.module.product.controller.admin.property.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+// TODO @芋艿：完整的 review 下规格
 /**
 * 规格名称 Base VO，提供给添加、修改、详细的子 VO 使用
 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyRespVO.java
deleted file mode 100644
index 978f26308..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyRespVO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
-
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-
-@ApiModel("管理后台 - 规格名称 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ProductPropertyRespVO extends ProductPropertyBaseVO {
-
-    @ApiModelProperty(value = "主键", required = true)
-    private Long id;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "属性值")
-    private List<ProductPropertyValueRespVO> propertyValueList;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
index c9d059578..adc450011 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
@@ -6,14 +6,13 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotEmpty;
-
 @ApiModel("管理后台 - 商品 SKU 创建/更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ProductSkuCreateOrUpdateReqVO extends ProductSkuBaseVO {
 
+    // TODO @Luowenfeng：可以不用哈，如果基于规格匹配
     @ApiModelProperty(value = "商品 id 更新时须有", example = "1")
     private Long id;
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
index 31dba3eff..4fa59012d 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
@@ -36,14 +36,14 @@ public class ProductSpuController {
     @ApiOperation("创建商品 SPU")
     @PreAuthorize("@ss.hasPermission('product:spu:create')")
     public CommonResult<Long> createProductSpu(@Valid @RequestBody ProductSpuCreateReqVO createReqVO) {
-        return success(spuService.createProductSpu(createReqVO));
+        return success(spuService.createSpu(createReqVO));
     }
 
     @PutMapping("/update")
     @ApiOperation("更新商品 SPU")
     @PreAuthorize("@ss.hasPermission('product:spu:update')")
     public CommonResult<Boolean> updateSpu(@Valid @RequestBody ProductSpuUpdateReqVO updateReqVO) {
-        spuService.updateProductSpu(updateReqVO);
+        spuService.updateSpu(updateReqVO);
         return success(true);
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
index 0121aec47..7cdf6f975 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
@@ -35,6 +35,8 @@ public class SpuRespVO extends ProductSpuBaseVO {
     @ApiModelProperty(value = "分类id数组，一直递归到一级父节点", example = "[1,2,4]")
     private LinkedList<Long> categoryIds;
 
+    // TODO @芋艿：再琢磨下 这个 VO 类，其实变成 SpuRespVO 内嵌的 VO 类会更好一点；然后把 SpuRespVO 改成 SpuDetailSpuVO
+
     @ApiModelProperty(value = "规格属性修改和详情展示组合", example = "[{\"propertyId\":2,\"name\":\"内存\",\"propertyValues\":[{\"v1\":11,\"v2\":\"64G\"},{\"v1\":10,\"v2\":\"32G\"}]},{\"propertyId\":3,\"name\":\"尺寸\",\"propertyValues\":[{\"v1\":16,\"v2\":\"6.1\"},{\"v1\":15,\"v2\":\"5.7\"}]}]")
     private List<ProductPropertyViewRespVO> productPropertyViews;
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
index 1b5664b85..fec882c48 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
@@ -30,7 +30,7 @@ public class AppCategoryController {
     @GetMapping("/list")
     @ApiOperation("获得商品分类列表")
     public CommonResult<List<AppCategoryRespVO>> getProductCategoryList() {
-        List<ProductCategoryDO> list = categoryService.getEnableProductCategoryList();
+        List<ProductCategoryDO> list = categoryService.getEnableCategoryList();
         list.sort(Comparator.comparing(ProductCategoryDO::getSort));
         return success(ProductCategoryConvert.INSTANCE.convertList03(list));
     }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
index c44cdc841..022580f30 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
@@ -23,11 +23,11 @@ public interface ProductPropertyConvert {
 
     ProductPropertyDO convert(ProductPropertyUpdateReqVO bean);
 
-    ProductPropertyRespVO convert(ProductPropertyDO bean);
+    ProductPropertyAndValueRespVO convert(ProductPropertyDO bean);
 
-    List<ProductPropertyRespVO> convertList(List<ProductPropertyDO> list);
+    List<ProductPropertyAndValueRespVO> convertList(List<ProductPropertyDO> list);
 
-    PageResult<ProductPropertyRespVO> convertPage(PageResult<ProductPropertyDO> page);
+    PageResult<ProductPropertyAndValueRespVO> convertPage(PageResult<ProductPropertyDO> page);
 
     List<ProductPropertyExcelVO> convertList02(List<ProductPropertyDO> list);
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
index 38558564c..55e4e6927 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.product.dal.mysql.brand;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandListReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
@@ -27,4 +26,5 @@ public interface ProductBrandMapper extends BaseMapperX<ProductBrandDO> {
         return selectList(new LambdaQueryWrapperX<ProductBrandDO>()
                 .likeIfPresent(ProductBrandDO::getName, reqVO.getName()));
     }
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index 7651e0c8c..0e3c8653c 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReq
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -34,13 +33,12 @@ public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
 
 
     // TODO @franky：方法名 selectList; 可以直接调用 selectList
-    default List<ProductSkuDO> selectBySpuIds(List<Long> spuIds) {
-        return selectList(new LambdaQueryWrapperX<ProductSkuDO>()
-                .inIfPresent(ProductSkuDO::getSpuId, spuIds));
+    default List<ProductSkuDO> selectListBySpuIds(List<Long> spuIds) {
+        return selectList(ProductSkuDO::getSpuId, spuIds);
     }
 
-    default List<ProductSkuDO> selectBySpuId(Long spuIds) {
-        return selectBySpuIds(Collections.singletonList(spuIds));
+    default List<ProductSkuDO> selectListBySpuId(Long spuId) {
+        return selectList(ProductSkuDO::getSpuId, spuId);
     }
 
     default void deleteBySpuId(Long spuId) {
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
index 4c9060055..54d4df601 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
@@ -55,10 +55,11 @@ public interface ProductBrandService {
 
     /**
      * 获得品牌列表
-     * @param listVo 请求参数
+     *
+     * @param listReqVO 请求参数
      * @return 品牌列表
      */
-    List<ProductBrandDO> getBrandList(ProductBrandListReqVO listVo);
+    List<ProductBrandDO> getBrandList(ProductBrandListReqVO listReqVO);
 
     /**
      * 验证选择的商品分类是否合法
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
index be67260ff..28a02da38 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.product.service.brand;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandListReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
 import cn.iocoder.yudao.module.product.convert.brand.ProductBrandConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.mysql.brand.ProductBrandMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -14,8 +16,7 @@ import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_BRAND_NOT_EXISTS;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_CATEGORY_LEVEL;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.BRAND_NOT_EXISTS;
 
 /**
  * 品牌 Service 实现类
@@ -57,7 +58,7 @@ public class ProductBrandServiceImpl implements ProductBrandService {
 
     private void validateBrandExists(Long id) {
         if (brandMapper.selectById(id) == null) {
-            throw exception(PRODUCT_BRAND_NOT_EXISTS);
+            throw exception(BRAND_NOT_EXISTS);
         }
     }
 
@@ -72,14 +73,14 @@ public class ProductBrandServiceImpl implements ProductBrandService {
     }
 
     @Override
-    public List<ProductBrandDO> getBrandList(ProductBrandListReqVO listVo) {
-        return brandMapper.selectList(listVo);
+    public List<ProductBrandDO> getBrandList(ProductBrandListReqVO listReqVO) {
+        return brandMapper.selectList(listReqVO);
     }
 
     @Override
     public void validateProductBrand(Long id) {
         if(getBrand(id) == null){
-            throw exception(PRODUCT_BRAND_NOT_EXISTS);
+            throw exception(BRAND_NOT_EXISTS);
         }
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
index 264f81c27..118e8118b 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
@@ -22,21 +22,21 @@ public interface ProductCategoryService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createProductCategory(@Valid ProductCategoryCreateReqVO createReqVO);
+    Long createCategory(@Valid ProductCategoryCreateReqVO createReqVO);
 
     /**
      * 更新商品分类
      *
      * @param updateReqVO 更新信息
      */
-    void updateProductCategory(@Valid ProductCategoryUpdateReqVO updateReqVO);
+    void updateCategory(@Valid ProductCategoryUpdateReqVO updateReqVO);
 
     /**
      * 删除商品分类
      *
      * @param id 编号
      */
-    void deleteProductCategory(Long id);
+    void deleteCategory(Long id);
 
     /**
      * 获得商品分类
@@ -44,7 +44,7 @@ public interface ProductCategoryService {
      * @param id 编号
      * @return 商品分类
      */
-    ProductCategoryDO getProductCategory(Long id);
+    ProductCategoryDO getCategory(Long id);
 
     /**
      * 获得商品分类列表
@@ -52,7 +52,7 @@ public interface ProductCategoryService {
      * @param ids 编号
      * @return 商品分类列表
      */
-    List<ProductCategoryDO> getEnableProductCategoryList(Collection<Long> ids);
+    List<ProductCategoryDO> getEnableCategoryList(Collection<Long> ids);
 
     /**
      * 获得商品分类列表
@@ -60,20 +60,21 @@ public interface ProductCategoryService {
      * @param listReqVO 查询条件
      * @return 商品分类列表
      */
-    List<ProductCategoryDO> getEnableProductCategoryList(ProductCategoryListReqVO listReqVO);
+    List<ProductCategoryDO> getEnableCategoryList(ProductCategoryListReqVO listReqVO);
 
     /**
-     * 验证选择的商品分类是否合法
+     * 验证选择的商品分类的级别是否合法
+     * 例如说，商品发布的时候，必须在第 3 级别
      *
      * @param id 分类编号
      */
-    void validateProductCategory(Long id);
+    void validateCategoryLevel(Long id);
 
     /**
      * 获得开启状态的商品分类列表
      *
      * @return 商品分类列表
      */
-    List<ProductCategoryDO> getEnableProductCategoryList();
+    List<ProductCategoryDO> getEnableCategoryList();
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
index 7f1da8553..b4664fd4d 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
@@ -32,7 +32,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     private ProductCategoryMapper productCategoryMapper;
 
     @Override
-    public Long createProductCategory(ProductCategoryCreateReqVO createReqVO) {
+    public Long createCategory(ProductCategoryCreateReqVO createReqVO) {
         // 校验父分类存在
         validateParentProductCategory(createReqVO.getParentId());
 
@@ -44,7 +44,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     }
 
     @Override
-    public void updateProductCategory(ProductCategoryUpdateReqVO updateReqVO) {
+    public void updateCategory(ProductCategoryUpdateReqVO updateReqVO) {
         // 校验分类是否存在
         validateProductCategoryExists(updateReqVO.getId());
         // 校验父分类存在
@@ -56,12 +56,12 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     }
 
     @Override
-    public void deleteProductCategory(Long id) {
+    public void deleteCategory(Long id) {
         // 校验分类是否存在
         validateProductCategoryExists(id);
         // 校验是否还有子分类
         if (productCategoryMapper.selectCountByParentId(id) > 0) {
-            throw exception(PRODUCT_CATEGORY_EXISTS_CHILDREN);
+            throw exception(CATEGORY_EXISTS_CHILDREN);
         }
 
         // 删除
@@ -76,61 +76,69 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         // 父分类不存在
         ProductCategoryDO category = productCategoryMapper.selectById(id);
         if (category == null) {
-            throw exception(PRODUCT_CATEGORY_PARENT_NOT_EXISTS);
+            throw exception(CATEGORY_PARENT_NOT_EXISTS);
         }
         // 父分类不能是二级分类
         if (Objects.equals(id, ProductCategoryDO.PARENT_ID_NULL)) {
-            throw exception(PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL);
+            throw exception(CATEGORY_PARENT_NOT_FIRST_LEVEL);
         }
     }
 
     private void validateProductCategoryExists(Long id) {
         ProductCategoryDO category = productCategoryMapper.selectById(id);
         if (category == null) {
-            throw exception(PRODUCT_CATEGORY_NOT_EXISTS);
+            throw exception(CATEGORY_NOT_EXISTS);
         }
     }
 
     @Override
-    public void validateProductCategory(Long id) {
-        Integer level = categoryLevel(id, 1);
+    public void validateCategoryLevel(Long id) {
+        Integer level = getProductCategoryLevel(id, 1);
         if(level < 3){
-          throw exception(PRODUCT_CATEGORY_LEVEL);
+          throw exception(CATEGORY_LEVEL_ERROR);
         }
     }
 
-    // 校验分类级别
-    private Integer categoryLevel(Long id, int level){
+    // TODO @Luowenfeng：建议使用 for 循环，避免递归
+    /**
+     * 获得商品分类的级别
+     *
+     * @param id 商品分类的编号
+     * @return 级别
+     */
+    private Integer getProductCategoryLevel(Long id, int level){
         ProductCategoryDO category = productCategoryMapper.selectById(id);
         if (category == null) {
-            throw exception(PRODUCT_CATEGORY_NOT_EXISTS);
+            throw exception(CATEGORY_NOT_EXISTS);
         }
+        // TODO Luowenfeng：去掉是否开启，它不影响级别哈
         if (ObjectUtil.notEqual(category.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
-            throw exception(PRODUCT_CATEGORY_DISABLED);
+            throw exception(CATEGORY_DISABLED);
         }
-        if(category.getParentId() == 0) {
+        // TODO Luowenfeng：不使用 0 直接比较哈，使用枚举
+        if (category.getParentId() == 0) {
             return level;
         }
-        return categoryLevel(category.getParentId(), ++level);
+        return getProductCategoryLevel(category.getParentId(), ++level);
     }
 
     @Override
-    public ProductCategoryDO getProductCategory(Long id) {
+    public ProductCategoryDO getCategory(Long id) {
         return productCategoryMapper.selectById(id);
     }
 
     @Override
-    public List<ProductCategoryDO> getEnableProductCategoryList(Collection<Long> ids) {
+    public List<ProductCategoryDO> getEnableCategoryList(Collection<Long> ids) {
         return productCategoryMapper.selectBatchIds(ids);
     }
 
     @Override
-    public List<ProductCategoryDO> getEnableProductCategoryList(ProductCategoryListReqVO listReqVO) {
+    public List<ProductCategoryDO> getEnableCategoryList(ProductCategoryListReqVO listReqVO) {
         return productCategoryMapper.selectList(listReqVO);
     }
 
     @Override
-    public List<ProductCategoryDO> getEnableProductCategoryList() {
+    public List<ProductCategoryDO> getEnableCategoryList() {
         return productCategoryMapper.selectListByStatus(CommonStatusEnum.ENABLE.getStatus());
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java
index a663a49ce..90d1d15bd 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java
@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.product.service.property;
 
-import java.util.*;
-import javax.validation.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.*;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 规格名称 Service 接口
@@ -72,14 +74,16 @@ public interface ProductPropertyService {
      * @param pageReqVO
      * @return
      */
-    PageResult<ProductPropertyRespVO> getPropertyListPage(ProductPropertyPageReqVO pageReqVO);
+    PageResult<ProductPropertyAndValueRespVO> getPropertyListPage(ProductPropertyPageReqVO pageReqVO);
 
-    ProductPropertyRespVO getPropertyResp(Long id);
+    ProductPropertyAndValueRespVO getPropertyResp(Long id);
 
     /**
-     * 根据数据名id集合查询属性名以及属性值的集合
-     * @param propertyIds 属性名id集合
-     * @return
+     * 根据规格属性编号的集合，获得对应的规格 + 规格值的集合
+     *
+     * @param ids 规格编号的集合
+     * @return 对应的规格 + 规格值的集合
      */
-    List<ProductPropertyRespVO> selectByIds(List<Long> propertyIds);
+    List<ProductPropertyAndValueRespVO> getPropertyAndValueList(Collection<Long> ids);
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
index f650e90d9..5744e6ec3 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
@@ -108,11 +108,11 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
     }
 
     @Override
-    public PageResult<ProductPropertyRespVO> getPropertyListPage(ProductPropertyPageReqVO pageReqVO) {
+    public PageResult<ProductPropertyAndValueRespVO> getPropertyListPage(ProductPropertyPageReqVO pageReqVO) {
         //获取属性列表
         PageResult<ProductPropertyDO> pageResult = productPropertyMapper.selectPage(pageReqVO);
-        PageResult<ProductPropertyRespVO> propertyRespVOPageResult = ProductPropertyConvert.INSTANCE.convertPage(pageResult);
-        List<Long> propertyIds = propertyRespVOPageResult.getList().stream().map(ProductPropertyRespVO::getId).collect(Collectors.toList());
+        PageResult<ProductPropertyAndValueRespVO> propertyRespVOPageResult = ProductPropertyConvert.INSTANCE.convertPage(pageResult);
+        List<Long> propertyIds = propertyRespVOPageResult.getList().stream().map(ProductPropertyAndValueRespVO::getId).collect(Collectors.toList());
 
         //获取属性值列表
         List<ProductPropertyValueDO> productPropertyValueDOList = productPropertyValueMapper.getPropertyValueListByPropertyId(propertyIds);
@@ -121,7 +121,7 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
         propertyRespVOPageResult.getList().forEach(x->{
             Long propertyId = x.getId();
             List<ProductPropertyValueRespVO> valueDOList = propertyValueRespVOList.stream().filter(v -> v.getPropertyId().equals(propertyId)).collect(Collectors.toList());
-            x.setPropertyValueList(valueDOList);
+            x.setValues(valueDOList);
         });
         return propertyRespVOPageResult;
     }
@@ -131,25 +131,25 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
     }
 
     @Override
-    public ProductPropertyRespVO getPropertyResp(Long id) {
+    public ProductPropertyAndValueRespVO getPropertyResp(Long id) {
         //查询规格
         ProductPropertyDO property = getProperty(id);
-        ProductPropertyRespVO propertyRespVO = ProductPropertyConvert.INSTANCE.convert(property);
+        ProductPropertyAndValueRespVO propertyRespVO = ProductPropertyConvert.INSTANCE.convert(property);
         //查询属性值
         List<ProductPropertyValueDO> valueDOList = productPropertyValueMapper.getPropertyValueListByPropertyId(Arrays.asList(id));
         List<ProductPropertyValueRespVO> propertyValueRespVOS = ProductPropertyValueConvert.INSTANCE.convertList(valueDOList);
         //组装
-        propertyRespVO.setPropertyValueList(propertyValueRespVOS);
+        propertyRespVO.setValues(propertyValueRespVOS);
         return propertyRespVO;
     }
 
     @Override
-    public List<ProductPropertyRespVO> selectByIds(List<Long> propertyIds) {
-        List<ProductPropertyRespVO> productPropertyRespVO = ProductPropertyConvert.INSTANCE.convertList(productPropertyMapper.selectBatchIds(propertyIds));
+    public List<ProductPropertyAndValueRespVO> getPropertyAndValueList(Collection<Long> ids) {
+        List<ProductPropertyAndValueRespVO> productPropertyRespVO = ProductPropertyConvert.INSTANCE.convertList(productPropertyMapper.selectBatchIds(ids));
         //查询属性值
-        List<ProductPropertyValueDO> valueDOList = productPropertyValueMapper.getPropertyValueListByPropertyId(propertyIds);
+        List<ProductPropertyValueDO> valueDOList = productPropertyValueMapper.selectBatchIds(ids);
         Map<Long, List<ProductPropertyValueDO>> propertyValuesMap = valueDOList.stream().collect(Collectors.groupingBy(ProductPropertyValueDO::getPropertyId));
-        productPropertyRespVO.forEach(p -> p.setPropertyValueList(ProductPropertyValueConvert.INSTANCE.convertList(propertyValuesMap.get(p.getId()))));
+        productPropertyRespVO.forEach(p -> p.setValues(ProductPropertyValueConvert.INSTANCE.convertList(propertyValuesMap.get(p.getId()))));
         return productPropertyRespVO;
     }
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index 59e8a04d7..7629bd5a3 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -11,14 +11,14 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * 商品sku Service 接口
+ * 商品 SKU Service 接口
  *
  * @author 芋道源码
  */
 public interface ProductSkuService {
 
     /**
-     * 创建商品sku
+     * 创建商品 SKU
      *
      * @param createReqVO 创建信息
      * @return 编号
@@ -68,14 +68,15 @@ public interface ProductSkuService {
      *
      * @param list sku组合的集合
      */
-    void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list, Integer specType);
+    void validateSkus(List<ProductSkuCreateOrUpdateReqVO> list, Integer specType);
 
     /**
      * 批量创建 SKU
      *
+     * @param spuId 商品 SPU 编号
      * @param list SKU 对象集合
      */
-    void createProductSkus(List<ProductSkuCreateOrUpdateReqVO> list, Long spuId);
+    void createSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> list);
 
     /**
      * 根据 SPU 编号，批量更新它的 SKU 信息
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 60191d1b0..1e30a597a 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyAndValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
@@ -24,11 +25,10 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PROPERTY_NOT_EXISTS;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
 
 /**
- * 商品sku Service 实现类
+ * 商品 SKU Service 实现类
  *
  * @author 芋道源码
  */
@@ -90,48 +90,51 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     }
 
     @Override
-    public void validateProductSkus(List<ProductSkuCreateOrUpdateReqVO> list, Integer specType) {
-        // 多规格才需校验
-        if (specType.equals(ProductSpuSpecTypeEnum.DISABLE.getType())) {
-            List<ProductSkuBaseVO.Property> skuPropertyList = list.stream().flatMap(p -> Optional.of(p.getProperties()).orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
-            // 1、校验规格属性存在
-            List<Long> propertyIds = CollectionUtils.convertList(skuPropertyList, ProductSkuBaseVO.Property::getPropertyId);
-            List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(propertyIds);
-            if (propertyAndValueList.size() == propertyIds.size()) {
-                throw exception(PROPERTY_NOT_EXISTS);
-            }
-            // 2. 校验，一个 Sku 下，没有重复的规格。校验方式是，遍历每个 Sku ，看看是否有重复的规格 attrId
-            List<ProductPropertyValueRespVO> collect = propertyAndValueList.stream()
-                    .flatMap(v -> Optional.of(v.getPropertyValueList())
-                            .orElse(new ArrayList<>()).stream()).collect(Collectors.toList());
-            Map<Long, ProductPropertyValueRespVO> propertyValueRespVOMap = CollectionUtils.convertMap(collect, ProductPropertyValueRespVO::getId);
-            list.forEach(v -> {
-                Set<Long> keys = v.getProperties().stream().map(k -> propertyValueRespVOMap.get(k.getValueId()).getPropertyId()).collect(Collectors.toSet());
-                if (keys.size() != v.getProperties().size()) {
-                    throw exception(ErrorCodeConstants.SKU_PROPERTIES_DUPLICATED);
-                }
-            });
+    public void validateSkus(List<ProductSkuCreateOrUpdateReqVO> skus, Integer specType) {
+        // 非多规格，不需要校验
+        if (ObjectUtil.notEqual(specType, ProductSpuSpecTypeEnum.DISABLE.getType())) {
+            return;
+        }
 
-            // 3. 再校验，每个 Sku 的规格值的数量，是一致的。
-            int attrValueIdsSize = list.get(0).getProperties().size();
-            for (int i = 1; i < list.size(); i++) {
-                if (attrValueIdsSize != list.get(i).getProperties().size()) {
-                    throw exception(ErrorCodeConstants.PRODUCT_SPU_ATTR_NUMBERS_MUST_BE_EQUALS);
-                }
-            }
+        // 1、校验规格属性存在
+        // TODO @Luowenfeng：stream 的写法；不用改哈，就是说下可以酱紫写；
+        Set<Long> propertyIds = skus.stream().filter(p -> p.getProperties() != null).flatMap(p -> p.getProperties().stream()) // 遍历多个 Property 属性
+                .map(ProductSkuBaseVO.Property::getPropertyId).collect(Collectors.toSet()); // 将每个 Property 转换成对应的 propertyId，最后形成集合
+        List<ProductPropertyAndValueRespVO> propertyAndValueList = productPropertyService.getPropertyAndValueList(propertyIds);
+        if (propertyAndValueList.size() == propertyIds.size()) {
+            throw exception(PROPERTY_NOT_EXISTS);
+        }
 
-            // 4. 最后校验，每个 Sku 之间不是重复的
-            Set<Set<Long>> skuAttrValues = new HashSet<>(); // 每个元素，都是一个 Sku 的 attrValueId 集合。这样，通过最外层的 Set ，判断是否有重复的.
-            for (ProductSkuCreateOrUpdateReqVO sku : list) {
-                if (!skuAttrValues.add(sku.getProperties().stream().map(ProductSkuBaseVO.Property::getValueId).collect(Collectors.toSet()))) { // 添加失败，说明重复
-                    throw exception(ErrorCodeConstants.PRODUCT_SPU_SKU_NOT_DUPLICATE);
-                }
+        // 2. 校验，一个 SKU 下，没有重复的规格。校验方式是，遍历每个 SKU ，看看是否有重复的规格 propertyId
+        Map<Long, ProductPropertyValueRespVO> propertyValueMap = propertyAndValueList.stream().filter(p -> p.getValues() != null).flatMap(p -> p.getValues().stream())
+                .collect(Collectors.toMap(ProductPropertyValueRespVO::getId, value -> value)); // KEY：规格属性值的编号
+        skus.forEach(sku -> {
+            Set<Long> skuPropertyIds = CollectionUtils.convertSet(sku.getProperties(), propertyItem -> propertyValueMap.get(propertyItem.getValueId()).getPropertyId());
+            if (skuPropertyIds.size() != sku.getProperties().size()) {
+                throw exception(SKU_PROPERTIES_DUPLICATED);
+            }
+        });
+
+        // 3. 再校验，每个 Sku 的规格值的数量，是一致的。
+        int attrValueIdsSize = skus.get(0).getProperties().size();
+        for (int i = 1; i < skus.size(); i++) {
+            if (attrValueIdsSize != skus.get(i).getProperties().size()) {
+                throw exception(ErrorCodeConstants.SPU_ATTR_NUMBERS_MUST_BE_EQUALS);
+            }
+        }
+
+        // 4. 最后校验，每个 Sku 之间不是重复的
+        Set<Set<Long>> skuAttrValues = new HashSet<>(); // 每个元素，都是一个 Sku 的 attrValueId 集合。这样，通过最外层的 Set ，判断是否有重复的.
+        for (ProductSkuCreateOrUpdateReqVO sku : skus) {
+            // TODO @Luowenfeng：可以使用 CollectionUtils.convertSet()，简化下面的 stream 操作
+            if (!skuAttrValues.add(sku.getProperties().stream().map(ProductSkuBaseVO.Property::getValueId).collect(Collectors.toSet()))) { // 添加失败，说明重复
+                throw exception(ErrorCodeConstants.SPU_SKU_NOT_DUPLICATE);
             }
         }
     }
 
     @Override
-    public void createProductSkus(List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList, Long spuId) {
+    public void createSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList) {
         // 批量插入 SKU
         List<ProductSkuDO> skuDOList = ProductSkuConvert.INSTANCE.convertSkuDOList(skuCreateReqList);
         skuDOList.forEach(v -> v.setSpuId(spuId));
@@ -140,13 +143,12 @@ public class ProductSkuServiceImpl implements ProductSkuService {
 
     @Override
     public List<ProductSkuDO> getSkusBySpuId(Long spuId) {
-        List<ProductSkuDO> productSkuDOS = productSkuMapper.selectBySpuIds(Collections.singletonList(spuId));
-        return productSkuDOS;
+        return productSkuMapper.selectListBySpuIds(Collections.singletonList(spuId));
     }
 
     @Override
     public List<ProductSkuDO> getSkusBySpuIds(List<Long> spuIds) {
-        return productSkuMapper.selectBySpuIds(spuIds);
+        return productSkuMapper.selectListBySpuIds(spuIds);
     }
 
     @Override
@@ -157,16 +159,16 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     @Override
     @Transactional
     public void updateProductSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus) {
-        // 查询 spu 下已经存在的 sku 的集合
-        List<ProductSkuDO> existsSkus = productSkuMapper.selectBySpuId(spuId);
+        // 查询 SPU 下已经存在的 SKU 的集合
+        List<ProductSkuDO> existsSkus = productSkuMapper.selectListBySpuId(spuId);
         Map<Long, ProductSkuDO> existsSkuMap = CollectionUtils.convertMap(existsSkus, ProductSkuDO::getId);
 
         // 拆分三个集合，新插入的、需要更新的、需要删除的
         List<ProductSkuDO> insertSkus = new ArrayList<>();
-        List<ProductSkuDO> updateSkus = new ArrayList<>();
+        List<ProductSkuDO> updateSkus = new ArrayList<>(); // TODO Luowenfeng：使用 Long 即可
         List<ProductSkuDO> deleteSkus = new ArrayList<>();
 
-        // TODO @芋艿：是不是基于规格匹配会比较好。
+        // TODO @Luowenfeng：是不是基于规格匹配会比较好。可以参考下 onemall 的 ProductSpuServiceImpl 的 updateProductSpu 逻辑
         List<ProductSkuDO> allUpdateSkus = ProductSkuConvert.INSTANCE.convertSkuDOList(skus);
         allUpdateSkus.forEach(p -> {
             if (p.getId() != null) {
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
index 37883b677..8907c6207 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
@@ -26,14 +26,14 @@ public interface ProductSpuService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createProductSpu(@Valid ProductSpuCreateReqVO createReqVO);
+    Long createSpu(@Valid ProductSpuCreateReqVO createReqVO);
 
     /**
      * 更新商品 SPU
      *
      * @param updateReqVO 更新信息
      */
-    void updateProductSpu(@Valid ProductSpuUpdateReqVO updateReqVO);
+    void updateSpu(@Valid ProductSpuUpdateReqVO updateReqVO);
 
     /**
      * 删除商品spu
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index f583f8685..664d619c4 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.product.service.spu;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyAndValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyViewRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
@@ -16,7 +16,6 @@ import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
 import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
@@ -30,7 +29,6 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -62,14 +60,14 @@ public class ProductSpuServiceImpl implements ProductSpuService {
 
     @Override
     @Transactional
-    public Long createProductSpu(ProductSpuCreateReqVO createReqVO) {
+    public Long createSpu(ProductSpuCreateReqVO createReqVO) {
         // 校验分类
-        categoryService.validateProductCategory(createReqVO.getCategoryId());
+        categoryService.validateCategoryLevel(createReqVO.getCategoryId());
         // 校验品牌
         brandService.validateProductBrand(createReqVO.getBrandId());
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = createReqVO.getSkus();
-        productSkuService.validateProductSkus(skuCreateReqList, createReqVO.getSpecType());
+        productSkuService.validateSkus(skuCreateReqList, createReqVO.getSpecType());
         // 插入 SPU
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO);
         spu.setMarketPrice(CollectionUtils.getMaxValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getMarketPrice));
@@ -78,24 +76,25 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         spu.setTotalStock(CollectionUtils.getSumValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getStock, Integer::sum));
         ProductSpuMapper.insert(spu);
         // 插入 SKU
-        productSkuService.createProductSkus(skuCreateReqList, spu.getId());
+        productSkuService.createSkus(spu.getId(), skuCreateReqList);
         // 返回
         return spu.getId();
     }
 
     @Override
     @Transactional
-    public void updateProductSpu(ProductSpuUpdateReqVO updateReqVO) {
+    public void updateSpu(ProductSpuUpdateReqVO updateReqVO) {
         // 校验 SPU 是否存在
         validateSpuExists(updateReqVO.getId());
         // 校验分类
-        categoryService.validateProductCategory(updateReqVO.getCategoryId());
+        categoryService.validateCategoryLevel(updateReqVO.getCategoryId());
         // 校验品牌
         brandService.validateProductBrand(updateReqVO.getBrandId());
         // 校验SKU
         List<ProductSkuCreateOrUpdateReqVO> skuCreateReqList = updateReqVO.getSkus();
         // 多规格才需校验
-        productSkuService.validateProductSkus(skuCreateReqList, updateReqVO.getSpecType());
+        productSkuService.validateSkus(skuCreateReqList, updateReqVO.getSpecType());
+
         // 更新 SPU
         ProductSpuDO updateObj = ProductSpuConvert.INSTANCE.convert(updateReqVO);
         updateObj.setMarketPrice(CollectionUtils.getMaxValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getMarketPrice));
@@ -103,7 +102,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         updateObj.setMinPrice(CollectionUtils.getMinValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getPrice));
         updateObj.setTotalStock(CollectionUtils.getSumValue(skuCreateReqList, ProductSkuCreateOrUpdateReqVO::getStock, Integer::sum));
         ProductSpuMapper.updateById(updateObj);
-        // 更新 SKU
+        // 批量更新 SKU
         productSkuService.updateProductSkus(updateObj.getId(), updateReqVO.getSkus());
     }
 
@@ -111,7 +110,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     @Transactional
     public void deleteSpu(Long id) {
         // 校验存在
-        this.validateSpuExists(id);
+        validateSpuExists(id);
         // 删除 SPU
         ProductSpuMapper.deleteById(id);
         // 删除关联的 SKU
@@ -125,6 +124,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     }
 
     @Override
+    // TODO @芋艿：需要再 review 下
     public SpuRespVO getSpu(Long id) {
         ProductSpuDO spu = ProductSpuMapper.selectById(id);
         SpuRespVO spuVO = ProductSpuConvert.INSTANCE.convert(spu);
@@ -138,7 +138,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
                     properties.addAll(productSkuRespVO.getProperties());
                 }
                 Map<Long, List<ProductSkuBaseVO.Property>> propertyMaps = properties.stream().collect(Collectors.groupingBy(ProductSkuBaseVO.Property::getPropertyId));
-                List<ProductPropertyRespVO> propertyAndValueList = productPropertyService.selectByIds(new ArrayList<>(propertyMaps.keySet()));
+                List<ProductPropertyAndValueRespVO> propertyAndValueList = productPropertyService.getPropertyAndValueList(new ArrayList<>(propertyMaps.keySet()));
                 // 装载组装过后的属性
                 List<ProductPropertyViewRespVO> productPropertyViews = new ArrayList<>();
                 propertyAndValueList.forEach(p -> {
@@ -146,7 +146,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
                     productPropertyViewRespVO.setPropertyId(p.getId());
                     productPropertyViewRespVO.setName(p.getName());
                     List<ProductPropertyViewRespVO.Tuple2> propertyValues = new ArrayList<>();
-                    Map<Long, ProductPropertyValueRespVO> propertyValueMaps = p.getPropertyValueList().stream().collect(Collectors.toMap(ProductPropertyValueRespVO::getId, pv -> pv));
+                    Map<Long, ProductPropertyValueRespVO> propertyValueMaps = p.getValues().stream().collect(Collectors.toMap(ProductPropertyValueRespVO::getId, pv -> pv));
                     propertyMaps.get(p.getId()).forEach(pv -> {
                         ProductPropertyViewRespVO.Tuple2 tuple2 = new ProductPropertyViewRespVO.Tuple2(pv.getValueId(), propertyValueMaps.get(pv.getValueId()).getName());
                         propertyValues.add(tuple2);
@@ -162,7 +162,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
                 Long parentId = spuVO.getCategoryId();
                 categoryArray.addFirst(parentId);
                 while (parentId != 0) {
-                    parentId = categoryService.getProductCategory(parentId).getParentId();
+                    parentId = categoryService.getCategory(parentId).getParentId();
                     if (parentId > 0) {
                         categoryArray.addFirst(parentId);
                     }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
index 68ca66922..179778d0b 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
@@ -20,7 +20,7 @@ import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEq
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_BRAND_NOT_EXISTS;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.BRAND_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -74,7 +74,7 @@ public class ProductBrandServiceImplTest extends BaseDbUnitTest {
         ProductBrandUpdateReqVO reqVO = randomPojo(ProductBrandUpdateReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> brandService.updateBrand(reqVO), PRODUCT_BRAND_NOT_EXISTS);
+        assertServiceException(() -> brandService.updateBrand(reqVO), BRAND_NOT_EXISTS);
     }
 
     @Test
@@ -97,7 +97,7 @@ public class ProductBrandServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> brandService.deleteBrand(id), PRODUCT_BRAND_NOT_EXISTS);
+        assertServiceException(() -> brandService.deleteBrand(id), BRAND_NOT_EXISTS);
     }
 
     @Test
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
index 7fc3e2a22..a56c1aa1a 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
@@ -17,7 +17,7 @@ import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEq
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_CATEGORY_NOT_EXISTS;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.CATEGORY_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -43,7 +43,7 @@ public class ProductCategoryServiceImplTest extends BaseDbUnitTest {
         productCategoryMapper.insert(parentProductCategory);
 
         // 调用
-        Long categoryId = productCategoryService.createProductCategory(reqVO);
+        Long categoryId = productCategoryService.createCategory(reqVO);
         // 断言
         assertNotNull(categoryId);
         // 校验记录的属性是否正确
@@ -65,7 +65,7 @@ public class ProductCategoryServiceImplTest extends BaseDbUnitTest {
         productCategoryMapper.insert(parentProductCategory);
 
         // 调用
-        productCategoryService.updateProductCategory(reqVO);
+        productCategoryService.updateCategory(reqVO);
         // 校验是否更新正确
         ProductCategoryDO category = productCategoryMapper.selectById(reqVO.getId()); // 获取最新的
         assertPojoEquals(reqVO, category);
@@ -77,7 +77,7 @@ public class ProductCategoryServiceImplTest extends BaseDbUnitTest {
         ProductCategoryUpdateReqVO reqVO = randomPojo(ProductCategoryUpdateReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> productCategoryService.updateProductCategory(reqVO), PRODUCT_CATEGORY_NOT_EXISTS);
+        assertServiceException(() -> productCategoryService.updateCategory(reqVO), CATEGORY_NOT_EXISTS);
     }
 
     @Test
@@ -89,7 +89,7 @@ public class ProductCategoryServiceImplTest extends BaseDbUnitTest {
         Long id = dbCategory.getId();
 
         // 调用
-        productCategoryService.deleteProductCategory(id);
+        productCategoryService.deleteCategory(id);
         // 校验数据不存在了
         assertNull(productCategoryMapper.selectById(id));
     }
@@ -100,7 +100,7 @@ public class ProductCategoryServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> productCategoryService.deleteProductCategory(id), PRODUCT_CATEGORY_NOT_EXISTS);
+        assertServiceException(() -> productCategoryService.deleteCategory(id), CATEGORY_NOT_EXISTS);
     }
 
     @Test
@@ -117,7 +117,7 @@ public class ProductCategoryServiceImplTest extends BaseDbUnitTest {
         reqVO.setName("特曼");
 
         // 调用
-        List<ProductCategoryDO> list = productCategoryService.getEnableProductCategoryList(reqVO);
+        List<ProductCategoryDO> list = productCategoryService.getEnableCategoryList(reqVO);
         // 断言
         assertEquals(1, list.size());
         assertPojoEquals(dbCategory, list.get(0));
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
index e2b3a3d98..57b7fdfeb 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
@@ -41,7 +41,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
         ProductSpuCreateReqVO reqVO = randomPojo(ProductSpuCreateReqVO.class);
 
         // 调用
-        Long spuId = spuService.createProductSpu(reqVO);
+        Long spuId = spuService.createSpu(reqVO);
         // 断言
         assertNotNull(spuId);
         // 校验记录的属性是否正确
@@ -60,7 +60,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
         });
 
         // 调用
-        spuService.updateProductSpu(reqVO);
+        spuService.updateSpu(reqVO);
         // 校验是否更新正确
         ProductSpuDO spu = ProductSpuMapper.selectById(reqVO.getId()); // 获取最新的
         assertPojoEquals(reqVO, spu);
@@ -72,7 +72,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
         ProductSpuUpdateReqVO reqVO = randomPojo(ProductSpuUpdateReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> spuService.updateProductSpu(reqVO), SPU_NOT_EXISTS);
+        assertServiceException(() -> spuService.updateSpu(reqVO), SPU_NOT_EXISTS);
     }
 
     @Test

From 1bd1c79ff33dc4fc8852275c0b2622dc75f0c0eb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 5 Sep 2022 00:14:17 +0800
Subject: [PATCH 51/56] =?UTF-8?q?mall=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E5=9D=97=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/api/mall/product/spu.js    |  10 --
 .../src/views/mall/product/spu/index.vue      | 152 ++++--------------
 .../src/views/mall/product/spu/save.vue       | 128 ++++++---------
 3 files changed, 77 insertions(+), 213 deletions(-)

diff --git a/yudao-ui-admin/src/api/mall/product/spu.js b/yudao-ui-admin/src/api/mall/product/spu.js
index 068e7d838..fc4a545f2 100644
--- a/yudao-ui-admin/src/api/mall/product/spu.js
+++ b/yudao-ui-admin/src/api/mall/product/spu.js
@@ -42,13 +42,3 @@ export function getSpuPage(query) {
     params: query
   })
 }
-
-// 导出商品spu Excel
-export function exportSpuExcel(query) {
-  return request({
-    url: '/product/spu/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 4cac422a1..5817a8cfb 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -1,57 +1,30 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <!-- TODO @Luowenfeng：参考界面；https://v5.niuteam.cn/shop/goods/lists.html
+      商品名称、商品编码、商品分类、商品品牌
+      商品销量、商品价格
+     -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="商品名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入商品名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="分类id" prop="categoryId">
-        <el-input
-          v-model="queryParams.categoryId"
-          placeholder="请输入分类id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.categoryId" placeholder="请输入分类id" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择上下架状态"
-          clearable
-          size="small"
-        >
+        <el-select v-model="queryParams.status" placeholder="请选择上下架状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
           <el-option label="上架" value="0" />
           <el-option label="下架" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        />
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -59,36 +32,20 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['product:spu:create']"
-          >新增
-        </el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['product:spu:create']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['product:spu:export']"
-          >导出
-        </el-button>
-      </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
+      <!--
+      TODO @Luowenfeng：参考界面；
+       https://v5.niuteam.cn/shop/goods/lists.html
+       1. 字段：商品信息、价格、库存、销量、排序、创建时间、状态、操作；
+       2. tab 分成全部、销售中、仓库中、预警中
+       -->
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="商品名称" align="center" prop="name" />
       <el-table-column label="分类id" align="center" prop="categoryId" />
@@ -111,50 +68,23 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        width="180"
-      >
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['product:spu:update']"
-            >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['product:spu:delete']"
-            >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['product:spu:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['product:spu:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
 
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close :close-on-click-modal="false" >
       <save @closeDialog="closeDialog" :type="dialogType" :obj="dialogObj" v-if="open" />
@@ -166,13 +96,15 @@
 import {
   deleteSpu,
   getSpuPage,
-  exportSpuExcel,
 } from "@/api/mall/product/spu";
 
 import Editor from "@/components/Editor";
 import ImageUpload from "@/components/ImageUpload";
 import save  from "./save";
 
+// 1. TODO @Luowenfeng：商品的添加、修改，走一个单独的页面，不走弹窗；https://v5.niuteam.cn/shop/goods/addgoods.html
+// 2. TODO
+
 export default {
   name: "Spu",
   components: {
@@ -306,27 +238,7 @@ export default {
           this.$modal.msgSuccess("删除成功");
         })
         .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.queryParams };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
-      // 执行导出
-      this.$modal
-        .confirm("是否确认导出所有商品spu数据项?")
-        .then(() => {
-          this.exportLoading = true;
-          return exportSpuExcel(params);
-        })
-        .then((response) => {
-          this.$download.excel(response, "商品spu.xls");
-          this.exportLoading = false;
-        })
-        .catch(() => {});
-    },
+    }
   },
 };
 </script>
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index a8ce18852..c0972777e 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -7,24 +7,28 @@
           <el-form-item label="商品名称" prop="name">
             <el-input v-model="baseForm.name" placeholder="请输入商品名称"/>
           </el-form-item>
-          <el-form-item label="卖点">
-            <el-input v-model="baseForm.sellPoint" placeholder="请输入卖点"/>
+          <el-form-item label="商品卖点">
+            <el-input type="textarea" v-model="baseForm.sellPoint" placeholder="请输入商品卖点"/>
           </el-form-item>
-          <el-form-item label="分类id" prop="categoryIds">
-            <el-cascader
-              v-model="baseForm.categoryIds"
-              placeholder="请输入分类id"
-              style="width: 100%"
-              :options="categoryList"
-              :props="propName"
-              clearable
-            ></el-cascader>
-          </el-form-item>
-          <el-form-item label="商品轮播图" prop="picUrls">
+          <!-- TODO @Luowenfeng：商品主图，80 x 80 即可 -->
+          <el-form-item label="商品主图" prop="picUrls">
             <ImageUpload v-model="baseForm.picUrls" :value="baseForm.picUrls" :limit="10"/>
           </el-form-item>
-          <el-form-item label="排序字段">
-            <el-input v-model="baseForm.sort" placeholder="请输入排序字段" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
+          <!-- TODO @Luowenfeng：商品视频 -->
+          <el-form-item label="商品品牌" prop="brandId">
+            <el-select v-model="baseForm.brandId" placeholder="请选择商品品牌">
+              <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="商品分类" prop="categoryIds">
+            <el-cascader v-model="baseForm.categoryIds" placeholder="商品分类" style="width: 100%"
+                         :options="categoryList" :props="propName" clearable />
+          </el-form-item>
+          <el-form-item label="是否上架" prop="status">
+            <el-radio-group v-model="baseForm.status">
+              <el-radio :label="0">立即上架</el-radio>
+              <el-radio :label="1">放入仓库</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-form>
       </el-tab-pane>
@@ -32,7 +36,8 @@
       <!-- 价格库存 -->
       <el-tab-pane label="价格库存" name="rates" class="rates">
         <el-form ref="rates" :model="ratesForm" :rules="rules">
-          <el-form-item label="商品规格">
+          <el-form-item label="启用多规格">
+            <!-- TODO @Luowenfeng：改成开关的按钮；关闭，单规格；开启，多规格 -->
             <el-radio-group v-model="ratesForm.spec" @change="changeRadio">
               <el-radio :label="1">单规格</el-radio>
               <el-radio :label="2">多规格</el-radio>
@@ -41,28 +46,13 @@
 
           <!-- 动态添加规格属性 -->
           <div v-show="ratesForm.spec === 2">
-            <div
-              v-for="(specs, index) in dynamicSpec"
-              :key="index"
-              class="dynamic-spec"
-            >
+            <div v-for="(specs, index) in dynamicSpec" :key="index" class="dynamic-spec">
               <!-- 删除按钮 -->
-              <el-button
-                type="danger"
-                icon="el-icon-delete"
-                circle
-                class="spec-delete"
-                @click="removeSpec(index)"
-              ></el-button>
+              <el-button type="danger" icon="el-icon-delete" circle class="spec-delete" @click="removeSpec(index)" />
               <div class="spec-header">
                 规格项：
                 <el-select v-model="specs.specId" filterable placeholder="请选择" @change="changeSpec">
-                  <el-option
-                    v-for="item in propertyPageList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
-                  </el-option>
+                  <el-option v-for="item in propertyPageList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </div>
               <div class="spec-values">
@@ -71,24 +61,17 @@
                 </template>
               </div>
             </div>
-            <el-button type="primary" @click="dynamicSpec.push({specValue: []}); ratesForm.rates = []"
-            >添加规格项目
-            </el-button
-            >
+            <el-button type="primary" @click="dynamicSpec.push({specValue: []}); ratesForm.rates = []">添加规格项目</el-button>
           </div>
 
           <!-- 规格明细 -->
           <el-form-item label="规格明细">
             <el-table :data="ratesForm.rates" border style="width: 100%" ref="ratesTable">
               <template v-if="ratesForm.spec == 2">
-                <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v=>v.specName != undefined)"
+                <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v => v.specName !== undefined)"
                                  :label="item.specName">
                   <template slot-scope="scope">
-                    <el-input
-                      v-if="scope.row.spec"
-                      v-model="scope.row.spec[index]"
-                      disabled
-                    ></el-input>
+                    <el-input v-if="scope.row.spec" v-model="scope.row.spec[index]" disabled />
                   </template>
                 </el-table-column>
               </template>
@@ -98,25 +81,20 @@
                                style="width: 100px; height: 50px"/>
                 </template>
               </el-table-column>
-              <template v-if="ratesForm.spec == 2">
+              <template v-if="ratesForm.spec === 2">
                <el-table-column label="sku名称" :render-header="addRedStar" key="91">
                   <template slot-scope="scope">
-                  <el-form-item :prop="'rates.'+ scope.$index + '.name'" :rules="[{required: true, trigger: 'change'}]">
-                      <el-input
-                        v-model="scope.row.name"
-                      ></el-input>
-                      </el-form-item>
+                    <el-form-item :prop="'rates.'+ scope.$index + '.name'" :rules="[{required: true, trigger: 'change'}]">
+                      <el-input v-model="scope.row.name" />
+                    </el-form-item>
                   </template>
                 </el-table-column>
-                </template>
-
+              </template>
               <el-table-column label="市场价(元)" :render-header="addRedStar" key="92">
                 <template slot-scope="scope">
                   <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'" :rules="[{required: true, trigger: 'change'}]">
-                    <el-input
-                      v-model="scope.row.marketPrice"
-                      oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"
-                    ></el-input>
+                    <el-input v-model="scope.row.marketPrice"
+                      oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"/>
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -164,12 +142,8 @@
                   <el-input v-model="scope.row.barCode"></el-input>
                 </template>
               </el-table-column>
-               <template v-if="ratesForm.spec == 2">
-                <el-table-column
-                  fixed="right"
-                  label="操作"
-                  width="50"
-                  key="100">
+               <template v-if="ratesForm.spec === 2">
+                <el-table-column fixed="right" label="操作" width="50" key="100">
                   <template slot-scope="scope">
                     <el-button @click="scope.row.status = 1" type="text" size="small" v-show="scope.row.status == undefined || scope.row.status == 0 ">禁用</el-button>
                     <el-button @click="scope.row.status = 0" type="text" size="small" v-show="scope.row.status == 1">启用</el-button>
@@ -178,11 +152,15 @@
               </template>
             </el-table>
           </el-form-item>
+          <el-form-item label="虚拟销量" prop="virtualSalesCount">
+            <!-- TODO @Luowenfeng：使用 input 类型即可 -->
+            <el-input v-model="baseForm.virtualSalesCount" placeholder="请输入虚拟销量" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
+          </el-form-item>
         </el-form>
       </el-tab-pane>
 
       <!-- 商品详情 -->
-      <el-tab-pane label="商品描述" name="third">
+      <el-tab-pane label="商品详情" name="third">
       <el-form ref="third" :model="baseForm" :rules="rules">
         <el-form-item prop="description">
           <editor v-model="baseForm.description" :min-height="380"/>
@@ -191,20 +169,10 @@
       </el-tab-pane>
 
       <!-- 销售设置 -->
-      <el-tab-pane label="销售设置" name="fourth">
+      <el-tab-pane label="高级设置" name="fourth">
         <el-form ref="fourth" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
-          <el-form-item label="所属品牌" prop="brandId">
-            <el-select v-model="baseForm.brandId" placeholder="请选择">
-                  <el-option
-                    v-for="item in brandList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
-                  </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="虚拟销量" prop="virtualSalesCount">
-            <el-input v-model="baseForm.virtualSalesCount" placeholder="请输入虚拟销量" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
+          <el-form-item label="排序字段">
+            <el-input v-model="baseForm.sort" placeholder="请输入排序字段" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
           </el-form-item>
            <el-form-item label="是否展示库存" prop="showStock">
              <el-radio-group v-model="baseForm.showStock">
@@ -212,12 +180,6 @@
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="商品状态" prop="status">
-            <el-radio-group v-model="baseForm.status">
-              <el-radio :label="0">上架</el-radio>
-              <el-radio :label="1">下架</el-radio>
-            </el-radio-group>
-          </el-form-item>
         </el-form>
       </el-tab-pane>
     </el-tabs>
@@ -253,7 +215,7 @@ export default {
   },
   data() {
     return {
-      activeName: "base",
+      activeName: "base", // TODO @Luowenfeng：切换时，不需要校验通过
       propName: {
         checkStrictly: true,
         label: "name",

From 9632c33d279f33348276c27d592ed8241bd827c6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 5 Sep 2022 20:03:13 +0800
Subject: [PATCH 52/56] =?UTF-8?q?mall=EF=BC=9A=E4=BC=98=E5=8C=96=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=88=86=E7=B1=BB=E3=80=81=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/optional/mall/mall.sql                    |  4 +--
 .../product/enums/ErrorCodeConstants.java     |  2 ++
 .../admin/brand/ProductBrandController.java   |  4 +--
 .../admin/brand/vo/ProductBrandBaseVO.java    |  3 +-
 .../admin/brand/vo/ProductBrandPageReqVO.java |  2 +-
 .../category/ProductCategoryController.java   | 10 +++---
 .../dal/mysql/brand/ProductBrandMapper.java   |  4 +++
 .../service/brand/ProductBrandService.java    |  2 +-
 .../brand/ProductBrandServiceImpl.java        | 33 ++++++++++++++++---
 .../category/ProductCategoryServiceImpl.java  |  6 ++--
 .../brand/ProductBrandServiceImplTest.java    |  2 +-
 .../src/main/resources/application-local.yaml |  8 ++---
 .../src/views/mall/product/category/index.vue |  6 ++--
 13 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql
index ae5770a21..486b6f2fc 100644
--- a/sql/optional/mall/mall.sql
+++ b/sql/optional/mall/mall.sql
@@ -39,7 +39,7 @@ CREATE TABLE `market_activity`  (
                                     `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
                                     `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
                                     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '促销活动';
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '促销活动';
 
 -- ----------------------------
 -- Records of market_activity
@@ -66,7 +66,7 @@ CREATE TABLE `market_banner`  (
                                   `sort` tinyint NULL DEFAULT NULL COMMENT '排序',
                                   `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '描述',
                                   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'Banner管理';
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Banner管理';
 
 -- ----------------------------
 -- Records of market_banner
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
index af97bb9c3..801e2dd51 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
@@ -19,6 +19,8 @@ public interface ErrorCodeConstants {
 
     // ========== 商品品牌相关编号 1008002000 ==========
     ErrorCode BRAND_NOT_EXISTS = new ErrorCode(1008002000, "品牌不存在");
+    ErrorCode BRAND_DISABLED = new ErrorCode(1008002001, "品牌不存在");
+    ErrorCode BRAND_NAME_EXISTS = new ErrorCode(1008002002, "品牌名称已存在");
 
     // ========== 商品规格名称 1008003000 ==========
     ErrorCode PROPERTY_NOT_EXISTS = new ErrorCode(1008003000, "规格名称不存在");
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
index 0558d9866..2227afeaf 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/ProductBrandController.java
@@ -33,7 +33,7 @@ public class ProductBrandController {
     @ApiOperation("创建品牌")
     @PreAuthorize("@ss.hasPermission('product:brand:create')")
     public CommonResult<Long> createBrand(@Valid @RequestBody ProductBrandCreateReqVO createReqVO) {
-        return success(brandService.createProductBrand(createReqVO));
+        return success(brandService.createBrand(createReqVO));
     }
 
     @PutMapping("/update")
@@ -73,7 +73,7 @@ public class ProductBrandController {
     @GetMapping("/list")
     @ApiOperation("获得品牌列表")
     @PreAuthorize("@ss.hasPermission('product:brand:query')")
-    public CommonResult<List<ProductBrandRespVO>> getProductCategoryList(@Valid ProductBrandListReqVO listVO) {
+    public CommonResult<List<ProductBrandRespVO>> getBrandList(@Valid ProductBrandListReqVO listVO) {
         List<ProductBrandDO> list = brandService.getBrandList(listVO);
         list.sort(Comparator.comparing(ProductBrandDO::getSort));
         return success(ProductBrandConvert.INSTANCE.convertList(list));
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
index 3ad5d45ee..fa5ecd2d1 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
@@ -20,7 +20,8 @@ public class ProductBrandBaseVO {
     @NotNull(message = "品牌图片不能为空")
     private String picUrl;
 
-    @ApiModelProperty(value = "品牌排序", example = "1")
+    @ApiModelProperty(value = "品牌排序", required = true, example = "1")
+    @NotNull(message = "品牌排序不能为空")
     private Integer sort;
 
     @ApiModelProperty(value = "品牌描述", example = "描述")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandPageReqVO.java
index 8dae40244..3b3d829de 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandPageReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandPageReqVO.java
@@ -21,7 +21,7 @@ public class ProductBrandPageReqVO extends PageParam {
     @ApiModelProperty(value = "品牌名称", example = "芋道")
     private String name;
 
-    @ApiModelProperty(value = "状态", example = "0")
+    @ApiModelProperty(value = "状态", example = "0", notes = "参考 CommonStatusEnum 枚举")
     private Integer status;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
index 2a93a5a26..4144e6a57 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
@@ -34,14 +34,14 @@ public class ProductCategoryController {
     @PostMapping("/create")
     @ApiOperation("创建商品分类")
     @PreAuthorize("@ss.hasPermission('product:category:create')")
-    public CommonResult<Long> createProductCategory(@Valid @RequestBody ProductCategoryCreateReqVO createReqVO) {
+    public CommonResult<Long> createCategory(@Valid @RequestBody ProductCategoryCreateReqVO createReqVO) {
         return success(categoryService.createCategory(createReqVO));
     }
 
     @PutMapping("/update")
     @ApiOperation("更新商品分类")
     @PreAuthorize("@ss.hasPermission('product:category:update')")
-    public CommonResult<Boolean> updateProductCategory(@Valid @RequestBody ProductCategoryUpdateReqVO updateReqVO) {
+    public CommonResult<Boolean> updateCategory(@Valid @RequestBody ProductCategoryUpdateReqVO updateReqVO) {
         categoryService.updateCategory(updateReqVO);
         return success(true);
     }
@@ -50,7 +50,7 @@ public class ProductCategoryController {
     @ApiOperation("删除商品分类")
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:category:delete')")
-    public CommonResult<Boolean> deleteProductCategory(@RequestParam("id") Long id) {
+    public CommonResult<Boolean> deleteCategory(@RequestParam("id") Long id) {
         categoryService.deleteCategory(id);
         return success(true);
     }
@@ -59,7 +59,7 @@ public class ProductCategoryController {
     @ApiOperation("获得商品分类")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:category:query')")
-    public CommonResult<ProductCategoryRespVO> getProductCategory(@RequestParam("id") Long id) {
+    public CommonResult<ProductCategoryRespVO> getCategory(@RequestParam("id") Long id) {
         ProductCategoryDO category = categoryService.getCategory(id);
         return success(ProductCategoryConvert.INSTANCE.convert(category));
     }
@@ -67,7 +67,7 @@ public class ProductCategoryController {
     @GetMapping("/list")
     @ApiOperation("获得商品分类列表")
     @PreAuthorize("@ss.hasPermission('product:category:query')")
-    public CommonResult<List<ProductCategoryRespVO>> getProductCategoryList(@Valid ProductCategoryListReqVO treeListReqVO) {
+    public CommonResult<List<ProductCategoryRespVO>> getCategoryList(@Valid ProductCategoryListReqVO treeListReqVO) {
         List<ProductCategoryDO> list = categoryService.getEnableCategoryList(treeListReqVO);
         list.sort(Comparator.comparing(ProductCategoryDO::getSort));
         return success(ProductCategoryConvert.INSTANCE.convertList(list));
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
index 55e4e6927..a62df7dc8 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/ProductBrandMapper.java
@@ -27,4 +27,8 @@ public interface ProductBrandMapper extends BaseMapperX<ProductBrandDO> {
                 .likeIfPresent(ProductBrandDO::getName, reqVO.getName()));
     }
 
+    default ProductBrandDO selectByName(String name) {
+        return selectOne(ProductBrandDO::getName, name);
+    }
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
index 54d4df601..a90ec8a87 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandService.java
@@ -21,7 +21,7 @@ public interface ProductBrandService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createProductBrand(@Valid ProductBrandCreateReqVO createReqVO);
+    Long createBrand(@Valid ProductBrandCreateReqVO createReqVO);
 
     /**
      * 更新品牌
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
index 28a02da38..c7a3e5198 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.product.service.brand;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandListReqVO;
@@ -8,6 +9,7 @@ import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpd
 import cn.iocoder.yudao.module.product.convert.brand.ProductBrandConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.mysql.brand.ProductBrandMapper;
+import com.google.common.annotations.VisibleForTesting;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -16,7 +18,7 @@ import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.BRAND_NOT_EXISTS;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
 
 /**
  * 品牌 Service 实现类
@@ -31,7 +33,10 @@ public class ProductBrandServiceImpl implements ProductBrandService {
     private ProductBrandMapper brandMapper;
 
     @Override
-    public Long createProductBrand(ProductBrandCreateReqVO createReqVO) {
+    public Long createBrand(ProductBrandCreateReqVO createReqVO) {
+        // 校验
+        validateBrandNameUnique(null, createReqVO.getName());
+
         // 插入
         ProductBrandDO brand = ProductBrandConvert.INSTANCE.convert(createReqVO);
         brandMapper.insert(brand);
@@ -43,6 +48,7 @@ public class ProductBrandServiceImpl implements ProductBrandService {
     public void updateBrand(ProductBrandUpdateReqVO updateReqVO) {
         // 校验存在
         validateBrandExists(updateReqVO.getId());
+        validateBrandNameUnique(updateReqVO.getId(), updateReqVO.getName());
         // 更新
         ProductBrandDO updateObj = ProductBrandConvert.INSTANCE.convert(updateReqVO);
         brandMapper.updateById(updateObj);
@@ -51,7 +57,7 @@ public class ProductBrandServiceImpl implements ProductBrandService {
     @Override
     public void deleteBrand(Long id) {
         // 校验存在
-        this.validateBrandExists(id);
+        validateBrandExists(id);
         // 删除
         brandMapper.deleteById(id);
     }
@@ -62,6 +68,21 @@ public class ProductBrandServiceImpl implements ProductBrandService {
         }
     }
 
+    @VisibleForTesting
+    public void validateBrandNameUnique(Long id, String name) {
+        ProductBrandDO brand = brandMapper.selectByName(name);
+        if (brand == null) {
+            return;
+        }
+        // 如果 id 为空，说明不用比较是否为相同 id 的字典类型
+        if (id == null) {
+            throw exception(BRAND_NAME_EXISTS);
+        }
+        if (!brand.getId().equals(id)) {
+            throw exception(BRAND_NAME_EXISTS);
+        }
+    }
+
     @Override
     public ProductBrandDO getBrand(Long id) {
         return brandMapper.selectById(id);
@@ -79,9 +100,13 @@ public class ProductBrandServiceImpl implements ProductBrandService {
 
     @Override
     public void validateProductBrand(Long id) {
-        if(getBrand(id) == null){
+        ProductBrandDO brand = brandMapper.selectById(id);
+        if (brand == null) {
             throw exception(BRAND_NOT_EXISTS);
         }
+        if (brand.getStatus().equals(CommonStatusEnum.DISABLE.getStatus())) {
+            throw exception(BRAND_DISABLED);
+        }
     }
 
     @Override
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
index b4664fd4d..ebfe599d6 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
@@ -63,7 +63,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         if (productCategoryMapper.selectCountByParentId(id) > 0) {
             throw exception(CATEGORY_EXISTS_CHILDREN);
         }
-
+        // TODO 芋艿 补充只有不存在商品才可以删除
         // 删除
         productCategoryMapper.deleteById(id);
     }
@@ -94,8 +94,8 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     @Override
     public void validateCategoryLevel(Long id) {
         Integer level = getProductCategoryLevel(id, 1);
-        if(level < 3){
-          throw exception(CATEGORY_LEVEL_ERROR);
+        if (level < 3){
+            throw exception(CATEGORY_LEVEL_ERROR);
         }
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
index 179778d0b..93817d44c 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
@@ -43,7 +43,7 @@ public class ProductBrandServiceImplTest extends BaseDbUnitTest {
         ProductBrandCreateReqVO reqVO = randomPojo(ProductBrandCreateReqVO.class);
 
         // 调用
-        Long brandId = brandService.createProductBrand(reqVO);
+        Long brandId = brandService.createBrand(reqVO);
         // 断言
         assertNotNull(brandId);
         // 校验记录的属性是否正确
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index fb31aa345..c26354ead 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -45,7 +45,7 @@ spring:
       datasource:
         master:
           name: ruoyi-vue-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://139.9.196.247:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
@@ -56,7 +56,7 @@ spring:
         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
         slave: # 模拟从库，可根据自己需要修改
           name: ruoyi-vue-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://139.9.196.247:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
@@ -68,10 +68,10 @@ spring:
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
-    host: 127.0.0.1 # 地址
+    host: 139.9.196.247 # 地址
     port: 6379 # 端口
     database: 0 # 数据库索引
-#    password: 123456 # 密码，建议生产环境开启
+    password: 123456 # 密码，建议生产环境开启
 
 jasypt:
   encryptor:
diff --git a/yudao-ui-admin/src/views/mall/product/category/index.vue b/yudao-ui-admin/src/views/mall/product/category/index.vue
index fccadb81c..24ae64319 100644
--- a/yudao-ui-admin/src/views/mall/product/category/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/category/index.vue
@@ -61,10 +61,8 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="上级分类" prop="parentId">
-          <Treeselect v-model="form.parentId" :options="parentCategoryOptions" :normalizer="normalizer"
-                      :show-count="true"
-                      :defaultExpandLevel="1"
-                      placeholder="上级分类"/>
+          <Treeselect v-model="form.parentId" :options="parentCategoryOptions" :normalizer="normalizer" :show-count="true"
+                      :defaultExpandLevel="1" placeholder="上级分类"/>
         </el-form-item>
         <el-form-item label="分类名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入分类名称"/>

From 2cc60deb973a38acd0148e341f832a6821a0cdec Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 5 Sep 2022 20:29:27 +0800
Subject: [PATCH 53/56] =?UTF-8?q?mall=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=A7=84=E6=A0=BC=E3=80=81=E8=A7=84=E6=A0=BC=E5=80=BC?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/ProductPropertyController.java   | 59 +++++--------------
 .../property/vo/ProductPropertyExcelVO.java   | 29 ---------
 .../vo/ProductPropertyExportReqVO.java        | 25 --------
 .../ProductPropertyAndValueRespVO.java        |  4 +-
 .../{ => property}/ProductPropertyBaseVO.java | 11 ++--
 .../ProductPropertyCreateReqVO.java           |  5 +-
 .../ProductPropertyPageReqVO.java             | 16 +++--
 .../ProductPropertyUpdateReqVO.java           |  6 +-
 .../vo/value/ProductPropertyValueBaseVO.java  | 28 +++++++++
 .../ProductPropertyValueCreateReqVO.java      |  2 +-
 .../vo/value}/ProductPropertyValueRespVO.java | 14 +++--
 .../ProductPropertyValueUpdateReqVO.java      |  4 +-
 .../vo/ProductPropertyValueBaseVO.java        | 24 --------
 .../property/ProductPropertyConvert.java      |  5 +-
 .../ProductPropertyValueConvert.java          |  4 +-
 .../mysql/property/ProductPropertyMapper.java |  3 +-
 .../ProductPropertyValueMapper.java           |  2 +-
 .../property/ProductPropertyService.java      | 11 +---
 .../property/ProductPropertyServiceImpl.java  | 14 ++---
 .../service/sku/ProductSkuServiceImpl.java    |  4 +-
 .../service/spu/ProductSpuServiceImpl.java    |  4 +-
 21 files changed, 102 insertions(+), 172 deletions(-)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExcelVO.java
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExportReqVO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/{ => property}/ProductPropertyAndValueRespVO.java (94%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/{ => property}/ProductPropertyBaseVO.java (53%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/{ => property}/ProductPropertyCreateReqVO.java (71%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/{ => property}/ProductPropertyPageReqVO.java (64%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/{ => property}/ProductPropertyUpdateReqVO.java (83%)
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/{propertyvalue/vo => property/vo/value}/ProductPropertyValueCreateReqVO.java (96%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/{propertyvalue/vo => property/vo/value}/ProductPropertyValueRespVO.java (57%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/{propertyvalue/vo => property/vo/value}/ProductPropertyValueUpdateReqVO.java (83%)
 delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueBaseVO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/{propertyvalue => property}/ProductPropertyValueMapper.java (95%)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
index 6ed0ec1d1..7401ec744 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
@@ -1,29 +1,23 @@
 package cn.iocoder.yudao.module.product.controller.admin.property;
 
-import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.annotations.*;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.*;
-import cn.iocoder.yudao.module.product.convert.property.ProductPropertyConvert;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyUpdateReqVO;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Api(tags = "管理后台 - 规格名称")
 @RestController
@@ -66,15 +60,6 @@ public class ProductPropertyController {
         return success(productPropertyService.getPropertyResp(id));
     }
 
-    @GetMapping("/list")
-    @ApiOperation("获得规格名称列表")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    @PreAuthorize("@ss.hasPermission('product:property:query')")
-    public CommonResult<List<ProductPropertyAndValueRespVO>> getPropertyList(@RequestParam("ids") Collection<Long> ids) {
-        List<ProductPropertyDO> list = productPropertyService.getPropertyList(ids);
-        return success(ProductPropertyConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @ApiOperation("获得规格名称分页")
     @PreAuthorize("@ss.hasPermission('product:property:query')")
@@ -82,16 +67,4 @@ public class ProductPropertyController {
         return success(productPropertyService.getPropertyListPage(pageVO));
     }
 
-    @GetMapping("/export-excel")
-    @ApiOperation("导出规格名称 Excel")
-    @PreAuthorize("@ss.hasPermission('product:property:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPropertyExcel(@Valid ProductPropertyExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<ProductPropertyDO> list = productPropertyService.getPropertyList(exportReqVO);
-        // 导出 Excel
-        List<ProductPropertyExcelVO> datas = ProductPropertyConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "规格名称.xls", "数据", ProductPropertyExcelVO.class, datas);
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExcelVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExcelVO.java
deleted file mode 100644
index c935c1001..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExcelVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-
-/**
- * 规格名称 Excel VO
- *
- * @author 芋道源码
- */
-@Data
-public class ProductPropertyExcelVO {
-
-    @ExcelProperty("主键")
-    private Long id;
-
-    @ExcelProperty("规格名称")
-    private String name;
-
-    @ExcelProperty("状态： 0 开启 ，1 禁用")
-    private Integer status;
-
-    @ExcelProperty("创建时间")
-    private Date createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExportReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExportReqVO.java
deleted file mode 100644
index 119c76e03..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExportReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel(value = "管理后台 - 规格名称 Excel 导出 Request VO", description = "参数和 PropertyPageReqVO 是一致的")
-@Data
-public class ProductPropertyExportReqVO {
-
-    @ApiModelProperty(value = "规格名称")
-    private String name;
-
-    @ApiModelProperty(value = "状态： 0 开启 ，1 禁用")
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyAndValueRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
similarity index 94%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyAndValueRespVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
index 7a73ca35f..7684d4ea7 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyAndValueRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.property;
 
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
similarity index 53%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyBaseVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
index e3deb8838..c900a727b 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
@@ -1,9 +1,10 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.property;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-// TODO @芋艿：完整的 review 下规格
+import javax.validation.constraints.NotEmpty;
+
 /**
 * 规格名称 Base VO，提供给添加、修改、详细的子 VO 使用
 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
@@ -11,10 +12,12 @@ import lombok.Data;
 @Data
 public class ProductPropertyBaseVO {
 
-    @ApiModelProperty(value = "规格名称")
+    @ApiModelProperty(value = "规格名称", required = true, example = "颜色")
+    @NotEmpty(message = "规格名称不能为空")
     private String name;
 
-    @ApiModelProperty(value = "状态： 0 开启 ，1 禁用")
+    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举")
+    @NotEmpty(message = "状态不能为空")
     private Integer status;
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyCreateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
similarity index 71%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyCreateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
index 54d72da8a..c0e6b9da2 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.property;
 
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
 import lombok.*;
 import io.swagger.annotations.*;
 
@@ -13,6 +13,7 @@ import java.util.List;
 @ToString(callSuper = true)
 public class ProductPropertyCreateReqVO extends ProductPropertyBaseVO {
 
+    // TODO @Luowenfeng：规格值的 CRUD 可以单独；前端 + 后端，改成类似字典类型、字典数据的这种交互；在加一个 ProductPropertyValueController
     @ApiModelProperty(value = "属性值")
     @NotNull(message = "属性值不能为空")
     List<ProductPropertyValueCreateReqVO> propertyValueList;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
similarity index 64%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyPageReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
index 360a0a5e1..1902fb205 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyPageReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
@@ -1,11 +1,15 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.property;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("管理后台 - 规格名称分页 Request VO")
@@ -14,10 +18,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class ProductPropertyPageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "规格名称")
+    @ApiModelProperty(value = "规格名称", example = "颜色")
     private String name;
 
-    @ApiModelProperty(value = "状态： 0 开启 ，1 禁用")
+    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举")
     private Integer status;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
similarity index 83%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyUpdateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
index ed190e8b0..f4b9d695a 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.product.controller.admin.property.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.property;
 
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
 import lombok.*;
 import io.swagger.annotations.*;
 import javax.validation.constraints.*;
@@ -12,7 +12,7 @@ import java.util.List;
 @ToString(callSuper = true)
 public class ProductPropertyUpdateReqVO extends ProductPropertyBaseVO {
 
-    @ApiModelProperty(value = "主键", required = true)
+    @ApiModelProperty(value = "主键", required = true, example = "1")
     @NotNull(message = "主键不能为空")
     private Long id;
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
new file mode 100644
index 000000000..1e0708009
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.value;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+* 规格值 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
+@Data
+public class ProductPropertyValueBaseVO {
+
+    @ApiModelProperty(value = "规格编号", required = true, example = "1024")
+    @NotNull(message = "规格编号不能为空")
+    private Long propertyId;
+
+    @ApiModelProperty(value = "规格值名字", required = true, example = "红色")
+    @NotEmpty(message = "规格值名字不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举")
+    @NotEmpty(message = "状态不能为空")
+    private Integer status;
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueCreateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
similarity index 96%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueCreateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
index 23ea0690c..f7237f9cd 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.value;
 
 import lombok.*;
 import io.swagger.annotations.*;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
similarity index 57%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueRespVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
index 25fa25f02..17eedaae9 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
@@ -1,8 +1,12 @@
-package cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.value;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.Date;
 
 @ApiModel("管理后台 - 规格值 Response VO")
 @Data
@@ -10,7 +14,7 @@ import io.swagger.annotations.*;
 @ToString(callSuper = true)
 public class ProductPropertyValueRespVO extends ProductPropertyValueBaseVO {
 
-    @ApiModelProperty(value = "主键", required = true)
+    @ApiModelProperty(value = "主键", required = true, example = "10")
     private Long id;
 
     @ApiModelProperty(value = "创建时间")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
similarity index 83%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueUpdateReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
index 894d6f6eb..4a1bc5778 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo;
+package cn.iocoder.yudao.module.product.controller.admin.property.vo.value;
 
 import lombok.*;
 import io.swagger.annotations.*;
@@ -10,7 +10,7 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class ProductPropertyValueUpdateReqVO extends ProductPropertyValueBaseVO {
 
-    @ApiModelProperty(value = "主键", required = true)
+    @ApiModelProperty(value = "主键", required = true, example = "1024")
     @NotNull(message = "主键不能为空")
     private Integer id;
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueBaseVO.java
deleted file mode 100644
index ed600a9ac..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/vo/ProductPropertyValueBaseVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
-
-/**
-* 规格值 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
-@Data
-public class ProductPropertyValueBaseVO {
-
-    @ApiModelProperty(value = "规格键id")
-    private Long propertyId;
-
-    @ApiModelProperty(value = "规格值名字")
-    private String name;
-
-    @ApiModelProperty(value = "状态： 1 开启 ，2 禁用")
-    private Integer status;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
index 022580f30..eb6bc55e2 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
@@ -4,10 +4,13 @@ import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyExcelVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.*;
 
 /**
  * 规格名称 Convert
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/ProductPropertyValueConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/ProductPropertyValueConvert.java
index 447b9a5ea..331ad623f 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/ProductPropertyValueConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/ProductPropertyValueConvert.java
@@ -4,10 +4,12 @@ import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyValueDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.*;
 
 /**
  * 规格值 Convert
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java
index 28f4ea51c..2272c0a52 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java
@@ -5,9 +5,10 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyExportReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.*;
 
 /**
  * 规格名称 Mapper
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/propertyvalue/ProductPropertyValueMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyValueMapper.java
similarity index 95%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/propertyvalue/ProductPropertyValueMapper.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyValueMapper.java
index 5c11a9f42..6c5fc7570 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/propertyvalue/ProductPropertyValueMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyValueMapper.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.product.dal.mysql.propertyvalue;
+package cn.iocoder.yudao.module.product.dal.mysql.property;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java
index 90d1d15bd..a87e15d70 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java
@@ -1,7 +1,8 @@
 package cn.iocoder.yudao.module.product.service.property;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.*;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.*;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 
 import javax.validation.Valid;
@@ -61,14 +62,6 @@ public interface ProductPropertyService {
      */
     PageResult<ProductPropertyDO> getPropertyPage(ProductPropertyPageReqVO pageReqVO);
 
-    /**
-     * 获得规格名称列表, 用于 Excel 导出
-     *
-     * @param exportReqVO 查询条件
-     * @return 规格名称列表
-     */
-    List<ProductPropertyDO> getPropertyList(ProductPropertyExportReqVO exportReqVO);
-
     /**
      * 获取属性及属性值列表 分页
      * @param pageReqVO
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
index 5744e6ec3..d48c8b1ff 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
@@ -1,15 +1,16 @@
 package cn.iocoder.yudao.module.product.service.property;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.*;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.*;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.convert.property.ProductPropertyConvert;
 import cn.iocoder.yudao.module.product.convert.propertyvalue.ProductPropertyValueConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyValueDO;
 import cn.iocoder.yudao.module.product.dal.mysql.property.ProductPropertyMapper;
-import cn.iocoder.yudao.module.product.dal.mysql.propertyvalue.ProductPropertyValueMapper;
+import cn.iocoder.yudao.module.product.dal.mysql.property.ProductPropertyValueMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -102,11 +103,6 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
         return productPropertyMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public List<ProductPropertyDO> getPropertyList(ProductPropertyExportReqVO exportReqVO) {
-        return productPropertyMapper.selectList(exportReqVO);
-    }
-
     @Override
     public PageResult<ProductPropertyAndValueRespVO> getPropertyListPage(ProductPropertyPageReqVO pageReqVO) {
         //获取属性列表
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index 1e30a597a..c08a8133b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyAndValueRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index 664d619c4..a72a1fcef 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.product.service.spu;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyAndValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyViewRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.ProductPropertyValueRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;

From c06077e3a6be384fabc0877f9905a1af6a96d33e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 5 Sep 2022 21:02:44 +0800
Subject: [PATCH 54/56] =?UTF-8?q?mall=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sku/ProductSkuController.java       |  75 +------------
 .../admin/sku/vo/ProductSkuBaseVO.java        |   6 -
 .../sku/vo/ProductSkuCreateOrUpdateReqVO.java |   7 ++
 .../admin/sku/vo/ProductSkuExcelVO.java       |  53 ---------
 .../admin/sku/vo/ProductSkuExportReqVO.java   |  43 --------
 .../admin/sku/vo/ProductSkuPageReqVO.java     |  45 --------
 .../admin/sku/vo/ProductSkuRespVO.java        |  18 ++-
 .../admin/sku/vo/ProductSkuUpdateReqVO.java   |  18 ---
 .../admin/spu/ProductSpuController.java       |  20 ++--
 .../admin/spu/vo/ProductSpuBaseVO.java        |   3 +-
 .../admin/spu/vo/ProductSpuDetailRespVO.java  |  57 ++++++++++
 ...ageReqVO.java => ProductSpuPageReqVO.java} |   4 +-
 .../{SpuRespVO.java => ProductSpuRespVO.java} |  10 +-
 .../app/spu/AppProductSpuController.java      |   1 -
 .../controller/app/spu/vo/AppSpuRespVO.java   |   5 +-
 .../property/ProductPropertyConvert.java      |   8 +-
 .../convert/sku/ProductSkuConvert.java        |   9 --
 .../convert/spu/ProductSpuConvert.java        |   8 +-
 .../mysql/property/ProductPropertyMapper.java |  13 +--
 .../dal/mysql/sku/ProductSkuMapper.java       |  19 +---
 .../dal/mysql/spu/ProductSpuMapper.java       |   4 +-
 .../service/sku/ProductSkuService.java        |  26 -----
 .../service/sku/ProductSkuServiceImpl.java    |  26 -----
 .../service/spu/ProductSpuService.java        |   8 +-
 .../service/spu/ProductSpuServiceImpl.java    |  14 +--
 .../service/sku/SkuServiceImplTest.java       | 103 +-----------------
 .../spu/ProductSpuServiceImplTest.java        |   8 +-
 27 files changed, 126 insertions(+), 485 deletions(-)
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExcelVO.java
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExportReqVO.java
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuPageReqVO.java
 delete mode 100755 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/{SpuPageReqVO.java => ProductSpuPageReqVO.java} (92%)
 rename yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/{SpuRespVO.java => ProductSpuRespVO.java} (90%)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
index cefa6afe0..2081e7da8 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
@@ -1,27 +1,9 @@
 package cn.iocoder.yudao.module.product.controller.admin.sku;
 
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
-import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
-import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "管理后台 - 商品 sku")
 @RestController
@@ -29,57 +11,4 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @Validated
 public class ProductSkuController {
 
-    @Resource
-    private ProductSkuService ProductSkuService;
-
-    @PostMapping("/create")
-    @ApiOperation("创建商品sku")
-    @PreAuthorize("@ss.hasPermission('product:sku:create')")
-    public CommonResult<Long> createSku(@Valid @RequestBody ProductSkuCreateOrUpdateReqVO createReqVO) {
-        return success(ProductSkuService.createSku(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新商品sku")
-    @PreAuthorize("@ss.hasPermission('product:sku:update')")
-    public CommonResult<Boolean> updateSku(@Valid @RequestBody ProductSkuUpdateReqVO updateReqVO) {
-        ProductSkuService.updateSku(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除商品sku")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('product:sku:delete')")
-    public CommonResult<Boolean> deleteSku(@RequestParam("id") Long id) {
-        ProductSkuService.deleteSku(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @ApiOperation("获得商品sku")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('product:sku:query')")
-    public CommonResult<ProductSkuRespVO> getSku(@RequestParam("id") Long id) {
-        ProductSkuDO sku = ProductSkuService.getSku(id);
-        return success(ProductSkuConvert.INSTANCE.convert(sku));
-    }
-
-    @GetMapping("/list")
-    @ApiOperation("获得商品sku列表")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    @PreAuthorize("@ss.hasPermission('product:sku:query')")
-    public CommonResult<List<ProductSkuRespVO>> getSkuList(@RequestParam("ids") Collection<Long> ids) {
-        List<ProductSkuDO> list = ProductSkuService.getSkuList(ids);
-        return success(ProductSkuConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @ApiOperation("获得商品sku分页")
-    @PreAuthorize("@ss.hasPermission('product:sku:query')")
-    public CommonResult<PageResult<ProductSkuRespVO>> getSkuPage(@Valid ProductSkuPageReqVO pageVO) {
-        PageResult<ProductSkuDO> pageResult = ProductSkuService.getSkuPage(pageVO);
-        return success(ProductSkuConvert.INSTANCE.convertPage(pageResult));
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
index c6d8b5459..43f67ee53 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
@@ -8,7 +8,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
 * 商品 SKU Base VO，提供给添加、修改、详细的子 VO 使用
@@ -21,11 +20,6 @@ public class ProductSkuBaseVO {
     @NotEmpty(message = "商品 SKU 名字不能为空")
     private String name;
 
-    /**
-     * 规格值数组
-     */
-    private List<Property> properties;
-
     @ApiModelProperty(value = "销售价格，单位：分", required = true, example = "1024", notes = "单位：分")
     @NotNull(message = "销售价格，单位：分不能为空")
     private Integer price;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
index adc450011..84d71d9b7 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.List;
+
 @ApiModel("管理后台 - 商品 SKU 创建/更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -16,4 +18,9 @@ public class ProductSkuCreateOrUpdateReqVO extends ProductSkuBaseVO {
     @ApiModelProperty(value = "商品 id 更新时须有", example = "1")
     private Long id;
 
+    /**
+     * 规格值数组
+     */
+    private List<Property> properties;
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExcelVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExcelVO.java
deleted file mode 100755
index 7caf1313d..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExcelVO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 商品sku Excel VO
- *
- * @author 芋道源码
- */
-@Data
-public class ProductSkuExcelVO {
-
-    @ExcelProperty("主键")
-    private Long id;
-
-    @ExcelProperty("spu编号")
-    private Long spuId;
-
-    // TODO @franky：这个单元格，可能会有点展示的问题
-    @ExcelProperty("规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]")
-    private List<Property> properties;
-
-    @ExcelProperty("销售价格，单位：分")
-    private Integer price;
-
-    @ExcelProperty("原价， 单位： 分")
-    private Integer originalPrice;
-
-    @ExcelProperty("成本价，单位： 分")
-    private Integer costPrice;
-
-    @ExcelProperty("条形码")
-    private String barCode;
-
-    @ExcelProperty("图片地址")
-    private String picUrl;
-
-    @ExcelProperty("状态： 0-正常 1-禁用")
-    private Integer status;
-
-    @ExcelProperty("创建时间")
-    private Date createTime;
-
-    @Data
-    public static class Property {
-        private Integer propertyId;
-        private Integer valueId;
-    }
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExportReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExportReqVO.java
deleted file mode 100755
index 0bf34a67d..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExportReqVO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel(value = "管理后台 - 商品sku Excel 导出 Request VO", description = "参数和 SkuPageReqVO 是一致的")
-@Data
-public class ProductSkuExportReqVO {
-
-    @ApiModelProperty(value = "spu编号")
-    private Long spuId;
-
-    @ApiModelProperty(value = "规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]")
-    private String properties;
-
-    @ApiModelProperty(value = "销售价格，单位：分")
-    private Integer price;
-
-    @ApiModelProperty(value = "原价， 单位： 分")
-    private Integer originalPrice;
-
-    @ApiModelProperty(value = "成本价，单位： 分")
-    private Integer costPrice;
-
-    @ApiModelProperty(value = "条形码")
-    private String barCode;
-
-    @ApiModelProperty(value = "图片地址")
-    private String picUrl;
-
-    @ApiModelProperty(value = "状态： 0-正常 1-禁用")
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuPageReqVO.java
deleted file mode 100755
index b5a494902..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuPageReqVO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel("管理后台 - 商品sku分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ProductSkuPageReqVO extends PageParam {
-
-    @ApiModelProperty(value = "spu编号")
-    private Long spuId;
-
-    @ApiModelProperty(value = "规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]")
-    private String properties;
-
-    @ApiModelProperty(value = "销售价格，单位：分")
-    private Integer price;
-
-    @ApiModelProperty(value = "原价， 单位： 分")
-    private Integer originalPrice;
-
-    @ApiModelProperty(value = "成本价，单位： 分")
-    private Integer costPrice;
-
-    @ApiModelProperty(value = "条形码")
-    private String barCode;
-
-    @ApiModelProperty(value = "图片地址")
-    private String picUrl;
-
-    @ApiModelProperty(value = "状态： 0-正常 1-禁用")
-    private Integer status;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "创建时间")
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuRespVO.java
index 3b12ba21c..46e76cc63 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuRespVO.java
@@ -1,8 +1,13 @@
 package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.Date;
+import java.util.List;
 
 @ApiModel("管理后台 - 商品sku Response VO")
 @Data
@@ -10,10 +15,15 @@ import io.swagger.annotations.*;
 @ToString(callSuper = true)
 public class ProductSkuRespVO extends ProductSkuBaseVO {
 
-    @ApiModelProperty(value = "主键", required = true)
+    @ApiModelProperty(value = "主键", required = true, example = "1024")
     private Long id;
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
+    /**
+     * 规格值数组
+     */
+    private List<Property> properties;
+
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java
deleted file mode 100755
index 984976eee..000000000
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
-
-@ApiModel("管理后台 - 商品sku更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class ProductSkuUpdateReqVO extends ProductSkuBaseVO {
-
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private Long id;
-
-}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
index 4fa59012d..ddae45dc2 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.product.controller.admin.spu;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuPageReqVO;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
@@ -48,7 +48,7 @@ public class ProductSpuController {
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除商品spu")
+    @ApiOperation("删除商品 SPU")
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:spu:delete')")
     public CommonResult<Boolean> deleteSpu(@RequestParam("id") Long id) {
@@ -57,26 +57,28 @@ public class ProductSpuController {
     }
 
     @GetMapping("/get")
-    @ApiOperation("获得商品spu")
+    @ApiOperation("获得商品 SPU")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<SpuRespVO> getSpu(@RequestParam("id") Long id) {
+    public CommonResult<ProductSpuRespVO> getSpu(@RequestParam("id") Long id) {
         return success(spuService.getSpu(id));
     }
 
+    // TODO @luowenfeng：新增 get-detail，返回 SpuDetailRespVO
+
     @GetMapping("/list")
-    @ApiOperation("获得商品spu列表")
+    @ApiOperation("获得商品 SPU 列表")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
     @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<List<SpuRespVO>> getSpuList(@RequestParam("ids") Collection<Long> ids) {
+    public CommonResult<List<ProductSpuRespVO>> getSpuList(@RequestParam("ids") Collection<Long> ids) {
         List<ProductSpuDO> list = spuService.getSpuList(ids);
         return success(ProductSpuConvert.INSTANCE.convertList(list));
     }
 
     @GetMapping("/page")
-    @ApiOperation("获得商品spu分页")
+    @ApiOperation("获得商品 SPU 分页")
     @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<PageResult<SpuRespVO>> getSpuPage(@Valid SpuPageReqVO pageVO) {
+    public CommonResult<PageResult<ProductSpuRespVO>> getSpuPage(@Valid ProductSpuPageReqVO pageVO) {
         return success(spuService.getSpuPage(pageVO));
     }
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
index 5f6c69e94..ec58bab76 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
@@ -35,8 +35,7 @@ public class ProductSpuBaseVO {
     @NotNull(message = "商品分类编号不能为空")
     private Long categoryId;
 
-    @ApiModelProperty(value = "商品品牌编号", required = true, example = "1")
-//    @NotNull(message = "商品品牌编号不能为空")
+    @ApiModelProperty(value = "商品品牌编号", example = "1")
     private Long brandId;
 
     @ApiModelProperty(value = "商品图片的数组", required = true)
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
new file mode 100644
index 000000000..dafb0a680
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.product.controller.admin.spu.vo;
+
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.Date;
+import java.util.List;
+
+@ApiModel(value = "管理后台 - 商品 SPU 详细 Response VO", description = "包括关联的 SKU 等信息")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductSpuDetailRespVO extends ProductSpuBaseVO {
+
+    @ApiModelProperty(value = "主键", required = true, example = "1")
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * SKU 数组
+     */
+    private List<Sku> skus;
+
+    @ApiModel(value = "管理后台 - 商品 SKU 详细 Response VO")
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    @ToString(callSuper = true)
+    public static class Sku extends ProductSkuBaseVO {
+
+        /**
+         * 规格的数组
+         */
+        private List<ProductSpuDetailRespVO.Property> properties;
+
+    }
+
+    @ApiModel(value = "管理后台 - 商品规格的详细 Response VO")
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    @ToString(callSuper = true)
+    public static class Property extends ProductSkuBaseVO.Property {
+
+        @ApiModelProperty(value = "规格的名字", required = true, example = "颜色")
+        private String propertyName;
+
+        @ApiModelProperty(value = "规格值的名字", required = true, example = "蓝色")
+        private String valueName;
+
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
similarity index 92%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
index 1af946ebe..36a37541b 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
@@ -8,11 +8,11 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 商品spu分页 Request VO")
+@ApiModel("管理后台 - 商品 SPU 分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class SpuPageReqVO extends PageParam {
+public class ProductSpuPageReqVO extends PageParam {
 
     @ApiModelProperty(value = "商品名称")
     private String name;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
similarity index 90%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
index 7cdf6f975..9db319fdc 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
@@ -9,16 +9,14 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 
-@ApiModel("管理后台 - 商品spu Response VO")
+// TODO @Luowenfeng：这个类只返回 SPU 相关的信息，删除 skus、categoryIds、productPropertyViews；明细使用 SpuDetailRespVO 替代
+@ApiModel("管理后台 - 商品 SPU Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class SpuRespVO extends ProductSpuBaseVO {
-
-    // TODO @franky：注解要完整
+public class ProductSpuRespVO extends ProductSpuBaseVO {
 
     @ApiModelProperty(value = "主键", required = true, example = "1")
     private Long id;
@@ -33,7 +31,7 @@ public class SpuRespVO extends ProductSpuBaseVO {
     private List<ProductSkuRespVO> skus;
 
     @ApiModelProperty(value = "分类id数组，一直递归到一级父节点", example = "[1,2,4]")
-    private LinkedList<Long> categoryIds;
+    private List<Long> categoryIds;
 
     // TODO @芋艿：再琢磨下 这个 VO 类，其实变成 SpuRespVO 内嵌的 VO 类会更好一点；然后把 SpuRespVO 改成 SpuDetailSpuVO
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
index 1cb07eec5..7e0f912b4 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.product.controller.app.spu;
 import cn.hutool.core.bean.BeanUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuRespVO;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
index 7f638a704..b45987370 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
@@ -1,10 +1,9 @@
 package cn.iocoder.yudao.module.product.controller.app.spu.vo;
 
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuRespVO;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
 /**
  * <p>
@@ -16,7 +15,7 @@ import lombok.ToString;
 @ApiModel("App - 商品spu Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class AppSpuRespVO extends SpuRespVO {
+public class AppSpuRespVO extends ProductSpuRespVO {
 
 
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
index eb6bc55e2..52b82a2ea 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyConvert.java
@@ -1,17 +1,15 @@
 package cn.iocoder.yudao.module.product.convert.property;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyExcelVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
+import java.util.List;
+
 /**
  * 规格名称 Convert
  *
@@ -32,6 +30,4 @@ public interface ProductPropertyConvert {
 
     PageResult<ProductPropertyAndValueRespVO> convertPage(PageResult<ProductPropertyDO> page);
 
-    List<ProductPropertyExcelVO> convertList02(List<ProductPropertyDO> list);
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
index 8011ac077..0ee468d36 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
@@ -1,10 +1,7 @@
 package cn.iocoder.yudao.module.product.convert.sku;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuExcelVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -24,8 +21,6 @@ public interface ProductSkuConvert {
 
     ProductSkuDO convert(ProductSkuCreateOrUpdateReqVO bean);
 
-    ProductSkuDO convert(ProductSkuUpdateReqVO bean);
-
     @Mapping(source = "properties", target = "properties")
     ProductSkuRespVO convert(ProductSkuDO bean);
 
@@ -33,8 +28,4 @@ public interface ProductSkuConvert {
 
     List<ProductSkuDO> convertSkuDOList(List<ProductSkuCreateOrUpdateReqVO> list);
 
-    PageResult<ProductSkuRespVO> convertPage(PageResult<ProductSkuDO> page);
-
-    List<ProductSkuExcelVO> convertList02(List<ProductSkuDO> list);
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
index 4ff755b93..2fb6639ab 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
@@ -24,13 +24,13 @@ public interface ProductSpuConvert {
 
     ProductSpuDO convert(ProductSpuUpdateReqVO bean);
 
-    SpuRespVO convert(ProductSpuDO bean);
+    ProductSpuRespVO convert(ProductSpuDO bean);
 
-    List<SpuRespVO> convertList(List<ProductSpuDO> list);
+    List<ProductSpuRespVO> convertList(List<ProductSpuDO> list);
 
-    PageResult<SpuRespVO> convertPage(PageResult<ProductSpuDO> page);
+    PageResult<ProductSpuRespVO> convertPage(PageResult<ProductSpuDO> page);
 
-    SpuPageReqVO convert(AppSpuPageReqVO bean);
+    ProductSpuPageReqVO convert(AppSpuPageReqVO bean);
 
     AppSpuPageRespVO convertAppResp(ProductSpuDO list);
 
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java
index 2272c0a52..bd088466f 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java
@@ -1,11 +1,8 @@
 package cn.iocoder.yudao.module.product.dal.mysql.property;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyExportReqVO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -26,12 +23,4 @@ public interface ProductPropertyMapper extends BaseMapperX<ProductPropertyDO> {
                 .orderByDesc(ProductPropertyDO::getId));
     }
 
-    default List<ProductPropertyDO> selectList(ProductPropertyExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<ProductPropertyDO>()
-                .likeIfPresent(ProductPropertyDO::getName, reqVO.getName())
-                .eqIfPresent(ProductPropertyDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(ProductPropertyDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ProductPropertyDO::getId));
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
index 0e3c8653c..cc45e5764 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
@@ -1,37 +1,20 @@
 package cn.iocoder.yudao.module.product.dal.mysql.sku;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 /**
- * 商品sku Mapper
+ * 商品 SKU Mapper
  *
  * @author 芋道源码
  */
 @Mapper
 public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
 
-    default PageResult<ProductSkuDO> selectPage(ProductSkuPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ProductSkuDO>()
-                .eqIfPresent(ProductSkuDO::getSpuId, reqVO.getSpuId())
-                .eqIfPresent(ProductSkuDO::getProperties, reqVO.getProperties())
-                .eqIfPresent(ProductSkuDO::getPrice, reqVO.getPrice())
-//                .eqIfPresent(ProductSkuDO::getOriginalPrice, reqVO.getOriginalPrice())
-//                .eqIfPresent(ProductSkuDO::getCostPrice, reqVO.getCostPrice())
-                .eqIfPresent(ProductSkuDO::getBarCode, reqVO.getBarCode())
-                .eqIfPresent(ProductSkuDO::getPicUrl, reqVO.getPicUrl())
-                .eqIfPresent(ProductSkuDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(ProductSkuDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ProductSkuDO::getId));
-    }
-
-
     // TODO @franky：方法名 selectList; 可以直接调用 selectList
     default List<ProductSkuDO> selectListBySpuIds(List<Long> spuIds) {
         return selectList(ProductSkuDO::getSpuId, spuIds);
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
index fa4bc36ba..1755695cb 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.product.dal.mysql.spu;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuPageReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
 
-    default PageResult<ProductSpuDO> selectPage(SpuPageReqVO reqVO) {
+    default PageResult<ProductSpuDO> selectPage(ProductSpuPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductSpuDO>()
                 .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
                 .eqIfPresent(ProductSpuDO::getSellPoint, reqVO.getSellPoint())
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
index 7629bd5a3..5316f4764 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java
@@ -1,9 +1,6 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 
 import javax.validation.Valid;
@@ -17,21 +14,6 @@ import java.util.List;
  */
 public interface ProductSkuService {
 
-    /**
-     * 创建商品 SKU
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createSku(@Valid ProductSkuCreateOrUpdateReqVO createReqVO);
-
-    /**
-     * 更新商品sku
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateSku(@Valid ProductSkuUpdateReqVO updateReqVO);
-
     /**
      * 删除商品sku
      *
@@ -55,14 +37,6 @@ public interface ProductSkuService {
      */
     List<ProductSkuDO> getSkuList(Collection<Long> ids);
 
-    /**
-     * 获得商品sku分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 商品sku分页
-     */
-    PageResult<ProductSkuDO> getSkuPage(ProductSkuPageReqVO pageReqVO);
-
     /**
      * 对 sku 的组合的属性等进行合法性校验
      *
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
index c08a8133b..bf8dab778 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
@@ -2,14 +2,11 @@ package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyAndValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
@@ -42,24 +39,6 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     @Resource
     private ProductPropertyService productPropertyService;
 
-    @Override
-    public Long createSku(ProductSkuCreateOrUpdateReqVO createReqVO) {
-        // 插入
-        ProductSkuDO sku = ProductSkuConvert.INSTANCE.convert(createReqVO);
-        productSkuMapper.insert(sku);
-        // 返回
-        return sku.getId();
-    }
-
-    @Override
-    public void updateSku(ProductSkuUpdateReqVO updateReqVO) {
-        // 校验存在
-        this.validateSkuExists(updateReqVO.getId());
-        // 更新
-        ProductSkuDO updateObj = ProductSkuConvert.INSTANCE.convert(updateReqVO);
-        productSkuMapper.updateById(updateObj);
-    }
-
     @Override
     public void deleteSku(Long id) {
         // 校验存在
@@ -84,11 +63,6 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         return productSkuMapper.selectBatchIds(ids);
     }
 
-    @Override
-    public PageResult<ProductSkuDO> getSkuPage(ProductSkuPageReqVO pageReqVO) {
-        return productSkuMapper.selectPage(pageReqVO);
-    }
-
     @Override
     public void validateSkus(List<ProductSkuCreateOrUpdateReqVO> skus, Integer specType) {
         // 非多规格，不需要校验
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
index 8907c6207..e5affa8d2 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
@@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.product.service.spu;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
@@ -48,7 +48,7 @@ public interface ProductSpuService {
      * @param id 编号
      * @return 商品spu
      */
-    SpuRespVO getSpu(Long id);
+    ProductSpuRespVO getSpu(Long id);
 
     /**
      * 获得商品spu列表
@@ -64,7 +64,7 @@ public interface ProductSpuService {
      * @param pageReqVO 分页查询
      * @return 商品spu分页
      */
-    PageResult<SpuRespVO> getSpuPage(SpuPageReqVO pageReqVO);
+    PageResult<ProductSpuRespVO> getSpuPage(ProductSpuPageReqVO pageReqVO);
 
     /**
      * 获得商品spu分页
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
index a72a1fcef..847301ba8 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@@ -9,9 +9,9 @@ import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppSpuPageRespVO;
 import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
@@ -125,9 +125,9 @@ public class ProductSpuServiceImpl implements ProductSpuService {
 
     @Override
     // TODO @芋艿：需要再 review 下
-    public SpuRespVO getSpu(Long id) {
+    public ProductSpuRespVO getSpu(Long id) {
         ProductSpuDO spu = ProductSpuMapper.selectById(id);
-        SpuRespVO spuVO = ProductSpuConvert.INSTANCE.convert(spu);
+        ProductSpuRespVO spuVO = ProductSpuConvert.INSTANCE.convert(spu);
         if (null != spuVO) {
             List<ProductSkuRespVO> skuReqs = ProductSkuConvert.INSTANCE.convertList(productSkuService.getSkusBySpuId(id));
             spuVO.setSkus(skuReqs);
@@ -179,10 +179,10 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     }
 
     @Override
-    public PageResult<SpuRespVO> getSpuPage(SpuPageReqVO pageReqVO) {
-        PageResult<SpuRespVO> spuVOs = ProductSpuConvert.INSTANCE.convertPage(ProductSpuMapper.selectPage(pageReqVO));
+    public PageResult<ProductSpuRespVO> getSpuPage(ProductSpuPageReqVO pageReqVO) {
+        PageResult<ProductSpuRespVO> spuVOs = ProductSpuConvert.INSTANCE.convertPage(ProductSpuMapper.selectPage(pageReqVO));
         // 查询 sku 的信息
-        List<Long> spuIds = spuVOs.getList().stream().map(SpuRespVO::getId).collect(Collectors.toList());
+        List<Long> spuIds = spuVOs.getList().stream().map(ProductSpuRespVO::getId).collect(Collectors.toList());
         List<ProductSkuRespVO> skus = ProductSkuConvert.INSTANCE.convertList(productSkuService.getSkusBySpuIds(spuIds));
         // TODO @franky：使用 CollUtil 里的方法替代哈
         // TODO 芋艿：临时注释
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
index be3362f19..10ab8a3d1 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
@@ -1,24 +1,17 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
 
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
 * {@link ProductSkuServiceImpl} 的单元测试类
@@ -34,46 +27,6 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
     @Resource
     private ProductSkuMapper ProductSkuMapper;
 
-    @Test
-    public void testCreateSku_success() {
-        // 准备参数
-        ProductSkuCreateOrUpdateReqVO reqVO = randomPojo(ProductSkuCreateOrUpdateReqVO.class);
-
-        // 调用
-        Long skuId = ProductSkuService.createSku(reqVO);
-        // 断言
-        assertNotNull(skuId);
-        // 校验记录的属性是否正确
-        ProductSkuDO sku = ProductSkuMapper.selectById(skuId);
-        assertPojoEquals(reqVO, sku);
-    }
-
-    @Test
-    public void testUpdateSku_success() {
-        // mock 数据
-        ProductSkuDO dbSku = randomPojo(ProductSkuDO.class);
-        ProductSkuMapper.insert(dbSku);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        ProductSkuUpdateReqVO reqVO = randomPojo(ProductSkuUpdateReqVO.class, o -> {
-            o.setId(dbSku.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        ProductSkuService.updateSku(reqVO);
-        // 校验是否更新正确
-        ProductSkuDO sku = ProductSkuMapper.selectById(reqVO.getId()); // 获取最新的
-        assertPojoEquals(reqVO, sku);
-    }
-
-    @Test
-    public void testUpdateSku_notExists() {
-        // 准备参数
-        ProductSkuUpdateReqVO reqVO = randomPojo(ProductSkuUpdateReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> ProductSkuService.updateSku(reqVO), SKU_NOT_EXISTS);
-    }
-
     @Test
     public void testDeleteSku_success() {
         // mock 数据
@@ -97,58 +50,4 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
         assertServiceException(() -> ProductSkuService.deleteSku(id), SKU_NOT_EXISTS);
     }
 
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetSkuPage() {
-       // mock 数据
-       ProductSkuDO dbSku = randomPojo(ProductSkuDO.class, o -> { // 等会查询到
-           o.setSpuId(null);
-           o.setProperties(null);
-           o.setPrice(null);
-//           o.setOriginalPrice(null);
-//           o.setCostPrice(null);
-           o.setBarCode(null);
-           o.setPicUrl(null);
-           o.setStatus(null);
-           o.setCreateTime(null);
-       });
-       ProductSkuMapper.insert(dbSku);
-       // 测试 spuId 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSpuId(null)));
-       // 测试 properties 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setProperties(null)));
-       // 测试 price 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPrice(null)));
-       // 测试 originalPrice 不匹配
-//       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setOriginalPrice(null)));
-       // 测试 costPrice 不匹配
-//       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCostPrice(null)));
-       // 测试 barCode 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setBarCode(null)));
-       // 测试 picUrl 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPicUrl(null)));
-       // 测试 status 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setStatus(null)));
-       // 测试 createTime 不匹配
-       ProductSkuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCreateTime(null)));
-       // 准备参数
-        ProductSkuPageReqVO reqVO = new ProductSkuPageReqVO();
-       reqVO.setSpuId(null);
-       reqVO.setProperties(null);
-       reqVO.setPrice(null);
-       reqVO.setOriginalPrice(null);
-       reqVO.setCostPrice(null);
-       reqVO.setBarCode(null);
-       reqVO.setPicUrl(null);
-       reqVO.setStatus(null);
-       reqVO.setCreateTime(null);
-
-       // 调用
-       PageResult<ProductSkuDO> pageResult = ProductSkuService.getSkuPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbSku, pageResult.getList().get(0));
-    }
-
 }
diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
index 57b7fdfeb..bb0fa9d32 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.product.service.spu;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuPageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.spu.vo.SpuRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateReqVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
@@ -139,7 +139,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
        // 测试 createTime 不匹配
        ProductSpuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCreateTime(null)));
        // 准备参数
-       SpuPageReqVO reqVO = new SpuPageReqVO();
+       ProductSpuPageReqVO reqVO = new ProductSpuPageReqVO();
        reqVO.setName(null);
        reqVO.setSellPoint(null);
        reqVO.setDescription(null);
@@ -153,7 +153,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
        reqVO.setCreateTime(null);
 
        // 调用
-       PageResult<SpuRespVO> pageResult = spuService.getSpuPage(reqVO);
+       PageResult<ProductSpuRespVO> pageResult = spuService.getSpuPage(reqVO);
        // 断言
        assertEquals(1, pageResult.getTotal());
        assertEquals(1, pageResult.getList().size());

From 38e88b02f52e8b4fa143a74f64d7c6408c89d387 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 10 Sep 2022 21:37:16 +0800
Subject: [PATCH 55/56] =?UTF-8?q?=F0=9F=90=9B=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=EF=BC=8C=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=9A=90=E5=BC=8F=E5=86=85=E8=BF=9E=E6=8E=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/DataPermissionDatabaseInterceptor.java | 291 +++++++++++++-----
 ...ataPermissionDatabaseInterceptorTest2.java | 245 ++++++++++++---
 .../mybatis/core/util/MyBatisUtils.java       |   6 +-
 3 files changed, 420 insertions(+), 122 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java
index a9a4d24d4..5fc4e55d0 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java
@@ -18,7 +18,6 @@ import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
 import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
-import net.sf.jsqlparser.expression.operators.relational.ItemsList;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.select.*;
@@ -37,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 数据权限拦截器，通过 {@link DataPermissionRule} 数据权限规则，重写 SQL 的方式来实现
- * 主要的 SQL 重写方法，可见 {@link #builderExpression(Expression, Table)} 方法
+ * 主要的 SQL 重写方法，可见 {@link #builderExpression(Expression, List)} 方法
  *
  * 整体的代码实现上，参考 {@link com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor} 实现。
  * 所以每次 MyBatis Plus 升级时，需要 Review 下其具体的实现是否有变更！
@@ -53,8 +52,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
     private final MappedStatementCache mappedStatementCache = new MappedStatementCache();
 
     @Override // SELECT 场景
-    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter,
-                            RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) {
+    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) {
         // 获得 Mapper 对应的数据权限的规则
         List<DataPermissionRule> rules = ruleFactory.getDataPermissionRule(ms.getId());
         if (mappedStatementCache.noRewritable(ms, rules)) { // 如果无需重写，则跳过
@@ -68,12 +66,14 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
             // 处理 SQL
             mpBs.sql(parserSingle(mpBs.sql(), null));
         } finally {
+            // 添加是否需要重写的缓存
             addMappedStatementCache(ms);
+            // 清空上下文
             ContextHolder.clear();
         }
     }
 
-    @Override // 只处理 UPDATE / DELETE 场景，不处理 INSERT 场景
+    @Override // 只处理 UPDATE / DELETE 场景，不处理 INSERT 场景（因为 INSERT 不需要数据权限)
     public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) {
         PluginUtils.MPStatementHandler mpSh = PluginUtils.mpStatementHandler(sh);
         MappedStatement ms = mpSh.mappedStatement();
@@ -92,7 +92,9 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
                 // 处理 SQL
                 mpBs.sql(parserMulti(mpBs.sql(), null));
             } finally {
+                // 添加是否需要重写的缓存
                 addMappedStatementCache(ms);
+                // 清空上下文
                 ContextHolder.clear();
             }
         }
@@ -107,24 +109,6 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
         }
     }
 
-    protected void processSelectBody(SelectBody selectBody) {
-        if (selectBody == null) {
-            return;
-        }
-        if (selectBody instanceof PlainSelect) {
-            processPlainSelect((PlainSelect) selectBody);
-        } else if (selectBody instanceof WithItem) {
-            WithItem withItem = (WithItem) selectBody;
-            processSelectBody(withItem.getSubSelect().getSelectBody());
-        } else {
-            SetOperationList operationList = (SetOperationList) selectBody;
-            List<SelectBody> selectBodys = operationList.getSelects();
-            if (CollectionUtils.isNotEmpty(selectBodys)) {
-                selectBodys.forEach(this::processSelectBody);
-            }
-        }
-    }
-
     /**
      * update 语句处理
      */
@@ -142,28 +126,77 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
         delete.setWhere(this.builderExpression(delete.getWhere(), delete.getTable()));
     }
 
+    // ========== 和 TenantLineInnerInterceptor 一致的逻辑 ==========
+
+    protected void processSelectBody(SelectBody selectBody) {
+        if (selectBody == null) {
+            return;
+        }
+        if (selectBody instanceof PlainSelect) {
+            processPlainSelect((PlainSelect) selectBody);
+        } else if (selectBody instanceof WithItem) {
+            WithItem withItem = (WithItem) selectBody;
+            processSelectBody(withItem.getSubSelect().getSelectBody());
+        } else {
+            SetOperationList operationList = (SetOperationList) selectBody;
+            List<SelectBody> selectBodyList = operationList.getSelects();
+            if (CollectionUtils.isNotEmpty(selectBodyList)) {
+                selectBodyList.forEach(this::processSelectBody);
+            }
+        }
+    }
+
     /**
      * 处理 PlainSelect
      */
     protected void processPlainSelect(PlainSelect plainSelect) {
-        FromItem fromItem = plainSelect.getFromItem();
-        Expression where = plainSelect.getWhere();
-        processWhereSubSelect(where);
-        if (fromItem instanceof Table) {
-            Table fromTable = (Table) fromItem;
-            plainSelect.setWhere(builderExpression(where, fromTable));
-        } else {
-            processFromItem(fromItem);
-        }
         //#3087 github
         List<SelectItem> selectItems = plainSelect.getSelectItems();
         if (CollectionUtils.isNotEmpty(selectItems)) {
             selectItems.forEach(this::processSelectItem);
         }
+
+        // 处理 where 中的子查询
+        Expression where = plainSelect.getWhere();
+        processWhereSubSelect(where);
+
+        // 处理 fromItem
+        FromItem fromItem = plainSelect.getFromItem();
+        List<Table> list = processFromItem(fromItem);
+        List<Table> mainTables = new ArrayList<>(list);
+
+        // 处理 join
         List<Join> joins = plainSelect.getJoins();
         if (CollectionUtils.isNotEmpty(joins)) {
-            processJoins(joins);
+            mainTables = processJoins(mainTables, joins);
         }
+
+        // 当有 mainTable 时，进行 where 条件追加
+        if (CollectionUtils.isNotEmpty(mainTables)) {
+            plainSelect.setWhere(builderExpression(where, mainTables));
+        }
+    }
+
+    private List<Table> processFromItem(FromItem fromItem) {
+        // 处理括号括起来的表达式
+        while (fromItem instanceof ParenthesisFromItem) {
+            fromItem = ((ParenthesisFromItem) fromItem).getFromItem();
+        }
+
+        List<Table> mainTables = new ArrayList<>();
+        // 无 join 时的处理逻辑
+        if (fromItem instanceof Table) {
+            Table fromTable = (Table) fromItem;
+            mainTables.add(fromTable);
+        } else if (fromItem instanceof SubJoin) {
+            // SubJoin 类型则还需要添加上 where 条件
+            List<Table> tables = processSubJoin((SubJoin) fromItem);
+            mainTables.addAll(tables);
+        } else {
+            // 处理下 fromItem
+            processOtherFromItem(fromItem);
+        }
+        return mainTables;
     }
 
     /**
@@ -191,7 +224,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
             return;
         }
         if (where instanceof FromItem) {
-            processFromItem((FromItem) where);
+            processOtherFromItem((FromItem) where);
             return;
         }
         if (where.toString().indexOf("SELECT") > 0) {
@@ -204,9 +237,9 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
             } else if (where instanceof InExpression) {
                 // in
                 InExpression expression = (InExpression) where;
-                ItemsList itemsList = expression.getRightItemsList();
-                if (itemsList instanceof SubSelect) {
-                    processSelectBody(((SubSelect) itemsList).getSelectBody());
+                Expression inExpression = expression.getRightExpression();
+                if (inExpression instanceof SubSelect) {
+                    processSelectBody(((SubSelect) inExpression).getSelectBody());
                 }
             } else if (where instanceof ExistsExpression) {
                 // exists
@@ -239,7 +272,7 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
      * <p>支持: 1. select fun(args..) 2. select fun1(fun2(args..),args..)<p>
      * <p> fixed gitee pulls/141</p>
      *
-     * @param function 函数
+     * @param function
      */
     protected void processFunction(Function function) {
         ExpressionList parameters = function.getParameters();
@@ -257,22 +290,19 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
     /**
      * 处理子查询等
      */
-    protected void processFromItem(FromItem fromItem) {
-        if (fromItem instanceof SubJoin) {
-            SubJoin subJoin = (SubJoin) fromItem;
-            if (subJoin.getJoinList() != null) {
-                processJoins(subJoin.getJoinList());
-            }
-            if (subJoin.getLeft() != null) {
-                processFromItem(subJoin.getLeft());
-            }
-        } else if (fromItem instanceof SubSelect) {
+    protected void processOtherFromItem(FromItem fromItem) {
+        // 去除括号
+        while (fromItem instanceof ParenthesisFromItem) {
+            fromItem = ((ParenthesisFromItem) fromItem).getFromItem();
+        }
+
+        if (fromItem instanceof SubSelect) {
             SubSelect subSelect = (SubSelect) fromItem;
             if (subSelect.getSelectBody() != null) {
                 processSelectBody(subSelect.getSelectBody());
             }
         } else if (fromItem instanceof ValuesList) {
-            logger.debug("Perform a subquery, if you do not give us feedback");
+            logger.debug("Perform a subQuery, if you do not give us feedback");
         } else if (fromItem instanceof LateralSubSelect) {
             LateralSubSelect lateralSubSelect = (LateralSubSelect) fromItem;
             if (lateralSubSelect.getSubSelect() != null) {
@@ -284,75 +314,176 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
         }
     }
 
+    /**
+     * 处理 sub join
+     *
+     * @param subJoin subJoin
+     * @return Table subJoin 中的主表
+     */
+    private List<Table> processSubJoin(SubJoin subJoin) {
+        List<Table> mainTables = new ArrayList<>();
+        if (subJoin.getJoinList() != null) {
+            List<Table> list = processFromItem(subJoin.getLeft());
+            mainTables.addAll(list);
+            mainTables = processJoins(mainTables, subJoin.getJoinList());
+        }
+        return mainTables;
+    }
+
     /**
      * 处理 joins
      *
-     * @param joins join 集合
+     * @param mainTables 可以为 null
+     * @param joins      join 集合
+     * @return List<Table> 右连接查询的 Table 列表
      */
-    private void processJoins(List<Join> joins) {
+    private List<Table> processJoins(List<Table> mainTables, List<Join> joins) {
+        // join 表达式中最终的主表
+        Table mainTable = null;
+        // 当前 join 的左表
+        Table leftTable = null;
+
+        if (mainTables == null) {
+            mainTables = new ArrayList<>();
+        } else if (mainTables.size() == 1) {
+            mainTable = mainTables.get(0);
+            leftTable = mainTable;
+        }
+
         //对于 on 表达式写在最后的 join，需要记录下前面多个 on 的表名
-        Deque<Table> tables = new LinkedList<>();
+        Deque<List<Table>> onTableDeque = new LinkedList<>();
         for (Join join : joins) {
             // 处理 on 表达式
-            FromItem fromItem = join.getRightItem();
-            if (fromItem instanceof Table) {
-                Table fromTable = (Table) fromItem;
+            FromItem joinItem = join.getRightItem();
+
+            // 获取当前 join 的表，subJoint 可以看作是一张表
+            List<Table> joinTables = null;
+            if (joinItem instanceof Table) {
+                joinTables = new ArrayList<>();
+                joinTables.add((Table) joinItem);
+            } else if (joinItem instanceof SubJoin) {
+                joinTables = processSubJoin((SubJoin) joinItem);
+            }
+
+            if (joinTables != null) {
+
+                // 如果是隐式内连接
+                if (join.isSimple()) {
+                    mainTables.addAll(joinTables);
+                    continue;
+                }
+
+                // 当前表是否忽略
+                Table joinTable = joinTables.get(0);
+
+                List<Table> onTables = null;
+                // 如果不要忽略，且是右连接，则记录下当前表
+                if (join.isRight()) {
+                    mainTable = joinTable;
+                    if (leftTable != null) {
+                        onTables = Collections.singletonList(leftTable);
+                    }
+                } else if (join.isLeft()) {
+                    onTables = Collections.singletonList(joinTable);
+                } else if (join.isInner()) {
+                    if (mainTable == null) {
+                        onTables = Collections.singletonList(joinTable);
+                    } else {
+                        onTables = Arrays.asList(mainTable, joinTable);
+                    }
+                    mainTable = null;
+                }
+
+                mainTables = new ArrayList<>();
+                if (mainTable != null) {
+                    mainTables.add(mainTable);
+                }
+
                 // 获取 join 尾缀的 on 表达式列表
                 Collection<Expression> originOnExpressions = join.getOnExpressions();
                 // 正常 join on 表达式只有一个，立刻处理
-                if (originOnExpressions.size() == 1) {
-                    processJoin(join);
+                if (originOnExpressions.size() == 1 && onTables != null) {
+                    List<Expression> onExpressions = new LinkedList<>();
+                    onExpressions.add(builderExpression(originOnExpressions.iterator().next(), onTables));
+                    join.setOnExpressions(onExpressions);
+                    leftTable = joinTable;
                     continue;
                 }
-                tables.push(fromTable);
+                // 表名压栈，忽略的表压入 null，以便后续不处理
+                onTableDeque.push(onTables);
                 // 尾缀多个 on 表达式的时候统一处理
                 if (originOnExpressions.size() > 1) {
                     Collection<Expression> onExpressions = new LinkedList<>();
                     for (Expression originOnExpression : originOnExpressions) {
-                        Table currentTable = tables.poll();
-                        onExpressions.add(builderExpression(originOnExpression, currentTable));
+                        List<Table> currentTableList = onTableDeque.poll();
+                        if (CollectionUtils.isEmpty(currentTableList)) {
+                            onExpressions.add(originOnExpression);
+                        } else {
+                            onExpressions.add(builderExpression(originOnExpression, currentTableList));
+                        }
                     }
                     join.setOnExpressions(onExpressions);
                 }
+                leftTable = joinTable;
             } else {
-                // 处理右边连接的子表达式
-                processFromItem(fromItem);
+                processOtherFromItem(joinItem);
+                leftTable = null;
             }
         }
+
+        return mainTables;
     }
 
+    // ========== 和 TenantLineInnerInterceptor 存在差异的逻辑：关键，实现权限条件的拼接 ==========
+
     /**
-     * 处理联接语句
+     * 处理条件
+     *
+     * @param currentExpression 当前 where 条件
+     * @param table             单个表
      */
-    protected void processJoin(Join join) {
-        if (join.getRightItem() instanceof Table) {
-            Table fromTable = (Table) join.getRightItem();
-            Expression originOnExpression = CollUtil.getFirst(join.getOnExpressions());
-            originOnExpression = builderExpression(originOnExpression, fromTable);
-            join.setOnExpressions(CollUtil.newArrayList(originOnExpression));
-        }
+    protected Expression builderExpression(Expression currentExpression, Table table) {
+        return this.builderExpression(currentExpression, Collections.singletonList(table));
     }
 
     /**
      * 处理条件
+     *
+     * @param currentExpression 当前 where 条件
+     * @param tables 多个表
      */
-    protected Expression builderExpression(Expression currentExpression, Table table) {
-        // 获得 Table 对应的数据权限条件
-        Expression equalsTo = buildDataPermissionExpression(table);
-        if (equalsTo == null) { // 如果没条件，则返回 currentExpression 默认
+    protected Expression builderExpression(Expression currentExpression, List<Table> tables) {
+        // 没有表需要处理直接返回
+        if (CollectionUtils.isEmpty(tables)) {
             return currentExpression;
         }
 
-        // 表达式为空，则直接返回 equalsTo
+        // 第一步，获得 Table 对应的数据权限条件
+        Expression dataPermissionExpression = null;
+        for (Table table : tables) {
+            // 构建每个表的权限 Expression 条件
+            Expression expression = buildDataPermissionExpression(table);
+            if (expression == null) {
+                continue;
+            }
+            // 合并到 dataPermissionExpression 中
+            dataPermissionExpression = dataPermissionExpression == null ? expression
+                    : new AndExpression(dataPermissionExpression, expression);
+        }
+
+        // 第二步，合并多个 Expression 条件
+        if (dataPermissionExpression == null) {
+            return currentExpression;
+        }
         if (currentExpression == null) {
-            return equalsTo;
+            return dataPermissionExpression;
         }
-        // 如果表达式为 Or，则需要 (currentExpression) AND equalsTo
+        // ① 如果表达式为 Or，则需要 (currentExpression) AND dataPermissionExpression
         if (currentExpression instanceof OrExpression) {
-            return new AndExpression(new Parenthesis(currentExpression), equalsTo);
+            return new AndExpression(new Parenthesis(currentExpression), dataPermissionExpression);
         }
-        // 如果表达式为 And，则直接返回 currentExpression AND equalsTo
-        return new AndExpression(currentExpression, equalsTo);
+        // ② 如果表达式为 And，则直接返回 where AND dataPermissionExpression
+        return new AndExpression(currentExpression, dataPermissionExpression);
     }
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java
index 8c0772f1a..b8cad13cf 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java
@@ -46,7 +46,7 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
 
             @Override
             public Set<String> getTableNames() {
-                return asSet("entity", "entity1", "entity2", "t1", "t2", // 支持 MyBatis Plus 的单元测试
+                return asSet("entity", "entity1", "entity2", "entity3", "t1", "t2", "sys_dict_item", // 支持 MyBatis Plus 的单元测试
                         "t_user", "t_role"); // 满足自己的单元测试
             }
 
@@ -84,30 +84,30 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
     @Test
     void delete() {
         assertSql("delete from entity where id = ?",
-                "DELETE FROM entity WHERE id = ? AND tenant_id = 1");
+                "DELETE FROM entity WHERE id = ? AND entity.tenant_id = 1");
     }
 
     @Test
     void update() {
         assertSql("update entity set name = ? where id = ?",
-                "UPDATE entity SET name = ? WHERE id = ? AND tenant_id = 1");
+                "UPDATE entity SET name = ? WHERE id = ? AND entity.tenant_id = 1");
     }
 
     @Test
     void selectSingle() {
         // 单表
         assertSql("select * from entity where id = ?",
-                "SELECT * FROM entity WHERE id = ? AND tenant_id = 1");
+                "SELECT * FROM entity WHERE id = ? AND entity.tenant_id = 1");
 
         assertSql("select * from entity where id = ? or name = ?",
-                "SELECT * FROM entity WHERE (id = ? OR name = ?) AND tenant_id = 1");
+                "SELECT * FROM entity WHERE (id = ? OR name = ?) AND entity.tenant_id = 1");
 
         assertSql("SELECT * FROM entity WHERE (id = ? OR name = ?)",
-                "SELECT * FROM entity WHERE (id = ? OR name = ?) AND tenant_id = 1");
+                "SELECT * FROM entity WHERE (id = ? OR name = ?) AND entity.tenant_id = 1");
 
         /* not */
         assertSql("SELECT * FROM entity WHERE not (id = ? OR name = ?)",
-                "SELECT * FROM entity WHERE NOT (id = ? OR name = ?) AND tenant_id = 1");
+                "SELECT * FROM entity WHERE NOT (id = ? OR name = ?) AND entity.tenant_id = 1");
     }
 
     @Test
@@ -167,10 +167,12 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
         assertSql("SELECT * FROM entity e WHERE e.id >= (select e1.id from entity1 e1 where e1.id = ?)",
                 "SELECT * FROM entity e WHERE e.id >= (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
 
+
         /* <= */
         assertSql("SELECT * FROM entity e WHERE e.id <= (select e1.id from entity1 e1 where e1.id = ?)",
                 "SELECT * FROM entity e WHERE e.id <= (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
 
+
         /* <> */
         assertSql("SELECT * FROM entity e WHERE e.id <> (select e1.id from entity1 e1 where e1.id = ?)",
                 "SELECT * FROM entity e WHERE e.id <> (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
@@ -204,6 +206,14 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
                 "SELECT * FROM entity e " +
                         "LEFT JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
                         "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1");
+
+        assertSql("SELECT * FROM entity e " +
+                        "left join entity1 e1 on e1.id = e.id " +
+                        "left join entity2 e2 on e1.id = e2.id",
+                "SELECT * FROM entity e " +
+                        "LEFT JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
+                        "LEFT JOIN entity2 e2 ON e1.id = e2.id AND e2.tenant_id = 1 " +
+                        "WHERE e.tenant_id = 1");
     }
 
     @Test
@@ -212,17 +222,125 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
         assertSql("SELECT * FROM entity e " +
                         "right join entity1 e1 on e1.id = e.id",
                 "SELECT * FROM entity e " +
-                        "RIGHT JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE e.tenant_id = 1");
+                        "RIGHT JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 " +
+                        "WHERE e1.tenant_id = 1");
+
+        assertSql("SELECT * FROM with_as_1 e " +
+                        "right join entity1 e1 on e1.id = e.id",
+                "SELECT * FROM with_as_1 e " +
+                        "RIGHT JOIN entity1 e1 ON e1.id = e.id " +
+                        "WHERE e1.tenant_id = 1");
 
         assertSql("SELECT * FROM entity e " +
                         "right join entity1 e1 on e1.id = e.id " +
                         "WHERE e.id = ? OR e.name = ?",
                 "SELECT * FROM entity e " +
-                        "RIGHT JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1");
+                        "RIGHT JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 " +
+                        "WHERE (e.id = ? OR e.name = ?) AND e1.tenant_id = 1");
+
+        assertSql("SELECT * FROM entity e " +
+                        "right join entity1 e1 on e1.id = e.id " +
+                        "right join entity2 e2 on e1.id = e2.id ",
+                "SELECT * FROM entity e " +
+                        "RIGHT JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 " +
+                        "RIGHT JOIN entity2 e2 ON e1.id = e2.id AND e1.tenant_id = 1 " +
+                        "WHERE e2.tenant_id = 1");
     }
 
+    @Test
+    void selectMixJoin() {
+        assertSql("SELECT * FROM entity e " +
+                        "right join entity1 e1 on e1.id = e.id " +
+                        "left join entity2 e2 on e1.id = e2.id",
+                "SELECT * FROM entity e " +
+                        "RIGHT JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 " +
+                        "LEFT JOIN entity2 e2 ON e1.id = e2.id AND e2.tenant_id = 1 " +
+                        "WHERE e1.tenant_id = 1");
+
+        assertSql("SELECT * FROM entity e " +
+                        "left join entity1 e1 on e1.id = e.id " +
+                        "right join entity2 e2 on e1.id = e2.id",
+                "SELECT * FROM entity e " +
+                        "LEFT JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
+                        "RIGHT JOIN entity2 e2 ON e1.id = e2.id AND e1.tenant_id = 1 " +
+                        "WHERE e2.tenant_id = 1");
+
+        assertSql("SELECT * FROM entity e " +
+                        "left join entity1 e1 on e1.id = e.id " +
+                        "inner join entity2 e2 on e1.id = e2.id",
+                "SELECT * FROM entity e " +
+                        "LEFT JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
+                        "INNER JOIN entity2 e2 ON e1.id = e2.id AND e.tenant_id = 1 AND e2.tenant_id = 1");
+    }
+
+
+    @Test
+    void selectJoinSubSelect() {
+        assertSql("select * from (select * from entity) e1 " +
+                        "left join entity2 e2 on e1.id = e2.id",
+                "SELECT * FROM (SELECT * FROM entity WHERE entity.tenant_id = 1) e1 " +
+                        "LEFT JOIN entity2 e2 ON e1.id = e2.id AND e2.tenant_id = 1");
+
+        assertSql("select * from entity1 e1 " +
+                        "left join (select * from entity2) e2 " +
+                        "on e1.id = e2.id",
+                "SELECT * FROM entity1 e1 " +
+                        "LEFT JOIN (SELECT * FROM entity2 WHERE entity2.tenant_id = 1) e2 " +
+                        "ON e1.id = e2.id " +
+                        "WHERE e1.tenant_id = 1");
+    }
+
+    @Test
+    void selectSubJoin() {
+
+        assertSql("select * FROM " +
+                        "(entity1 e1 right JOIN entity2 e2 ON e1.id = e2.id)",
+                "SELECT * FROM " +
+                        "(entity1 e1 RIGHT JOIN entity2 e2 ON e1.id = e2.id AND e1.tenant_id = 1) " +
+                        "WHERE e2.tenant_id = 1");
+
+        assertSql("select * FROM " +
+                        "(entity1 e1 LEFT JOIN entity2 e2 ON e1.id = e2.id)",
+                "SELECT * FROM " +
+                        "(entity1 e1 LEFT JOIN entity2 e2 ON e1.id = e2.id AND e2.tenant_id = 1) " +
+                        "WHERE e1.tenant_id = 1");
+
+
+        assertSql("select * FROM " +
+                        "(entity1 e1 LEFT JOIN entity2 e2 ON e1.id = e2.id) " +
+                        "right join entity3 e3 on e1.id = e3.id",
+                "SELECT * FROM " +
+                        "(entity1 e1 LEFT JOIN entity2 e2 ON e1.id = e2.id AND e2.tenant_id = 1) " +
+                        "RIGHT JOIN entity3 e3 ON e1.id = e3.id AND e1.tenant_id = 1 " +
+                        "WHERE e3.tenant_id = 1");
+
+
+        assertSql("select * FROM entity e " +
+                        "LEFT JOIN (entity1 e1 right join entity2 e2 ON e1.id = e2.id) " +
+                        "on e.id = e2.id",
+                "SELECT * FROM entity e " +
+                        "LEFT JOIN (entity1 e1 RIGHT JOIN entity2 e2 ON e1.id = e2.id AND e1.tenant_id = 1) " +
+                        "ON e.id = e2.id AND e2.tenant_id = 1 " +
+                        "WHERE e.tenant_id = 1");
+
+        assertSql("select * FROM entity e " +
+                        "LEFT JOIN (entity1 e1 left join entity2 e2 ON e1.id = e2.id) " +
+                        "on e.id = e2.id",
+                "SELECT * FROM entity e " +
+                        "LEFT JOIN (entity1 e1 LEFT JOIN entity2 e2 ON e1.id = e2.id AND e2.tenant_id = 1) " +
+                        "ON e.id = e2.id AND e1.tenant_id = 1 " +
+                        "WHERE e.tenant_id = 1");
+
+        assertSql("select * FROM entity e " +
+                        "RIGHT JOIN (entity1 e1 left join entity2 e2 ON e1.id = e2.id) " +
+                        "on e.id = e2.id",
+                "SELECT * FROM entity e " +
+                        "RIGHT JOIN (entity1 e1 LEFT JOIN entity2 e2 ON e1.id = e2.id AND e2.tenant_id = 1) " +
+                        "ON e.id = e2.id AND e.tenant_id = 1 " +
+                        "WHERE e1.tenant_id = 1");
+    }
+
+
     @Test
     void selectLeftJoinMultipleTrailingOn() {
         // 多个 on 尾缀的
@@ -256,51 +374,97 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
                         "inner join entity1 e1 on e1.id = e.id " +
                         "WHERE e.id = ? OR e.name = ?",
                 "SELECT * FROM entity e " +
-                        "INNER JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1");
+                        "INNER JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 AND e1.tenant_id = 1 " +
+                        "WHERE e.id = ? OR e.name = ?");
 
         assertSql("SELECT * FROM entity e " +
                         "inner join entity1 e1 on e1.id = e.id " +
                         "WHERE (e.id = ? OR e.name = ?)",
                 "SELECT * FROM entity e " +
-                        "INNER JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1");
+                        "INNER JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 AND e1.tenant_id = 1 " +
+                        "WHERE (e.id = ? OR e.name = ?)");
+
+        // 隐式内连接
+        assertSql("SELECT * FROM entity,entity1 " +
+                        "WHERE entity.id = entity1.id",
+                "SELECT * FROM entity, entity1 " +
+                        "WHERE entity.id = entity1.id AND entity.tenant_id = 1 AND entity1.tenant_id = 1");
+
+        // 隐式内连接
+        assertSql("SELECT * FROM entity a, with_as_entity1 b " +
+                        "WHERE a.id = b.id",
+                "SELECT * FROM entity a, with_as_entity1 b " +
+                        "WHERE a.id = b.id AND a.tenant_id = 1");
+
+        assertSql("SELECT * FROM with_as_entity a, with_as_entity1 b " +
+                        "WHERE a.id = b.id",
+                "SELECT * FROM with_as_entity a, with_as_entity1 b " +
+                        "WHERE a.id = b.id");
+
+        // SubJoin with 隐式内连接
+        assertSql("SELECT * FROM (entity,entity1) " +
+                        "WHERE entity.id = entity1.id",
+                "SELECT * FROM (entity, entity1) " +
+                        "WHERE entity.id = entity1.id " +
+                        "AND entity.tenant_id = 1 AND entity1.tenant_id = 1");
+
+        assertSql("SELECT * FROM ((entity,entity1),entity2) " +
+                        "WHERE entity.id = entity1.id and entity.id = entity2.id",
+                "SELECT * FROM ((entity, entity1), entity2) " +
+                        "WHERE entity.id = entity1.id AND entity.id = entity2.id " +
+                        "AND entity.tenant_id = 1 AND entity1.tenant_id = 1 AND entity2.tenant_id = 1");
+
+        assertSql("SELECT * FROM (entity,(entity1,entity2)) " +
+                        "WHERE entity.id = entity1.id and entity.id = entity2.id",
+                "SELECT * FROM (entity, (entity1, entity2)) " +
+                        "WHERE entity.id = entity1.id AND entity.id = entity2.id " +
+                        "AND entity.tenant_id = 1 AND entity1.tenant_id = 1 AND entity2.tenant_id = 1");
+
+        // 沙雕的括号写法
+        assertSql("SELECT * FROM (((entity,entity1))) " +
+                        "WHERE entity.id = entity1.id",
+                "SELECT * FROM (((entity, entity1))) " +
+                        "WHERE entity.id = entity1.id " +
+                        "AND entity.tenant_id = 1 AND entity1.tenant_id = 1");
 
-        // 垃圾 inner join todo
-//        assertSql("SELECT * FROM entity,entity1 " +
-//                "WHERE entity.id = entity1.id",
-//            "SELECT * FROM entity e " +
-//                "INNER JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-//                "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1");
     }
 
+
     @Test
     void selectWithAs() {
         assertSql("with with_as_A as (select * from entity) select * from with_as_A",
-                "WITH with_as_A AS (SELECT * FROM entity WHERE tenant_id = 1) SELECT * FROM with_as_A");
+                "WITH with_as_A AS (SELECT * FROM entity WHERE entity.tenant_id = 1) SELECT * FROM with_as_A");
+    }
+
+
+    @Test
+    void selectIgnoreTable() {
+        assertSql(" SELECT dict.dict_code, item.item_text AS \"text\", item.item_value AS \"value\" FROM sys_dict_item item INNER JOIN sys_dict dict ON dict.id = item.dict_id WHERE dict.dict_code IN (1, 2, 3) AND item.item_value IN (1, 2, 3)",
+                "SELECT dict.dict_code, item.item_text AS \"text\", item.item_value AS \"value\" FROM sys_dict_item item INNER JOIN sys_dict dict ON dict.id = item.dict_id AND item.tenant_id = 1 WHERE dict.dict_code IN (1, 2, 3) AND item.item_value IN (1, 2, 3)");
     }
 
     private void assertSql(String sql, String targetSql) {
         assertEquals(targetSql, interceptor.parserSingle(sql, null));
     }
 
+
     // ========== 额外的测试 ==========
 
     @Test
     public void testSelectSingle() {
         // 单表
         assertSql("select * from t_user where id = ?",
-                "SELECT * FROM t_user WHERE id = ? AND tenant_id = 1 AND dept_id IN (10, 20)");
+                "SELECT * FROM t_user WHERE id = ? AND t_user.tenant_id = 1 AND t_user.dept_id IN (10, 20)");
 
         assertSql("select * from t_user where id = ? or name = ?",
-                "SELECT * FROM t_user WHERE (id = ? OR name = ?) AND tenant_id = 1 AND dept_id IN (10, 20)");
+                "SELECT * FROM t_user WHERE (id = ? OR name = ?) AND t_user.tenant_id = 1 AND t_user.dept_id IN (10, 20)");
 
         assertSql("SELECT * FROM t_user WHERE (id = ? OR name = ?)",
-                "SELECT * FROM t_user WHERE (id = ? OR name = ?) AND tenant_id = 1 AND dept_id IN (10, 20)");
+                "SELECT * FROM t_user WHERE (id = ? OR name = ?) AND t_user.tenant_id = 1 AND t_user.dept_id IN (10, 20)");
 
         /* not */
         assertSql("SELECT * FROM t_user WHERE not (id = ? OR name = ?)",
-                "SELECT * FROM t_user WHERE NOT (id = ? OR name = ?) AND tenant_id = 1 AND dept_id IN (10, 20)");
+                "SELECT * FROM t_user WHERE NOT (id = ? OR name = ?) AND t_user.tenant_id = 1 AND t_user.dept_id IN (10, 20)");
     }
 
     @Test
@@ -329,16 +493,16 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
                         "right join t_role e1 on e1.id = e.id " +
                         "WHERE e.id = ? OR e.name = ?",
                 "SELECT * FROM t_user e " +
-                        "RIGHT JOIN t_role e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1 AND e.dept_id IN (10, 20)");
+                        "RIGHT JOIN t_role e1 ON e1.id = e.id AND e.tenant_id = 1 AND e.dept_id IN (10, 20) " +
+                        "WHERE (e.id = ? OR e.name = ?) AND e1.tenant_id = 1");
 
         // 条件 e.id = ? OR e.name = ? 带括号
         assertSql("SELECT * FROM t_user e " +
                         "right join t_role e1 on e1.id = e.id " +
                         "WHERE (e.id = ? OR e.name = ?)",
                 "SELECT * FROM t_user e " +
-                        "RIGHT JOIN t_role e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1 AND e.dept_id IN (10, 20)");
+                        "RIGHT JOIN t_role e1 ON e1.id = e.id AND e.tenant_id = 1 AND e.dept_id IN (10, 20) " +
+                        "WHERE (e.id = ? OR e.name = ?) AND e1.tenant_id = 1");
     }
 
     @Test
@@ -348,23 +512,22 @@ public class DataPermissionDatabaseInterceptorTest2 extends BaseMockitoUnitTest
                         "inner join entity1 e1 on e1.id = e.id " +
                         "WHERE e.id = ? OR e.name = ?",
                 "SELECT * FROM t_user e " +
-                        "INNER JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1 AND e.dept_id IN (10, 20)");
+                        "INNER JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 AND e.dept_id IN (10, 20) AND e1.tenant_id = 1 " +
+                        "WHERE e.id = ? OR e.name = ?");
 
         // 条件 e.id = ? OR e.name = ? 带括号
         assertSql("SELECT * FROM t_user e " +
-                        "inner join t_role e1 on e1.id = e.id " +
+                        "inner join entity1 e1 on e1.id = e.id " +
                         "WHERE (e.id = ? OR e.name = ?)",
                 "SELECT * FROM t_user e " +
-                        "INNER JOIN t_role e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-                        "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1 AND e.dept_id IN (10, 20)");
+                        "INNER JOIN entity1 e1 ON e1.id = e.id AND e.tenant_id = 1 AND e.dept_id IN (10, 20) AND e1.tenant_id = 1 " +
+                        "WHERE (e.id = ? OR e.name = ?)");
 
-        // 垃圾 inner join todo
-//        assertSql("SELECT * FROM entity,entity1 " +
-//                "WHERE entity.id = entity1.id",
-//            "SELECT * FROM entity e " +
-//                "INNER JOIN entity1 e1 ON e1.id = e.id AND e1.tenant_id = 1 " +
-//                "WHERE (e.id = ? OR e.name = ?) AND e.tenant_id = 1");
+        // 没有 On 的 inner join
+        assertSql("SELECT * FROM entity,entity1 " +
+                "WHERE entity.id = entity1.id",
+            "SELECT * FROM entity, entity1 " +
+                    "WHERE entity.id = entity1.id AND entity.tenant_id = 1 AND entity1.tenant_id = 1");
     }
 
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java
index 16d3b29b1..0b1b01b08 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.SortingField;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -78,7 +79,10 @@ public class MyBatisUtils {
      * @return Column 对象
      */
     public static Column buildColumn(String tableName, Alias tableAlias, String column) {
-        return new Column(tableAlias != null ? tableAlias.getName() + "." + column : column);
+        if (tableAlias != null) {
+            tableName = tableAlias.getName();
+        }
+        return new Column(tableName + StringPool.DOT + column);
     }
 
 }

From 67d365475c2b8576cbef49cfdc9a09537e3b3f0c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 10 Sep 2022 21:41:21 +0800
Subject: [PATCH 56/56] =?UTF-8?q?=F0=9F=90=9B=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=A2=E5=8D=95=E7=9A=84=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=B0=20API=20Bean=20=E6=9C=AA=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/price/PriceApiImpl.java    | 24 +++++++++++++++++
 .../module/product/api/package-info.java      |  1 +
 .../product/api/sku/ProductSkuApiImpl.java    | 26 +++++++++++++++++++
 .../product/api/spu/ProductSpuApiImpl.java    | 20 ++++++++++++++
 .../order/vo/AppTradeOrderCreateReqVO.java    |  2 +-
 .../convert/order/TradeOrderConvert.java      |  3 ++-
 .../convert/order/TradeOrderItemConvert.java  |  5 +++-
 .../dal/mysql/order/TradeOrderMapper.java     |  2 ++
 .../mysql/orderitem/TradeOrderItemMapper.java |  2 ++
 .../yudao/module/pay/api/PayOrderApiImpl.java | 18 +++++++++++++
 10 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/price/PriceApiImpl.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
 create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
 create mode 100644 yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/PayOrderApiImpl.java

diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/price/PriceApiImpl.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/price/PriceApiImpl.java
new file mode 100644
index 000000000..6b8663d1e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/service/price/PriceApiImpl.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.market.service.price;
+
+import cn.iocoder.yudao.module.market.api.price.PriceApi;
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateReqDTO;
+import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateRespDTO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 价格 API 实现类
+ *
+ * TODO 完善注释
+ *
+ * @author TODO
+ */
+@Service
+public class PriceApiImpl implements PriceApi {
+
+    @Override
+    public PriceCalculateRespDTO calculatePrice(PriceCalculateReqDTO calculateReqDTO) {
+        // TODO fixme：实现逻辑
+        return new PriceCalculateRespDTO();
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java
new file mode 100644
index 000000000..162453c3c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java
@@ -0,0 +1 @@
+package cn.iocoder.yudao.module.product.api;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
new file mode 100644
index 000000000..22636826b
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.product.api.sku;
+
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuDecrementStockBatchReqDTO;
+import cn.iocoder.yudao.module.product.api.sku.dto.SkuInfoRespDTO;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * todo 注释
+ */
+@Service
+public class ProductSkuApiImpl implements ProductSkuApi {
+
+    @Override
+    public List<SkuInfoRespDTO> getSkusByIds(Collection<Long> skuIds) {
+        return null;
+    }
+
+    @Override
+    public void decrementStockBatch(SkuDecrementStockBatchReqDTO batchReqDTO) {
+
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
new file mode 100644
index 000000000..8f651f395
--- /dev/null
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.product.api.spu;
+
+import cn.iocoder.yudao.module.product.api.spu.dto.SpuInfoRespDTO;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * todo 注释
+ */
+@Service
+public class ProductSpuApiImpl implements ProductSpuApi {
+
+    @Override
+    public List<SpuInfoRespDTO> getSpusByIds(Collection<Long> spuIds) {
+        return null;
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
index d454fd63c..54e856a6b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
@@ -17,7 +17,7 @@ public class AppTradeOrderCreateReqVO {
     private Integer addressId;
 
     @ApiModelProperty(name = "优惠劵编号", example = "1024")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty(name = "备注", example = "1024")
     private String remark;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
index dd3cca38e..1b81212b8 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.market.api.price.dto.PriceCalculateRespDTO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
 /**
@@ -15,6 +16,6 @@ public interface TradeOrderConvert {
 
     TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
 
-
+    @Mapping(source = "order.couponId", target = "couponId")
     TradeOrderDO convert(AppTradeOrderCreateReqVO createReqVO, PriceCalculateRespDTO.Order order);
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
index f9c44b4a6..23113f9f3 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
@@ -29,5 +29,8 @@ public interface TradeOrderItemConvert {
             @Mapping(source = "tradeOrder.userId", target = "userId"),
             @Mapping(source = "tradeOrder.orderId", target = "orderId")
     })
-    List<TradeOrderItemDO> convertList(TradeOrderDO tradeOrder, List<PriceCalculateRespDTO.Item> items);
+    default List<TradeOrderItemDO> convertList(TradeOrderDO tradeOrder, List<PriceCalculateRespDTO.Item> items) {
+        // TODO @Com: Mapstruct 生成会报错
+        throw new UnsupportedOperationException("无法实现");
+    }
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
index ed74f9b6c..3b963540b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
@@ -2,10 +2,12 @@ package cn.iocoder.yudao.module.trade.dal.mysql.order;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author LeeYan9
  * @since 2022-08-26
  */
+@Mapper
 public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java
index 4e33cddd1..987d5a3f5 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/orderitem/TradeOrderItemMapper.java
@@ -2,10 +2,12 @@ package cn.iocoder.yudao.module.trade.dal.mysql.orderitem;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author LeeYan9
  * @since 2022-08-26
  */
+@Mapper
 public interface TradeOrderItemMapper extends BaseMapperX<TradeOrderItemDO> {
 }
diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/PayOrderApiImpl.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/PayOrderApiImpl.java
new file mode 100644
index 000000000..ff902be92
--- /dev/null
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/PayOrderApiImpl.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.pay.api;
+
+import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
+import cn.iocoder.yudao.module.pay.api.order.PayOrderDataCreateReqDTO;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO 注释
+ */
+@Service
+public class PayOrderApiImpl implements PayOrderApi {
+
+    @Override
+    public Long createPayOrder(PayOrderDataCreateReqDTO reqDTO) {
+        return null;
+    }
+
+}