From 0acc30e604dacf865368bf3faadb5c8d964bba2e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 19 Jul 2024 17:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/aggregation/GoodsSpuRest.java | 37 +++++++++++ .../biz/func/goodsspu/GoodsSpuService.java | 31 ++++++++++ .../biz/func/goodsspu/SalesGoodsQuery.java | 15 +++++ .../oms/biz/func/goodsspu/SalesGoodsVo.java | 62 +++++++++++++++++++ .../feign/goods/goodsSpu/GoodsSpuFeign.java | 27 ++++++++ 5 files changed, 172 insertions(+) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java new file mode 100644 index 0000000..4e7bf88 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java @@ -0,0 +1,37 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.goodsspu.GoodsSpuService; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/3/7 16:58 + */ +@Api(tags = "商品spu") +@RestController +@RequestMapping("/apiadmin/base/basegoodsspu") +public class GoodsSpuRest { + @Autowired + GoodsSpuService goodsSpuService; + + + @ApiOperation("销售订单获取商品") + @PostMapping("/getGoodsForSales") + public ResultBean> getGoodsForSales(@RequestBody PagerQuery pq) { + return goodsSpuService.getGoodsForSales(pq); + } + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java new file mode 100644 index 0000000..f76de80 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.goodsspu; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.feign.goods.goodsSpu.GoodsSpuFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class GoodsSpuService { + private GoodsSpuFeign goodsSpuFeign; + + + public ResultBean> getGoodsForSales(PagerQuery pq) { + return goodsSpuFeign.getGoodsForSales(pq); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java new file mode 100644 index 0000000..2df5ca5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java @@ -0,0 +1,15 @@ +package com.yxt.oms.biz.func.goodsspu; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/19 17:42 + */ +@Data +public class SalesGoodsQuery implements Query { + private String goodsName; + private String createOrgSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java new file mode 100644 index 0000000..46606c4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java @@ -0,0 +1,62 @@ +package com.yxt.oms.biz.func.goodsspu; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/19 17:43 + */ +@Data +public class SalesGoodsVo implements Vo { + + /** + * 辅单位数量 + */ + private String auxiliaryUnit; + /** + * 数量 + */ + private String count; + /** + * 商品基础信息Sid + */ + private String goodSpuSid; + /** + * 商品编码 + */ + private String goodsSkuCode; + /** + * 规格型号 + */ + private String goodsSkuOwnSpec; + /** + * 商品Skusid + */ + private String goodsSkuSid; + /** + * 商品Sku名称 + */ + private String goodsSkuTitle; + /** + * 商品名称 + */ + private String goodsSpuName; + /** + * 销售单价 + */ + private String price; + /** + * 计量单位 + */ + private String unit; + /** + * 体积（立方米） + */ + private String volume; + /** + * 重量（kg） + */ + private String weight; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java new file mode 100644 index 0000000..8c40793 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java @@ -0,0 +1,27 @@ +package com.yxt.oms.feign.goods.goodsSpu; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery; +import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @description: + * @author: fzz + * @date: 2024/7/4 + **/ +@FeignClient( + contextId = "ss-goods-GoodsSpu", + name = "ss-goods", + path = "/apiadmin/base/basegoodsspu") +public interface GoodsSpuFeign { + + @ApiOperation("销售订单获取商品") + @PostMapping("/getGoodsForSales") + public ResultBean> getGoodsForSales(@RequestBody PagerQuery pq); +}