From de98e52d0e7cea18780f6c9613d116965bec0d92 Mon Sep 17 00:00:00 2001
From: sian <sian@akuhome.com>
Date: Thu, 24 Nov 2022 16:52:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supply/channel/order.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supply/channel/order.go b/supply/channel/order.go
index da7b614..d98baf1 100644
--- a/supply/channel/order.go
+++ b/supply/channel/order.go
@@ -203,6 +203,7 @@ type OrderItem struct {
 	CloseAt        int64           `json:"closeAt"`
 	Skus           []OrderSku      `json:"skus"`
 	Packages       []OrderPackage  `json:"packages"`
+	StockOutAt     int64           `json:"stockOutAt"`
 }
 
 type OrderSku struct {

From e795c03373088584efdc1a07ba9ce96a5ea56ced Mon Sep 17 00:00:00 2001
From: sian <sian@akuhome.com>
Date: Mon, 28 Nov 2022 10:18:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supply/channel/order.go | 2 ++
 supply/interface/sku.go | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/supply/channel/order.go b/supply/channel/order.go
index d98baf1..c325c1d 100644
--- a/supply/channel/order.go
+++ b/supply/channel/order.go
@@ -12,6 +12,7 @@ import (
 const (
 	ReplyOrderFreightFeeErrCodeNone = 0 // 无错误
 	ReplyOrderFreightFeeErrCodeErr  = 1 // 有错误
+	ReplyOrderFreightFeeErrCodeDone = 2 // 已下架
 
 	OrderStatusLock       = 1 // 锁单待确认
 	OrderStatusLadingBill = 2 // 提单
@@ -171,6 +172,7 @@ func (o *order) Split(ctx context.Context, channelId string, args ArgsOrderSplit
 }
 
 type OrderListsSearch struct {
+	SkuIds              []uint // 商品Ids
 	SkuName             string // 商品名称
 	Status              []uint // 订单状态
 	CancelStatus        uint   // 订单取消状态
diff --git a/supply/interface/sku.go b/supply/interface/sku.go
index 359cf9a..c003e0f 100644
--- a/supply/interface/sku.go
+++ b/supply/interface/sku.go
@@ -7,8 +7,9 @@ import (
 type skuState uint
 
 const (
-	SkuStateIn  = 1 // 有货
-	SkuStateOut = 2 // 无货
+	SkuStateIn   = 1 // 有货
+	SkuStateOut  = 2 // 无货
+	SkuStateDone = 3 // 下架商品
 )
 
 type Sku interface {

From 2ea85769792ed017da03a6ae628fa24b74a8afd7 Mon Sep 17 00:00:00 2001
From: sian <sian@akuhome.com>
Date: Mon, 28 Nov 2022 11:22:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supply/order.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supply/order.go b/supply/order.go
index c14eb7a..682ea1e 100644
--- a/supply/order.go
+++ b/supply/order.go
@@ -106,6 +106,7 @@ type ArgsRetailOrderLists struct {
 
 type RetailOrderSearch struct {
 	OrderSubSn      uint64 `label:"订单号"`
+	SourceSubSn     uint64 `label:"供应商订单号"`
 	SupplierId      uint   `label:"供应商"`
 	CustomerId      uint   `label:"客户"`
 	WaybillCode     string `label:"运单号"`