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

finance
杨赟 2 years ago
commit 6a9cc5cfe7

@ -0,0 +1,25 @@
package supplier
import (
"git.oa00.com/supply-chain/service/client"
"golang.org/x/net/context"
)
type logisticsCompany struct {
}
type CompanyItem struct {
Id uint `json:"id"`
Name string `json:"name"`
}
// Select @Title 物流公司筛选
func (l *logisticsCompany) Select(ctx context.Context) (reply []CompanyItem, err error) {
xClient, err := client.GetClient(l)
if err != nil {
return nil, err
}
args := 0
err = xClient.Call(ctx, "Select", args, &reply)
return
}

@ -13,6 +13,7 @@ type Supplier struct {
supplier
WarnLiaison warnLiaison
WalletApply supplierWalletApply
LogisticsCompany logisticsCompany
}
type supplier struct {

@ -279,6 +279,16 @@ func (o *order) Detail(ctx context.Context, channelId string, orderSn string) (r
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
}
// Trajectory @Title 获取订单物流信息
func (o *order) Trajectory(ctx context.Context, channelId string, orderSn string) (reply []_interface.ReplyTrajectory, err error) {
xClient, err := client.GetClient(o)

@ -114,9 +114,13 @@ type SkuListsSearch struct {
SourceId uint // 所属供应商 1=京东
SourceSkuId uint // 供应商skuId
BrandId uint // 品牌Id
BrandIds []uint // 品牌Ids
FirstCategoryId uint // 一级分类Id
FirstCategoryIds []uint // 一级分类ids
SecondCategoryId uint // 二级分类Id
SecondCategoryIds []uint // 二级分类Ids
ThirdCategoryId uint // 三级分类Id
ThirdCategoryIds []uint // 三级分类Ids
AdjustType uint // 加价规则
MaxSupplyPrice decimal.Decimal // 最大采购价格
MinSupplyPrice decimal.Decimal // 最小采购价格

Loading…
Cancel
Save