From 144eff0ea8fc8b2599d7335edfb2246404600d3d Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 28 五月 2024 19:06:34 +0800
Subject: [PATCH] 写用户端接口

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeriesMapper.java                          |    2 
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java                  |   18 +++++-
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java |   15 +++--
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsBrandService.java                        |    2 
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeries.java                          |    2 
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsFlavorType.java                      |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsBrandMapper.java                           |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsCategoryService.java                     |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsFlavorTypeServiceImpl.java           |    2 
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsBrand.java                           |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsCategoryServiceImpl.java             |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsCategoryMapper.java                        |    2 
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsCategory.java                        |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsCategoryController.java          |   20 ++++++
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeriesController.java            |   20 ++++++
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java                |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java             |   20 ++++++
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsFlavorTypeMapper.java                      |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsFlavorTypeService.java                   |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsFlavorTypeController.java        |   19 +++++
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java               |    2 
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeriesService.java                       |    2 
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java                     |   23 +++++++
 23 files changed, 132 insertions(+), 35 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsBrand.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsBrand.java
similarity index 97%
rename from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsBrand.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsBrand.java
index c6ce773..8dc8c0b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsBrand.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsBrand.java
@@ -1,4 +1,4 @@
-package com.ruoyi.goods.domain;
+package com.ruoyi.system.api.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsCategory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsCategory.java
similarity index 97%
rename from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsCategory.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsCategory.java
index 32a2cc7..09f0d6b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsCategory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsCategory.java
@@ -1,4 +1,4 @@
-package com.ruoyi.goods.domain;
+package com.ruoyi.system.api.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsFlavorType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsFlavorType.java
similarity index 97%
rename from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsFlavorType.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsFlavorType.java
index a28c1f5..ec43470 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsFlavorType.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsFlavorType.java
@@ -1,4 +1,4 @@
-package com.ruoyi.goods.domain;
+package com.ruoyi.system.api.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSeries.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeries.java
similarity index 97%
rename from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSeries.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeries.java
index 06515c6..fc31e5c 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsSeries.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSeries.java
@@ -1,4 +1,4 @@
-package com.ruoyi.goods.domain;
+package com.ruoyi.system.api.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
index 9621c2f..c90a52d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
@@ -1,8 +1,7 @@
 package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.GoodsSeckill;
-import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.*;
 import com.ruoyi.system.api.feignClient.GoodsSkuClient;
 import java.util.List;
 import org.slf4j.Logger;
@@ -25,6 +24,26 @@
             }
 
             @Override
+            public R<GoodsCategory> getCategoryOne(Long categoryId, String source) {
+                return R.fail("通过id查询商品分类i失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R<GoodsSeries> getSeriesOne(Long seriesId, String source) {
+                return R.fail("通过id查询品系列失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R<GoodsBrand> getBrandOne(Long brandId, String source) {
+                return R.fail("通过id查询商品品牌失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R<GoodsFlavorType> getFlavorTypeOne(Long flavorTypeId, String source) {
+                return R.fail("通过id查询商品香型失败:" + cause.getMessage());
+            }
+
+            @Override
             public R<GoodsSeckill> getGoodsSeckillOne(Long goodsSkuId, String source) {
                 return R.fail("通过id查询秒杀商品失败:" + cause.getMessage());
             }
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
index 6afe181..145a26a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
@@ -3,8 +3,7 @@
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.GoodsSeckill;
-import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.*;
 import com.ruoyi.system.api.factory.GoodsSkuFactory;
 import java.util.List;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -26,9 +25,22 @@
     R<GoodsSku> getGoodsSkuOne(@RequestBody Long goodsSkuId,
             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @PostMapping("/goods-category/getCategoryOne")
+    R<GoodsCategory> getCategoryOne(@RequestBody Long categoryId,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("/goods-series/getSeriesOne")
+    R<GoodsSeries> getSeriesOne(@RequestBody Long seriesId,
+                                @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("/goods-brand/getBrandOne")
+    R<GoodsBrand> getBrandOne(@RequestBody Long brandId,
+                              @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("/goods-flavor-type/getFlavorTypeOne")
+    R<GoodsFlavorType> getFlavorTypeOne(@RequestBody Long flavorTypeId,
+                                        @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     @PostMapping("/goods-seckill/getGoodsSeckillOne")
     R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId,
-            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+                                       @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/goods-sku/updateGoodsSkuOne")
     R<Boolean> updateGoodsSkuOne(@RequestBody GoodsSku goodsSku,
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index a6141a7..d30cdae 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -23,8 +23,7 @@
 import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
 import com.ruoyi.common.core.enums.BidStatusEnum;
 import com.ruoyi.common.core.enums.OrderFromEnum;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.MemberAddress;
+import com.ruoyi.system.api.domain.*;
 import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
 import com.ruoyi.system.api.feignClient.GoodsSkuClient;
 import com.ruoyi.system.api.feignClient.MemberClient;
@@ -391,10 +390,14 @@
         AuctionSalesroomGoodsInfoVO.setUnit(goodsSku.getUnit());
         AuctionSalesroomGoodsInfoVO.setDescription(goodsSku.getDescription());
         AuctionSalesroomGoodsInfoVO.setYears(goodsSku.getYears());
-
-
-
-
+        GoodsBrand data = goodsSkuClient.getBrandOne(goodsSku.getBrandId(), SecurityConstants.INNER).getData();
+        GoodsCategory data1 = goodsSkuClient.getCategoryOne(goodsSku.getCategoryId(), SecurityConstants.INNER).getData();
+        GoodsSeries data2 = goodsSkuClient.getSeriesOne(goodsSku.getSeriesId(), SecurityConstants.INNER).getData();
+        GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(goodsSku.getFlavorTypeId(), SecurityConstants.INNER).getData();
+        AuctionSalesroomGoodsInfoVO.setBrand(data.getBrandName());
+        AuctionSalesroomGoodsInfoVO.setCategory(data1.getCategoryName());
+        AuctionSalesroomGoodsInfoVO.setSeries(data2.getSeriesName());
+        AuctionSalesroomGoodsInfoVO.setFlavorType(data3.getFlavorTypeName());
         AuctionSalesroomGoodsInfoVO.setCoverPic(goodsSku.getCoverPic());
         AuctionSalesroomGoodsInfoVO.setAlbum(goodsSku.getAlbum());
         LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java
index 5824c56..ffd7d26 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrandController.java
@@ -1,9 +1,14 @@
 package com.ruoyi.goods.controller.inner;
 
 
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.GoodsBrand;
+import com.ruoyi.goods.service.IGoodsBrandService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -18,4 +23,15 @@
 @RequiredArgsConstructor
 public class GoodsBrandController {
 
+    @Resource
+    private IGoodsBrandService iGoodsBrandService;
+    @InnerAuth
+    @PostMapping("/getBrandOne")
+    @ResponseBody
+    public R<GoodsBrand> getBrandOne(@RequestBody Long brandId) {
+        GoodsBrand goodsBrandOne=iGoodsBrandService.getById(brandId);
+        return R.ok(goodsBrandOne);
+
+    }
+
 }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsCategoryController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsCategoryController.java
index bd79dc7..3d4e2ae 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsCategoryController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsCategoryController.java
@@ -1,8 +1,13 @@
 package com.ruoyi.goods.controller.inner;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.GoodsCategory;
+import com.ruoyi.goods.service.IGoodsCategoryService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -16,4 +21,15 @@
 @RequestMapping("/goods-category")
 public class GoodsCategoryController {
 
+    @Resource
+    private IGoodsCategoryService iGoodsCategoryService;
+    @InnerAuth
+    @PostMapping("/getCategoryOne")
+    @ResponseBody
+    public R<GoodsCategory> getCategoryOne(@RequestBody Long categoryId) {
+        GoodsCategory goodsCategoryOne=iGoodsCategoryService.getById(categoryId);
+        return R.ok(goodsCategoryOne);
+
+    }
+
 }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsFlavorTypeController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsFlavorTypeController.java
index 19df1e0..dad0af4 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsFlavorTypeController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsFlavorTypeController.java
@@ -1,8 +1,13 @@
 package com.ruoyi.goods.controller.inner;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
+import com.ruoyi.goods.service.IGoodsFlavorTypeService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -15,5 +20,15 @@
 @RestController
 @RequestMapping("/goods-flavor-type")
 public class GoodsFlavorTypeController {
+    @Resource
+    private IGoodsFlavorTypeService iGoodsFlavorTypeService;
+    @InnerAuth
+    @PostMapping("/getFlavorTypeOne")
+    @ResponseBody
+    public R<GoodsFlavorType> getFlavorTypeOne(@RequestBody Long flavorTypeId) {
+        GoodsFlavorType goodsFlavorTypeOne=iGoodsFlavorTypeService.getById(flavorTypeId);
+        return R.ok(goodsFlavorTypeOne);
+
+    }
 
 }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeriesController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeriesController.java
index c7bc4fb..bce688b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeriesController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeriesController.java
@@ -1,8 +1,13 @@
 package com.ruoyi.goods.controller.inner;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.GoodsSeries;
+import com.ruoyi.goods.service.IGoodsSeriesService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -16,4 +21,15 @@
 @RequestMapping("/goods-series")
 public class GoodsSeriesController {
 
+    @Resource
+    private IGoodsSeriesService iGoodsSeriesService;
+    @InnerAuth
+    @PostMapping("/getSeriesOne")
+    @ResponseBody
+    public R<GoodsSeries> getSeriesOne(@RequestBody Long seriesId) {
+        GoodsSeries goodsSeriesOne=iGoodsSeriesService.getById(seriesId);
+        return R.ok(goodsSeriesOne);
+
+    }
+
 }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsBrandMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsBrandMapper.java
index 66c3ebf..adb508e 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsBrandMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsBrandMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.domain.GoodsBrand;
+import com.ruoyi.system.api.domain.GoodsBrand;
 
 /**
  * <p>
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsCategoryMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsCategoryMapper.java
index f0b2c46..4c78502 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsCategoryMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsCategoryMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.GoodsCategory;
 
 /**
  * <p>
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsFlavorTypeMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsFlavorTypeMapper.java
index b199001..98ee7b5 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsFlavorTypeMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsFlavorTypeMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.domain.GoodsFlavorType;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
 
 /**
  * <p>
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeriesMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeriesMapper.java
index 4fd8e41..ce0585b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeriesMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsSeriesMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSeries;
 
 /**
  * <p>
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsBrandService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsBrandService.java
index 251c7f1..bc1784a 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsBrandService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsBrandService.java
@@ -5,7 +5,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsBrandDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsBrandQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsBrandVO;
-import com.ruoyi.goods.domain.GoodsBrand;
+import com.ruoyi.system.api.domain.GoodsBrand;
 import java.util.List;
 
 /**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsCategoryService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsCategoryService.java
index 5409969..cdeffcb 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsCategoryService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsCategoryService.java
@@ -5,7 +5,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsCategoryDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsCategoryQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsCategoryVO;
-import com.ruoyi.goods.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.GoodsCategory;
 import java.util.List;
 
 /**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsFlavorTypeService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsFlavorTypeService.java
index 297d729..7f97010 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsFlavorTypeService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsFlavorTypeService.java
@@ -5,7 +5,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsFlavorTypeDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsFlavorTypeQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsFlavorTypeVO;
-import com.ruoyi.goods.domain.GoodsFlavorType;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
 import java.util.List;
 
 /**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeriesService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeriesService.java
index 978ee7c..e46b556 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeriesService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSeriesService.java
@@ -5,7 +5,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsSeriesDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsSeriesQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsSeriesVO;
-import com.ruoyi.goods.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSeries;
 import java.util.List;
 
 /**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java
index 55ead9e..77b6135 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java
@@ -8,7 +8,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsBrandDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsBrandQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsBrandVO;
-import com.ruoyi.goods.domain.GoodsBrand;
+import com.ruoyi.system.api.domain.GoodsBrand;
 import com.ruoyi.goods.mapper.GoodsBrandMapper;
 import com.ruoyi.goods.service.IGoodsBrandService;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsCategoryServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsCategoryServiceImpl.java
index 94125bc..6e48584 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsCategoryServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsCategoryServiceImpl.java
@@ -8,7 +8,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsCategoryDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsCategoryQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsCategoryVO;
-import com.ruoyi.goods.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.GoodsCategory;
 import com.ruoyi.goods.mapper.GoodsCategoryMapper;
 import com.ruoyi.goods.service.IGoodsCategoryService;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsFlavorTypeServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsFlavorTypeServiceImpl.java
index bd30d56..faabb23 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsFlavorTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsFlavorTypeServiceImpl.java
@@ -8,7 +8,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsFlavorTypeDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsFlavorTypeQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsFlavorTypeVO;
-import com.ruoyi.goods.domain.GoodsFlavorType;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
 import com.ruoyi.goods.mapper.GoodsFlavorTypeMapper;
 import com.ruoyi.goods.service.IGoodsFlavorTypeService;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java
index 4aadd83..0d4a323 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java
@@ -8,7 +8,7 @@
 import com.ruoyi.goods.controller.management.dto.GoodsSeriesDTO;
 import com.ruoyi.goods.controller.management.dto.GoodsSeriesQuery;
 import com.ruoyi.goods.controller.management.vo.GoodsSeriesVO;
-import com.ruoyi.goods.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSeries;
 import com.ruoyi.goods.mapper.GoodsSeriesMapper;
 import com.ruoyi.goods.service.IGoodsSeriesService;
 import java.util.List;

--
Gitblit v1.7.1