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

wholesale/channel/order.go

@@ -54,10 +54,11 @@ type ArgsOrderSubmit struct {
 }
 
 type Receiver struct {
-	Name    string // 姓名
-	Mobile  string // 手机号
-	Email   string // 邮箱
-	ZipCode string // 邮编
+	Name             string // 姓名
+	Mobile           string // 手机号
+	HopeStockOutDate string // 期望发货日期
+	Email            string // 邮箱
+	ZipCode          string // 邮编
 }
 
 type ReplyOrderSubmit struct {
@@ -134,6 +135,7 @@ type OrderItem struct {
 	Id             uint            `json:"id"`
 	ReceiverName   string          `json:"receiverName"`
 	ReceiverMobile string          `json:"receiverMobile"`
+	Address        string          `json:"address"`
 	OrderSubSn     string          `json:"orderSubSn"`
 	FreightFee     decimal.Decimal `json:"freightFee"`
 	OrderFee       decimal.Decimal `json:"orderFee"`
@@ -144,10 +146,17 @@ type OrderItem struct {
 	FinishAt       int64           `json:"finishAt"`
 	StockOutAt     int64           `json:"stockOutAt"`
 	CloseAt        int64           `json:"closeAt"`
-	Skus           []OrderSkuItem  `json:"skus"`
+	Skus           []OrderSku      `json:"skus"`
+	Packages       []OrderPackage  `json:"packages"`
+	ExpireAt       int64           `json:"expireAt"`
 }
 
-type OrderSkuItem struct {
+type OrderPackage struct {
+	LogisticsName string `json:"logisticsName"`
+	WaybillCode   string `json:"waybillCode"`
+}
+
+type OrderSku struct {
 	Img         string          `json:"img"`
 	SkuName     string          `json:"skuName"`
 	SkuId       uint            `json:"skuId"`
@@ -167,3 +176,13 @@ func (o *order) Lists(ctx context.Context, channelId string, args ArgsOrderLists
 	err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Lists", args, &reply)
 	return
 }
+
+// SubDetail @Title 子订单详情
+func (o *order) SubDetail(ctx context.Context, channelId, orderSn string) (reply OrderItem, err error) {
+	xClient, err := client.GetClient(o)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "SubDetail", orderSn, &reply)
+	return
+}