Merge branch 'master' of git.oa00.com:supply-chain/service

wholesale/order.go

@@ -49,6 +49,7 @@ type ArgsOrderFreightFee struct {
 type OrderFreightFee struct {
 	SourceOrderSn string          // 供应商订单号
 	FreightFee    decimal.Decimal // 运费
+	FreightFile   string          // 附件
 }
 
 // FreightFee @Title 运费处理
@@ -176,18 +177,13 @@ type ReplyOrderInfo struct {
 	OrderFee       decimal.Decimal
 	FreightFee     decimal.Decimal
 	Skus           []OrderSkuItem
-	Customer       Customer
+	HopeStockOutAt int64
+	ChannelId      uint
 	ReceiverName   string
 	ReceiverMobile string
 	Address        string
 }
 
-type Customer struct {
-	Name           string
-	Phone          string
-	HopeStockOutAt int64 // 期望发货时间
-}
-
 type OrderSkuItem struct {
 	Img      string
 	Name     string