From 671323e4661f7720c9e201450cc32387cfa3b1c0 Mon Sep 17 00:00:00 2001
From: sian <sian@akuhome.com>
Date: Fri, 22 Jul 2022 18:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9lists=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supply/sku.go      |  6 +++---
 supply/skuAudit.go | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/supply/sku.go b/supply/sku.go
index 49fbef1..e8b4df3 100644
--- a/supply/sku.go
+++ b/supply/sku.go
@@ -93,7 +93,7 @@ type ArgsSkuLists struct {
 
 type SkuListsSearch struct {
 	Name               string          // 商品名称
-	SourceId             uint            // 所属供应商 1=京东
+	SourceId           uint            // 所属供应商 1=京东
 	Id                 uint            // 瑞库客id
 	SourceSkuId        uint            // 供应商skuId
 	BrandId            uint            // 品牌Id
@@ -116,7 +116,7 @@ type ReplySkuList struct {
 type SkuItem struct {
 	Id                 uint
 	Name               string          // 名称
-	BrandId            uint            // 品牌id
+	BrandName          string          // 品牌名称
 	FirstCategoryId    uint            // 一级分类id
 	SecondCategoryId   uint            // 二级分类id
 	ThirdCategoryId    uint            // 三级分类id
@@ -124,7 +124,7 @@ type SkuItem struct {
 	GuidePrice         decimal.Decimal // 指导价
 	ImgUrl             string          // 商品主图
 	PlatformStatus     uint            // 平台状态 1=上架 2=下架
-	SourceId           uint            // 来源 1=京东
+	SourceName         string          // 供应商名称
 	SourceSkuId        string          // 源skuId
 	SourceStatus       uint            // 供应商状态 1=上架 2=下架
 	CustomerPrice      decimal.Decimal // 供货最高价
diff --git a/supply/skuAudit.go b/supply/skuAudit.go
index 43a61f0..9299925 100644
--- a/supply/skuAudit.go
+++ b/supply/skuAudit.go
@@ -20,15 +20,25 @@ type SkuAuditSearch struct {
 	AdjustType uint // 加价类型
 	Status     uint // 状态 1=未审核 2=通过 3=驳回
 }
-type SkuAuditItem struct {
-	Id               uint            `json:"id"`
+type SkuAndAuditItem struct {
+	AuditId          uint            `json:"auditId"`
 	SkuId            uint            `json:"skuId"`
 	AfterAdjustType  uint            `json:"afterAdjustType"`
 	AfterAdjustPrice decimal.Decimal `json:"afterAdjustPrice"`
+	Name             string          `json:"name"`
+	SupplyPrice      decimal.Decimal `json:"supplyPrice"`
+	GuidePrice       decimal.Decimal `json:"guidePrice"`
+	AdjustType       uint            `json:"adjustType"`
+	AdjustPrice      decimal.Decimal `json:"adjustPrice"`
+	CustomerPrice    decimal.Decimal `json:"customerPrice"`
+	ThirdCategoryId  uint            `json:"thirdCategoryId"`
+	BrandName        string          `json:"brandName"`
+	SourceName       string          `json:"sourceName"`
 }
+
 type ReplySkuAuditLists struct {
-	Lists []SkuAuditItem `json:"lists"`
-	Total int64          `json:"total"`
+	Lists []SkuAndAuditItem `json:"lists"`
+	Total int64             `json:"total"`
 }
 
 // Lists @Title 审核列表