From 43e700e157106c09b9b785006b22e5056c1db551 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 23 Jul 2024 17:36:08 +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

---
 .../yxt/goods/biz/goodsspu/GoodsSpuMapper.xml |  7 +++++-
 .../goods/biz/goodsspu/GoodsSpuService.java   | 17 ++++++++++++++
 .../goods/biz/goodsspu/SalesGoodsQuery.java   |  3 +++
 .../yxt/goods/biz/goodsspu/SalesGoodsVo.java  | 23 +++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
index 3f3b12d..59b4251 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
@@ -41,9 +41,14 @@
         sku.sid as goodsSkuSid,
         sku.goodsSkuCode,
         sku.title as goodsSkuTitle,
-        s.goodsUnitName as unit
+        s.goodsUnitName as unit,
+        e.salesPrice as price,
+        e.picUrl,
+        e.costPrice,
+        e.standardPurchasePrice
         from goods_spu s
         left join goods_sku sku on a.sid = sku.goodsSpuSid
+        left join goods_sku_extend e on sku.sid = e.goodsSkuSid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
index 5417620..851d9a2 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
@@ -496,9 +496,26 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
         if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
             qw.like("s.createOrgSid", query.getCreateOrgSid());
         }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("sku.goodsSkuCode", query.getGoodsSkuCode());
+        }
         qw.ne("s.isDelete","1");
         IPage<GoodsSpu> page = PagerUtil.queryToPage(pq);
         IPage<SalesGoodsVo> pagging = baseMapper.getGoodsForSales(page, qw);
+        List<SalesGoodsVo> records = pagging.getRecords();
+        if (!records.isEmpty()) {
+            for (SalesGoodsVo record : records) {
+                if (StringUtils.isNotBlank(record.getPicUrl())) {
+                    List<String> picList = new ArrayList<>();
+                    String picUrl = record.getPicUrl();
+                    String[] split = picUrl.split(",");
+                    for (String s : split) {
+                        picList.add(fileUploadComponent.getUrlPrefix() + s);
+                    }
+                    record.setPic(picList);
+                }
+            }
+        }
         PagerVo<SalesGoodsVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsQuery.java b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsQuery.java
index 3fb083a..4e3bef3 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsQuery.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsQuery.java
@@ -12,4 +12,7 @@ import lombok.Data;
 public class SalesGoodsQuery implements Query {
     private String goodsName;
     private String createOrgSid;
+
+    private String goodsSkuCode;
+    private String goodsSkuOwnSpec;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsVo.java b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsVo.java
index 2fa337c..c7d887b 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsVo.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsVo.java
@@ -3,6 +3,9 @@ package com.yxt.goods.biz.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,24 @@ public class SalesGoodsVo implements Vo {
      * 重量（kg）
      */
     private String weight;
+
+    /**
+     * 图片
+     */
+    private List<String> pic = new ArrayList<>();
+
+    private String picUrl;
+
+    /**
+     * 成本均价
+     */
+    private String costPrice;
+    /**
+     * 参考进价
+     */
+    private String standardPurchasePrice;
+    /**
+     * 实际可用库存
+     */
+    private String inventoryCount;
 }