From a0485cb6fb3de590305946d73877fe8003800b0e Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 1 Dec 2022 10:02:12 +0800 Subject: [PATCH 1/6] =?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/sku.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/supply/sku.go b/supply/sku.go index 08de840..22a02f4 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -115,8 +115,11 @@ type SkuListsSearch struct { SourceSkuId uint // 供应商skuId BrandId uint // 品牌Id 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 // 最小采购价格 From 63062ca770dd303cefe704a4b449f26b5146f9a0 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 1 Dec 2022 10:05:31 +0800 Subject: [PATCH 2/6] =?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/sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supply/sku.go b/supply/sku.go index 22a02f4..653560c 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -114,6 +114,7 @@ type SkuListsSearch struct { SourceId uint // 所属供应商 1=京东 SourceSkuId uint // 供应商skuId BrandId uint // 品牌Id + BrandIds []uint // 品牌Ids FirstCategoryId uint // 一级分类Id FirstCategoryIds []uint // 一级分类ids SecondCategoryId uint // 二级分类Id From 1973793f4af593225bacb7e0248a35d5fc8e465f Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 1 Dec 2022 10:38:02 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E5=85=AC=E5=8F=B8rpc=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/logisticsCompany.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 supplier/logisticsCompany.go diff --git a/supplier/logisticsCompany.go b/supplier/logisticsCompany.go new file mode 100644 index 0000000..4182617 --- /dev/null +++ b/supplier/logisticsCompany.go @@ -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 +} From b0764187e6978674333a778e4bdc535a6aadbd54 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 1 Dec 2022 10:40:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/supplier.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/supplier/supplier.go b/supplier/supplier.go index 64fafe3..ad462d1 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -95,15 +95,16 @@ func (s *supplier) Disabled(ctx context.Context, supplierId uint) error { } type ReplySupplierInfo struct { - SupplierId uint - SupplierName string // 供应商名称 - Account string // 账户名 - PayType uint // 结算方式 - Liaison string // 联系人 - Phone string // 手机号 - Annex string // 附件 - WarnStatus uint // 预警状态 - WarnValue decimal.Decimal // 预警值 + SupplierId uint + SupplierName string // 供应商名称 + Account string // 账户名 + PayType uint // 结算方式 + Liaison string // 联系人 + Phone string // 手机号 + Annex string // 附件 + WarnStatus uint // 预警状态 + WarnValue decimal.Decimal // 预警值 + LogisticsCompany logisticsCompany // 物流公司 } // Info @Title 供应商详情 From 6d713315a3f6687f8e32c8b4f5e8b0a40df5708d Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 1 Dec 2022 10:42:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/supplier.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/supplier/supplier.go b/supplier/supplier.go index ad462d1..76a8c7e 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -11,8 +11,9 @@ type Supplier struct { Goods goods Apply supplierApply supplier - WarnLiaison warnLiaison - WalletApply supplierWalletApply + WarnLiaison warnLiaison + WalletApply supplierWalletApply + LogisticsCompany logisticsCompany } type supplier struct { @@ -95,16 +96,15 @@ func (s *supplier) Disabled(ctx context.Context, supplierId uint) error { } type ReplySupplierInfo struct { - SupplierId uint - SupplierName string // 供应商名称 - Account string // 账户名 - PayType uint // 结算方式 - Liaison string // 联系人 - Phone string // 手机号 - Annex string // 附件 - WarnStatus uint // 预警状态 - WarnValue decimal.Decimal // 预警值 - LogisticsCompany logisticsCompany // 物流公司 + SupplierId uint + SupplierName string // 供应商名称 + Account string // 账户名 + PayType uint // 结算方式 + Liaison string // 联系人 + Phone string // 手机号 + Annex string // 附件 + WarnStatus uint // 预警状态 + WarnValue decimal.Decimal // 预警值 } // Info @Title 供应商详情 From 96e06151b0b3d12b981b7050673c6218f547cc11 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 1 Dec 2022 14:07:19 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85rpc=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/channel/order.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/supply/channel/order.go b/supply/channel/order.go index 976e974..e07a39d 100644 --- a/supply/channel/order.go +++ b/supply/channel/order.go @@ -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)