From 25d8333f0aa070c247ca30b38e080f23171526cf Mon Sep 17 00:00:00 2001 From: kanade Date: Wed, 17 Aug 2022 15:47:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/channel/sku.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/supply/channel/sku.go b/supply/channel/sku.go index 55ce82c..44e0986 100644 --- a/supply/channel/sku.go +++ b/supply/channel/sku.go @@ -119,6 +119,30 @@ func (s *sku) Details(ctx context.Context, channelId string, args ArgsSkuDetails return } +type ArgsSkuPrices struct { + SkuIds []uint // sku数组 +} +type SkuPrice struct { + Id uint `json:"id"` + Name string `json:"name"` + Price decimal.Decimal `json:"price"` + GuidePrice decimal.Decimal `json:"guidePrice"` + Profit decimal.Decimal `json:"profit"` + Status uint `json:"status"` + CreatedAt int64 `json:"createdAt"` + UpdatedAt int64 `json:"updatedAt"` +} + +// Prices @Title 获取sku价格 +func (s *sku) Prices(ctx context.Context, channelId string, args ArgsSkuPrices) (reply []SkuPrice, err error) { + xClient, err := client.GetClient(s) + if err != nil { + return + } + err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Prices", args, &reply) + return +} + type ArgsSkuStock struct { Address string // 地址 Skus []SkuStockItem // sku信息 From 508fb8ea5480e2341162f1e0df1b50c1c3122224 Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 18 Aug 2022 11:27:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/channel/sku.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/supply/channel/sku.go b/supply/channel/sku.go index 44e0986..265225f 100644 --- a/supply/channel/sku.go +++ b/supply/channel/sku.go @@ -143,6 +143,25 @@ func (s *sku) Prices(ctx context.Context, channelId string, args ArgsSkuPrices) return } +type ArgsSkuGroups struct { + SkuIds []uint // sku数组 +} + +type SkuGroup struct { + SkuId uint `json:"skuId"` + GroupSkuIds []uint `json:"groupSkuIds"` +} + +// Groups @Title 获取sku分组信息 +func (s *sku) Groups(ctx context.Context, channelId string, args ArgsSkuGroups) (reply []SkuGroup, err error) { + xClient, err := client.GetClient(s) + if err != nil { + return + } + err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Groups", args, &reply) + return +} + type ArgsSkuStock struct { Address string // 地址 Skus []SkuStockItem // sku信息 From 24285c22025aeea253a5b6abe015548ffeeb7f3a Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 19 Aug 2022 09:02:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/audit/supply.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/customer/service/audit/supply.go b/customer/service/audit/supply.go index 368109e..bcaed84 100644 --- a/customer/service/audit/supply.go +++ b/customer/service/audit/supply.go @@ -82,3 +82,20 @@ func (s *supply) Info(ctx context.Context, userServiceId uint) (reply ReplySuppl err = xClient.Call(ctx, "Info", userServiceId, &reply) return } + +type ReplyProof struct { + Name string `json:"name"` + ChannelId uint `json:"channelId"` // 用户Id + AppKey string `json:"appKey"` + AppSecret string `json:"appSecret"` +} + +// GetProof @Title 获取凭证 +func (s *supply) GetProof(ctx context.Context, userServiceId uint) (reply ReplyProof, err error) { + xClient, err := client.GetClient(s) + if err != nil { + return + } + err = xClient.Call(ctx, "GetProof", userServiceId, &reply) + return +} From c70fd572050ea658defe192ebf522cf0c95fa533 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 19 Aug 2022 09:36:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/service.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/customer/service/service.go b/customer/service/service.go index 3eaf512..6a5b359 100644 --- a/customer/service/service.go +++ b/customer/service/service.go @@ -16,10 +16,11 @@ type ArgsServiceLists struct { } type ReplyServiceLists struct { - ServiceId uint `json:"serviceId"` - ServiceName string `json:"serviceName"` - EndTime int64 `json:"endTime"` - AuditStatus uint `json:"auditStatus"` + UserServiceId uint `json:"userServiceId"` + ServiceId uint `json:"serviceId"` + ServiceName string `json:"serviceName"` + EndTime int64 `json:"endTime"` + AuditStatus uint `json:"auditStatus"` } type service struct { From 96877af57292819d999ebdff091cfe912ee0a83e Mon Sep 17 00:00:00 2001 From: kanade Date: Fri, 19 Aug 2022 19:09:20 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/user/wallet.go | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/customer/user/wallet.go b/customer/user/wallet.go index 1136b89..58a56ca 100644 --- a/customer/user/wallet.go +++ b/customer/user/wallet.go @@ -36,3 +36,52 @@ func (w *wallet) Direct(ctx context.Context, args ArgsDepositAuditReject) error } return xClient.Call(ctx, "Direct", args, &reply) } + +type ArgsWalletCreate struct { + UserId uint // 客户id + WalletType walletType // 收支类型 + Amount decimal.Decimal // 金额 正数 + ServiceId uint // 服务id + Remark string // 备注信息 + CancelSecond int64 // 自动取消秒 +} + +// Create @Title 创建消费 +func (w *wallet) Create(ctx context.Context, args ArgsWalletCreate) (walletId uint, err error) { + xClient, err := client.GetClient(w) + if err != nil { + return + } + err = xClient.Call(ctx, "Create", args, &walletId) + return +} + +type ArgsWalletSuccess struct { + UserId uint // 客户id + WalletId uint // 消费id +} + +// Success @Title 成功 +func (w *wallet) Success(ctx context.Context, args ArgsWalletSuccess) (walletId uint, err error) { + xClient, err := client.GetClient(w) + if err != nil { + return + } + err = xClient.Call(ctx, "Success", args, &walletId) + return +} + +type ArgsWalletFail struct { + UserId uint // 客户id + WalletId uint // 消费id +} + +// Fail @Title 失败 +func (w *wallet) Fail(ctx context.Context, args ArgsWalletFail) (walletId uint, err error) { + xClient, err := client.GetClient(w) + if err != nil { + return + } + err = xClient.Call(ctx, "Fail", args, &walletId) + return +} From d1065c38b4b3e0a2d67c5c5c78b368e068513290 Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 22 Aug 2022 09:42:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/user/wallet.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/customer/user/wallet.go b/customer/user/wallet.go index 58a56ca..50aea1f 100644 --- a/customer/user/wallet.go +++ b/customer/user/wallet.go @@ -62,13 +62,13 @@ type ArgsWalletSuccess struct { } // Success @Title 成功 -func (w *wallet) Success(ctx context.Context, args ArgsWalletSuccess) (walletId uint, err error) { +func (w *wallet) Success(ctx context.Context, args ArgsWalletSuccess) error { + reply := 0 xClient, err := client.GetClient(w) if err != nil { - return + return err } - err = xClient.Call(ctx, "Success", args, &walletId) - return + return xClient.Call(ctx, "Success", args, &reply) } type ArgsWalletFail struct { @@ -77,11 +77,11 @@ type ArgsWalletFail struct { } // Fail @Title 失败 -func (w *wallet) Fail(ctx context.Context, args ArgsWalletFail) (walletId uint, err error) { +func (w *wallet) Fail(ctx context.Context, args ArgsWalletFail) error { + reply := 0 xClient, err := client.GetClient(w) if err != nil { - return + return err } - err = xClient.Call(ctx, "Fail", args, &walletId) - return + return xClient.Call(ctx, "Fail", args, &reply) } From a5f552c6770e5249fece86c0710c2b97805dcb7e Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 22 Aug 2022 11:22:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=87=A0=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/channel/order.go | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/supply/channel/order.go b/supply/channel/order.go index 6e3a5aa..4a6d991 100644 --- a/supply/channel/order.go +++ b/supply/channel/order.go @@ -10,6 +10,17 @@ import ( const ( ReplyOrderFreightFeeErrCodeNone = 0 // 无错误 ReplyOrderFreightFeeErrCodeErr = 1 // 有错误 + + OrderStatusLock = 1 // 锁单待确认 + OrderStatusLadingBill = 2 // 提单 + OrderStatusClose = 3 // 关闭 + + OrderSubStatusLock = 1 // 锁单 + OrderSubStatusLadingBill = 2 // 提单 + OrderSubStatusSendOutGoods = 3 // 出库/发货 + OrderSubStatusDelivered = 4 // 妥投 + OrderSubStatusFinal = 5 // 完成 + OrderSubStatusCancel = 6 // 取消 ) type order struct { @@ -82,3 +93,26 @@ func (o *order) Submit(ctx context.Context, channelId string, args ArgsOrderSubm err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Submit", args, &reply) return } + +// LadingBill @Title 提单 +func (o *order) LadingBill(ctx context.Context, channelId string, args ArgsOrderSubmit) (reply ReplyOrderSubmit, err error) { + xClient, err := client.GetClient(o) + if err != nil { + return + } + err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Submit", args, &reply) + return +} + +type ArgsOrderClose struct { +} + +// Close @Title 关闭 +func (o *order) Close(ctx context.Context, channelId string, args ArgsOrderSubmit) (reply ReplyOrderSubmit, err error) { + xClient, err := client.GetClient(o) + if err != nil { + return + } + err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Submit", args, &reply) + return +}