|
|
@ -4,7 +4,6 @@ import (
|
|
|
|
"context"
|
|
|
|
"context"
|
|
|
|
"git.oa00.com/supply-chain/service/client"
|
|
|
|
"git.oa00.com/supply-chain/service/client"
|
|
|
|
"git.oa00.com/supply-chain/service/lib/bean"
|
|
|
|
"git.oa00.com/supply-chain/service/lib/bean"
|
|
|
|
_interface "git.oa00.com/supply-chain/service/supply/interface"
|
|
|
|
|
|
|
|
"github.com/shopspring/decimal"
|
|
|
|
"github.com/shopspring/decimal"
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
@ -267,8 +266,34 @@ func (o *order) InfoByOrderId(ctx context.Context, orderId uint) (reply InfoByOr
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
type ReplySubmitData struct {
|
|
|
|
|
|
|
|
OrderSn string `json:"orderSn"`
|
|
|
|
|
|
|
|
Status int64 `json:"status"`
|
|
|
|
|
|
|
|
OrderFee decimal.Decimal `json:"orderFee"`
|
|
|
|
|
|
|
|
FreightFee decimal.Decimal `json:"freightFee"`
|
|
|
|
|
|
|
|
LadingBillAt int64 `json:"ladingBillAt"`
|
|
|
|
|
|
|
|
Skus []ReplySubmitDataSku `json:"skus"`
|
|
|
|
|
|
|
|
OrderSubs []ReplySubmitDataOrderSub `json:"orderSubs"`
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
type ReplySubmitDataOrderSub struct {
|
|
|
|
|
|
|
|
OrderSubSn uint64 `json:"orderSubSn"`
|
|
|
|
|
|
|
|
SourceId uint `json:"sourceId"`
|
|
|
|
|
|
|
|
OrderFee decimal.Decimal `json:"orderFee"`
|
|
|
|
|
|
|
|
SupplyOrderFee decimal.Decimal `json:"supplyOrderFee"`
|
|
|
|
|
|
|
|
SourceName string `json:"sourceName"`
|
|
|
|
|
|
|
|
SourceOrderName string `json:"sourceOrderName"`
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
type ReplySubmitDataSku struct {
|
|
|
|
|
|
|
|
SkuId string `json:"skuId"`
|
|
|
|
|
|
|
|
Name string `json:"name"`
|
|
|
|
|
|
|
|
Quantity int64 `json:"quantity"`
|
|
|
|
|
|
|
|
SupplyPrice decimal.Decimal `json:"supplyPrice"`
|
|
|
|
|
|
|
|
GuidePrice decimal.Decimal `json:"guidePrice"`
|
|
|
|
|
|
|
|
Amount decimal.Decimal `json:"amount"`
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// SubmitData @Title 订单下单数据
|
|
|
|
// SubmitData @Title 订单下单数据
|
|
|
|
func (o *order) SubmitData(ctx context.Context, orderId int64) (reply _interface.ReplySubmitData, err error) {
|
|
|
|
func (o *order) SubmitData(ctx context.Context, orderId int64) (reply ReplySubmitData, err error) {
|
|
|
|
xClient, err := client.GetClient(o)
|
|
|
|
xClient, err := client.GetClient(o)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
return
|
|
|
|