From 57c0b7023e03d975d7ae91bed10ed30f1ea7bb4b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 23 Jul 2024 17:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/func/goodsspu/GoodsSpuService.java    | 21 +++++++++--
 .../biz/func/goodsspu/SalesGoodsQuery.java    |  2 ++
 .../oms/biz/func/goodsspu/SalesGoodsVo.java   | 26 ++++++++++++++
 .../SmsSalesBillDetailDetailsVo.java          | 20 +++++++++++
 .../smssalesbill/SmsSalesBillDetailsVo.java   | 14 ++++++++
 .../func/smssalesbill/SmsSalesBillDto.java    | 14 +++++++-
 .../WarehouseInventoryFeign.java              | 36 +++++++++++++++++++
 7 files changed, 129 insertions(+), 4 deletions(-)
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java

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
index f76de80..46d94b9 100644
--- 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
@@ -4,6 +4,7 @@ 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 com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,11 +22,25 @@ import java.util.stream.Collectors;
  * @date 2024/2/26 13:40
  */
 @Service
-public class GoodsSpuService  {
-  private GoodsSpuFeign goodsSpuFeign;
+public class GoodsSpuService {
 
+    @Autowired
+    private GoodsSpuFeign goodsSpuFeign;
+    @Autowired
+    private WarehouseInventoryFeign warehouseInventoryFeign;
 
     public ResultBean<PagerVo<SalesGoodsVo>> getGoodsForSales(PagerQuery<SalesGoodsQuery> pq) {
-        return goodsSpuFeign.getGoodsForSales(pq);
+        ResultBean<PagerVo<SalesGoodsVo>> goodsForSales = goodsSpuFeign.getGoodsForSales(pq);
+        PagerVo<SalesGoodsVo> data = goodsForSales.getData();
+        List<SalesGoodsVo> records = data.getRecords();
+        if (!records.isEmpty()) {
+            for (SalesGoodsVo record : records) {
+                String count = warehouseInventoryFeign.selInventoryCountBySkuSid(record.getGoodsSkuSid());
+                record.setInventoryCount(count);
+            }
+        }
+        data.setRecords(records);
+        goodsForSales.setData(data);
+        return goodsForSales;
     }
 }
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
index 2df5ca5..dd8f403 100644
--- 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
@@ -12,4 +12,6 @@ import lombok.Data;
 public class SalesGoodsQuery implements Query {
     private String goodsName;
     private String createOrgSid;
+    private String goodsSkuCode;
+    private String goodsSkuOwnSpec;
 }
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
index 46606c4..c162fe9 100644
--- 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
@@ -3,6 +3,9 @@ package com.yxt.oms.biz.func.goodsspu;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Fan
  * @description
@@ -59,4 +62,27 @@ public class SalesGoodsVo implements Vo {
      * 重量（kg）
      */
     private String weight;
+
+    /**
+     * 成本均价
+     */
+    private String costPrice;
+    /**
+     * 参考进价
+     */
+    private String standardPurchasePrice;
+    /**
+     * 实际可用库存
+     */
+    private String inventoryCount;
+
+    /**
+     * 图片
+     */
+    private List<String> pic = new ArrayList<>();
+
+    private String picUrl;
+
+
+
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
index 515d236..5ee5fb5 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
@@ -31,6 +31,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: ss-sales(ss-sales) <br/>
  * File: SmsSalesBillDetailVo.java <br/>
@@ -90,4 +93,21 @@ public class SmsSalesBillDetailDetailsVo implements Vo {
     private String inventoryCount; // 库存数量
     @ApiModelProperty("备注")
     private String remarks; // 备注
+
+    @ApiModelProperty("批次号")
+    private String batchNumber; // 批次号
+    @ApiModelProperty("税率")
+    private String taxRate; // 库存数量
+    @ApiModelProperty("税额")
+    private String taxAmount; // 税额
+    @ApiModelProperty("未含税价")
+    private String unTaxPrice; // 未含税价
+    @ApiModelProperty("总税额（未含税总额）")
+    private String taxTotalAmount; // 总税额（未含税总额）
+    @ApiModelProperty("图片")
+    private String goodsImgUrl; // 图片
+    /**
+     * 图片
+     */
+    private List<String> pic = new ArrayList<>();
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
index 8c039e4..6052d6a 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
@@ -165,4 +165,18 @@ public class SmsSalesBillDetailsVo implements Vo {
     @ApiModelProperty("付款凭证")
     private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
 
+
+    //-------------补充-------------
+    @ApiModelProperty("快递公司sid")
+    private String logisticsNameSid; // 快递公司sid
+    @ApiModelProperty("收货人sid")
+    private String shipperSid; // 收货人sid
+    @ApiModelProperty("固定电话")
+    private String phone; // 固定电话
+    @ApiModelProperty("店铺sid")
+    private String shopSid; // 店铺sid
+    @ApiModelProperty("店铺名称")
+    private String shopName; // 店铺名称
+    @ApiModelProperty("订单号")
+    private String billNo; // 订单号
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
index f77dcb7..b70c1d6 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
@@ -165,7 +165,19 @@ public class SmsSalesBillDto implements Dto {
     @ApiModelProperty("付款凭证")
     private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
 
-
+    //-------------补充-------------
+    @ApiModelProperty("快递公司sid")
+    private String logisticsNameSid; // 快递公司sid
+    @ApiModelProperty("收货人sid")
+    private String shipperSid; // 收货人sid
+    @ApiModelProperty("固定电话")
+    private String phone; // 固定电话
+    @ApiModelProperty("店铺sid")
+    private String shopSid; // 店铺sid
+    @ApiModelProperty("店铺名称")
+    private String shopName; // 店铺名称
+    @ApiModelProperty("订单号")
+    private String billNo; // 订单号
 
 
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
new file mode 100644
index 0000000..d251fad
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
@@ -0,0 +1,36 @@
+package com.yxt.oms.feign.warehouse.warehouseInventory;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存")
+@FeignClient(
+        contextId = "ss-common-warehouse-WarehouseInventory",
+        name = "ss-common-WarehouseInventory",
+        path = "/apiadmin/inventory/Warehouseinventory"
+      )
+public interface WarehouseInventoryFeign {
+    @ApiOperation("根据skuSid查询商品库存")
+    @PostMapping("/selInventoryCountBySkuSid")
+    public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid);
+}