From 9a80c0bfca819a83ffb4dfc6caac252407cac403 Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 27 Feb 2023 16:58:06 +0800 Subject: [PATCH 01/18] =?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/afterService.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supply/afterService.go b/supply/afterService.go index 6599b80..3f5799f 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -230,6 +230,7 @@ type ReplyAfterServiceDetail struct { PackageSend uint `json:"packageSend"` AfsPackageSend AfsPackageSend `json:"afsPackageSend"` OrderSubSn uint64 `json:"orderSubSn"` + SourceOrderSubSn string `json:"sourceOrderSubSn"` SourceId uint `json:"sourceId"` ChannelId uint `json:"channelId"` } From 6839e6a9336f96f918430328ed08aa3c7edcf2f5 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 28 Feb 2023 17:37:18 +0800 Subject: [PATCH 02/18] bug fix --- supply/afterService.go | 49 ++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index 3f5799f..cb86f78 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -208,34 +208,31 @@ func (a *afterService) NewOrder(ctx context.Context, args ArgsAfterServiceNewOrd type ReplyAfterServiceDetail struct { Id uint `json:"id"` - AfsSn string `json:"afsSn"` - Status uint `json:"status"` - ApproveNotes string `json:"approveNotes"` - Result string `json:"result"` - CreatedAt int64 `json:"createdAt"` - UpdatedAt int64 `json:"updatedAt"` - SkuName string `json:"skuName"` - ImgUrl string `json:"imgUrl"` - SkuId uint `json:"skuId"` - SupplySkuId uint `json:"supplySkuId"` - Price decimal.Decimal `json:"price"` - SupplyPrice decimal.Decimal `json:"supplyPrice"` - Quantity uint `json:"quantity"` - HopeTypeName string `json:"hopeTypeName"` - TypeReasonName string `json:"typeReasonName"` - Imgs []string `json:"imgs"` - LogisticsCompany string `json:"logisticsCompany"` - WaybillCode string `json:"waybillCode"` - SendAt int64 `json:"sendAt"` - PackageSend uint `json:"packageSend"` - AfsPackageSend AfsPackageSend `json:"afsPackageSend"` - OrderSubSn uint64 `json:"orderSubSn"` - SourceOrderSubSn string `json:"sourceOrderSubSn"` - SourceId uint `json:"sourceId"` - ChannelId uint `json:"channelId"` + AfsSn string `json:"afsSn"` // 售后单号 + Status uint `json:"status"` // 状态 + ApproveNotes string `json:"approveNotes"` // 备注 + Result string `json:"result"` // 处理结果 + CreatedAt int64 `json:"createdAt"` // 创建时间 + UpdatedAt int64 `json:"updatedAt"` // 更新时间 + SkuName string `json:"skuName"` // 商品名称 + ImgUrl string `json:"imgUrl"` // 商品图片 + SkuId uint `json:"skuId"` // skuId + SupplySkuId uint `json:"supplySkuId"` // 供应商skuId + Price decimal.Decimal `json:"price"` // 采购单价 + SupplyPrice decimal.Decimal `json:"supplyPrice"` // 供货价 + Quantity uint `json:"quantity"` // 数量 + HopeTypeName string `json:"hopeTypeName"` // 期望售后类型 + TypeReasonName string `json:"typeReasonName"` // 售后原因 + Imgs []string `json:"imgs"` // 售后图片 + PackageSend uint `json:"packageSend"` // 发货状态 + AfsPackageSend AfsPackageSend `json:"afsPackageSend"` // 售后信息 + OrderSubSn uint64 `json:"orderSubSn"` // 订单号 + SourceOrderSubSn string `json:"sourceOrderSubSn"` // 供应商的订单号 + SourceId uint `json:"sourceId"` // 供应商id + ChannelId uint `json:"channelId"` // 客户id } type AfsPackageSend struct { - Name string `json:"name"` + Name string `json:"name"` // Mobile string `json:"mobile"` ZipCode string `json:"zipCode"` Address string `json:"address"` From 4b6858698403915771e1a031ccb188e07b9e2a75 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 1 Mar 2023 09:17:17 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/afterService.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index cb86f78..ba58537 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -232,13 +232,13 @@ type ReplyAfterServiceDetail struct { ChannelId uint `json:"channelId"` // 客户id } type AfsPackageSend struct { - Name string `json:"name"` // - Mobile string `json:"mobile"` + Name string `json:"name"` // 售后收件人 + Mobile string `json:"mobile"` /// 售后手机号 ZipCode string `json:"zipCode"` - Address string `json:"address"` - LogisticsCompany string `json:"logisticsCompany"` - WaybillCode string `json:"waybillCode"` - SendGoodsDate int64 `json:"sendGoodsDate"` + Address string `json:"address"` // 售后地址 + LogisticsCompany string `json:"logisticsCompany"` // 快递公司 + WaybillCode string `json:"waybillCode"` // 运单号 + SendGoodsDate int64 `json:"sendGoodsDate"` // 发货时间 } // Detail @Title 售后详情 From d3b80ee32097eb1a6bc64efb2402748c82fd0f75 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 1 Mar 2023 09:32:22 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/afs.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supplier/afs.go b/supplier/afs.go index f64b017..a2a709b 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -87,6 +87,7 @@ type AfsPackageSend struct { LogisticsCompany string `json:"logisticsCompany"` WaybillCode string `json:"waybillCode"` SendGoodsDate int64 `json:"sendGoodsDate"` + Address string `json:"address"` } // Detail @Title 售后详情 From 93716d166a8399bb83ce2605db385256d340e8e7 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 1 Mar 2023 15:30:39 +0800 Subject: [PATCH 05/18] bug fix --- supply/afterService.go | 48 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index ba58537..9d6e8e7 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -207,29 +207,31 @@ func (a *afterService) NewOrder(ctx context.Context, args ArgsAfterServiceNewOrd } type ReplyAfterServiceDetail struct { - Id uint `json:"id"` - AfsSn string `json:"afsSn"` // 售后单号 - Status uint `json:"status"` // 状态 - ApproveNotes string `json:"approveNotes"` // 备注 - Result string `json:"result"` // 处理结果 - CreatedAt int64 `json:"createdAt"` // 创建时间 - UpdatedAt int64 `json:"updatedAt"` // 更新时间 - SkuName string `json:"skuName"` // 商品名称 - ImgUrl string `json:"imgUrl"` // 商品图片 - SkuId uint `json:"skuId"` // skuId - SupplySkuId uint `json:"supplySkuId"` // 供应商skuId - Price decimal.Decimal `json:"price"` // 采购单价 - SupplyPrice decimal.Decimal `json:"supplyPrice"` // 供货价 - Quantity uint `json:"quantity"` // 数量 - HopeTypeName string `json:"hopeTypeName"` // 期望售后类型 - TypeReasonName string `json:"typeReasonName"` // 售后原因 - Imgs []string `json:"imgs"` // 售后图片 - PackageSend uint `json:"packageSend"` // 发货状态 - AfsPackageSend AfsPackageSend `json:"afsPackageSend"` // 售后信息 - OrderSubSn uint64 `json:"orderSubSn"` // 订单号 - SourceOrderSubSn string `json:"sourceOrderSubSn"` // 供应商的订单号 - SourceId uint `json:"sourceId"` // 供应商id - ChannelId uint `json:"channelId"` // 客户id + Id uint `json:"id"` + AfsSn string `json:"afsSn"` // 售后单号 + Status uint `json:"status"` // 状态 + ApproveNotes string `json:"approveNotes"` // 备注 + Result string `json:"result"` // 处理结果 + CreatedAt int64 `json:"createdAt"` // 创建时间 + UpdatedAt int64 `json:"updatedAt"` // 更新时间 + SkuName string `json:"skuName"` // 商品名称 + ImgUrl string `json:"imgUrl"` // 商品图片 + SkuId uint `json:"skuId"` // skuId + SupplySkuId uint `json:"supplySkuId"` // 供应商skuId + Price decimal.Decimal `json:"price"` // 采购单价 + SupplyPrice decimal.Decimal `json:"supplyPrice"` // 供货价 + Quantity uint `json:"quantity"` // 数量 + HopeTypeName string `json:"hopeTypeName"` // 期望售后类型 + TypeReasonName string `json:"typeReasonName"` // 售后原因 + Imgs []string `json:"imgs"` // 售后图片 + PackageSend uint `json:"packageSend"` // 发货状态 + AfsPackageSend AfsPackageSend `json:"afsPackageSend"` // 售后信息 + OrderSubSn uint64 `json:"orderSubSn"` // 订单号 + SourceOrderSubSn string `json:"sourceOrderSubSn"` // 供应商的订单号 + SourceId uint `json:"sourceId"` // 供应商id + ChannelId uint `json:"channelId"` // 客户id + NewOrderSubSn string `json:"newOrderSubSn"` // 新订单信息 + NewSourceOrderSubSn string `json:"newSourceOrderSubSn"` // 新供应商订单信息 } type AfsPackageSend struct { Name string `json:"name"` // 售后收件人 From cad951d5e45a2374f324eb0d8f1ec1a6a74ed189 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 1 Mar 2023 15:40:00 +0800 Subject: [PATCH 06/18] =?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/afs.go | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/supplier/afs.go b/supplier/afs.go index a2a709b..0e9b367 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -54,31 +54,31 @@ func (a *afs) Lists(ctx context.Context, args ArgsAfsLists) (reply ReplyAfsLists } type ReplyAfsDetail struct { - Id uint `json:"id"` - AuditId uint `json:"auditId"` - AfsSn string `json:"afsSn"` - Status uint `json:"status"` - AuditStatus uint `json:"auditStatus"` - ApproveNotes string `json:"approveNotes"` - Result string `json:"result"` - CreatedAt int64 `json:"createdAt"` - UpdatedAt int64 `json:"updatedAt"` - SkuName string `json:"skuName"` - ImgUrl string `json:"imgUrl"` - SkuId uint `json:"skuId"` - Price decimal.Decimal `json:"price"` - Quantity uint `json:"quantity"` - HopeTypeName string `json:"hopeTypeName"` - TypeReasonName string `json:"typeReasonName"` - Imgs []string `json:"imgs"` - LogisticsCompany string `json:"logisticsCompany"` - WaybillCode string `json:"waybillCode"` - SendAt int64 `json:"sendAt"` - NewOrderSn string `json:"newOrderSn"` - RefundFee decimal.Decimal `json:"refundFee"` - PackageSend uint `json:"packageSend"` - AfsPackageSend AfsPackageSend `json:"afsPackageSend"` - ReturnAddress ReturnAddressItem `json:"returnAddress"` + Id uint `json:"id"` + AuditId uint `json:"auditId"` // 审核Id + AfsSn string `json:"afsSn"` // 售后单号 + Status uint `json:"status"` // 售后状态 + AuditStatus uint `json:"auditStatus"` // 主管审核状态 + ApproveNotes string `json:"approveNotes"` // 备注 + Result string `json:"result"` // 处理结果 + CreatedAt int64 `json:"createdAt"` // 创建时间 + UpdatedAt int64 `json:"updatedAt"` // 更新时间 + SkuName string `json:"skuName"` // 商品名称 + ImgUrl string `json:"imgUrl"` // 商品图片 + SkuId uint `json:"skuId"` // 商品Id + Price decimal.Decimal `json:"price"` // 商品单价 + Quantity uint `json:"quantity"` // 数量 + HopeTypeName string `json:"hopeTypeName"` // 期望售后类型 + TypeReasonName string `json:"typeReasonName"` // 售后原因 + Imgs []string `json:"imgs"` // 售后图片 + RefundFee decimal.Decimal `json:"refundFee"` // 退款金额 + PackageSend uint `json:"packageSend"` // 发货状态 + AfsPackageSend AfsPackageSend `json:"afsPackageSend"` // 售后物流信息 + SourceName string `json:"sourceName"` // 所属供应商 + OrderSubSn string `json:"orderSubSn"` // 沙马订单号 + NewOrderSubSn string `json:"newOrderSubSn"` // 新订单号 + SupplyOrderSubSn string `json:"supplyOrderSubSn"` // 供应链订单号 + NewSupplyOrderSn string `json:"newSupplyOrderSn"` // 供应链新订单号 } type AfsPackageSend struct { From 0f937e383de55a560814ebe2aaa28f2bb6ae619f Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Mar 2023 09:24:15 +0800 Subject: [PATCH 07/18] bug fix --- supplier/afsAudit.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go index a0e6f6a..4427f52 100644 --- a/supplier/afsAudit.go +++ b/supplier/afsAudit.go @@ -124,7 +124,6 @@ func (a *afsAudit) Info(ctx context.Context, afsAuditId uint) (reply ReplyAfsDet if err != nil { return } - args := 0 - err = xClient.Call(ctx, "Info", args, &reply) + err = xClient.Call(ctx, "Info", afsAuditId, &reply) return } From 0673b99ce5a866ceb212e1895c36c04a7191cc80 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Mar 2023 10:13:36 +0800 Subject: [PATCH 08/18] bug fix --- supply/afterService.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/supply/afterService.go b/supply/afterService.go index 9d6e8e7..427547f 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -232,6 +232,12 @@ type ReplyAfterServiceDetail struct { ChannelId uint `json:"channelId"` // 客户id NewOrderSubSn string `json:"newOrderSubSn"` // 新订单信息 NewSourceOrderSubSn string `json:"newSourceOrderSubSn"` // 新供应商订单信息 + ReceiverName string `json:"receiverName"` // 收件人名称 + ReceiverPhone string `json:"receiverPhone"` // 收件手机号 + ReceiverAddress string `json:"receiverAddress"` // 收件人地址 + StockOutAt int64 `json:"stockOutAt"` // 订单发货时间 + RefundFee decimal.Decimal `json:"refundFee"` // 沙马退款金额 + SourceRefundFee decimal.Decimal `json:"sourceRefundFee"` // 供应商退款金额 } type AfsPackageSend struct { Name string `json:"name"` // 售后收件人 From 1f130d6738a6f83ee96eea785648f962c8fe8c51 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Mar 2023 16:26:57 +0800 Subject: [PATCH 09/18] =?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/afs.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supplier/afs.go b/supplier/afs.go index 0e9b367..dcdd52c 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -79,6 +79,7 @@ type ReplyAfsDetail struct { NewOrderSubSn string `json:"newOrderSubSn"` // 新订单号 SupplyOrderSubSn string `json:"supplyOrderSubSn"` // 供应链订单号 NewSupplyOrderSn string `json:"newSupplyOrderSn"` // 供应链新订单号 + Address string `json:"address"` // 售后退货地址 } type AfsPackageSend struct { From 525a7dea81f2ec5f569ff27c7f26307a7b757f47 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 3 Mar 2023 13:37:39 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E4=B8=80=E4=BB=B6=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/skuAudit.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/supply/skuAudit.go b/supply/skuAudit.go index 6ab7a1b..ec62cbf 100644 --- a/supply/skuAudit.go +++ b/supply/skuAudit.go @@ -108,6 +108,16 @@ func (s *skuAudit) Adopt(ctx context.Context, args ArgsSkuAuditAdopt) error { return xClient.Call(ctx, "Adopt", args, &reply) } +// AdoptAll @Title 全部审核通过 +func (s *skuAudit) AdoptAll(ctx context.Context, auditUserId uint) error { + reply := 0 + xClient, err := client.GetClient(s) + if err != nil { + return err + } + return xClient.Call(ctx, "AdoptAll", auditUserId, &reply) +} + type ArgsSkuAuditReject struct { AuditUserId uint // 审核人 AuditIds []uint // 审核单id From d841f5ab5c6307f65c941f7192852919ff68dd93 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 3 Mar 2023 17:23:53 +0800 Subject: [PATCH 11/18] bug fix --- supplier/afs.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/supplier/afs.go b/supplier/afs.go index dcdd52c..10f5e4c 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -144,6 +144,17 @@ func (a *afs) Reject(ctx context.Context, args ArgsAfsReject) (err error) { return } +// ForcedClose @Title 强制关单 +func (a *afs) ForcedClose(ctx context.Context, args ArgsAfsReject) (err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + reply := 0 + err = xClient.Call(ctx, "ForcedClose", args, &reply) + return +} + type ArgsAfsDeliver struct { AfsSn string `json:"afsSn"` ReturnAddressId uint `json:"returnAddressId"` From 4abaaddb4d24830857eea53b70be8b0aaca33ea1 Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 6 Mar 2023 15:34:51 +0800 Subject: [PATCH 12/18] bug fix --- supplier/afs.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supplier/afs.go b/supplier/afs.go index 10f5e4c..feff909 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -41,6 +41,7 @@ type AfsItem struct { CreatedAt int64 `json:"createdAt"` UpdatedAt int64 `json:"updatedAt"` ReturnAddress []ReturnAddressItem `json:"returnAddress"` + Notes string `json:"notes"` } // Lists @Title 售后列表 From 488ac8882bd683153ab658825274b50c720aeadf Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 6 Mar 2023 15:59:56 +0800 Subject: [PATCH 13/18] =?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/afs.go | 53 +++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/supplier/afs.go b/supplier/afs.go index feff909..d99a07d 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -55,32 +55,33 @@ func (a *afs) Lists(ctx context.Context, args ArgsAfsLists) (reply ReplyAfsLists } type ReplyAfsDetail struct { - Id uint `json:"id"` - AuditId uint `json:"auditId"` // 审核Id - AfsSn string `json:"afsSn"` // 售后单号 - Status uint `json:"status"` // 售后状态 - AuditStatus uint `json:"auditStatus"` // 主管审核状态 - ApproveNotes string `json:"approveNotes"` // 备注 - Result string `json:"result"` // 处理结果 - CreatedAt int64 `json:"createdAt"` // 创建时间 - UpdatedAt int64 `json:"updatedAt"` // 更新时间 - SkuName string `json:"skuName"` // 商品名称 - ImgUrl string `json:"imgUrl"` // 商品图片 - SkuId uint `json:"skuId"` // 商品Id - Price decimal.Decimal `json:"price"` // 商品单价 - Quantity uint `json:"quantity"` // 数量 - HopeTypeName string `json:"hopeTypeName"` // 期望售后类型 - TypeReasonName string `json:"typeReasonName"` // 售后原因 - Imgs []string `json:"imgs"` // 售后图片 - RefundFee decimal.Decimal `json:"refundFee"` // 退款金额 - PackageSend uint `json:"packageSend"` // 发货状态 - AfsPackageSend AfsPackageSend `json:"afsPackageSend"` // 售后物流信息 - SourceName string `json:"sourceName"` // 所属供应商 - OrderSubSn string `json:"orderSubSn"` // 沙马订单号 - NewOrderSubSn string `json:"newOrderSubSn"` // 新订单号 - SupplyOrderSubSn string `json:"supplyOrderSubSn"` // 供应链订单号 - NewSupplyOrderSn string `json:"newSupplyOrderSn"` // 供应链新订单号 - Address string `json:"address"` // 售后退货地址 + Id uint `json:"id"` + AuditId uint `json:"auditId"` // 审核Id + AfsSn string `json:"afsSn"` // 售后单号 + Status uint `json:"status"` // 售后状态 + AuditStatus uint `json:"auditStatus"` // 主管审核状态 + ApproveNotes string `json:"approveNotes"` // 备注 + Result string `json:"result"` // 处理结果 + CreatedAt int64 `json:"createdAt"` // 创建时间 + UpdatedAt int64 `json:"updatedAt"` // 更新时间 + SkuName string `json:"skuName"` // 商品名称 + ImgUrl string `json:"imgUrl"` // 商品图片 + SkuId uint `json:"skuId"` // 商品Id + Price decimal.Decimal `json:"price"` // 商品单价 + Quantity uint `json:"quantity"` // 数量 + HopeTypeName string `json:"hopeTypeName"` // 期望售后类型 + TypeReasonName string `json:"typeReasonName"` // 售后原因 + Imgs []string `json:"imgs"` // 售后图片 + RefundFee decimal.Decimal `json:"refundFee"` // 退款金额 + PackageSend uint `json:"packageSend"` // 发货状态 + AfsPackageSend AfsPackageSend `json:"afsPackageSend"` // 售后物流信息 + SourceName string `json:"sourceName"` // 所属供应商 + OrderSubSn string `json:"orderSubSn"` // 沙马订单号 + NewOrderSubSn string `json:"newOrderSubSn"` // 新订单号 + SupplyOrderSubSn string `json:"supplyOrderSubSn"` // 供应链订单号 + NewSupplyOrderSn string `json:"newSupplyOrderSn"` // 供应链新订单号 + Address string `json:"address"` // 售后退货地址 + ReturnAddress []ReturnAddressItem `json:"returnAddress"` // 退货地址列表 } type AfsPackageSend struct { From 29832c5c1cd28838769bd3c28dd7d77be10d08af Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 7 Mar 2023 10:44:58 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0rpc=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E9=9B=B6=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E8=8E=B7=E5=8F=96=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/supplier.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/supplier/supplier.go b/supplier/supplier.go index 306f22f..0862e2f 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -132,6 +132,16 @@ func (s *supplier) InfoByBatchOrderSn(ctx context.Context, batchOrderSn string) return } +// InfoByRetailOrderSn @Title 通过零售订单获取供应商信息 +func (s *supplier) InfoByRetailOrderSn(ctx context.Context, retailOrderSn string) (reply ReplySupplierInfo, err error) { + xClient, err := client.GetClient(s) + if err != nil { + return ReplySupplierInfo{}, err + } + err = xClient.Call(ctx, "InfoByRetailOrderSn", retailOrderSn, &reply) + return +} + type ArgsSupplierEdit struct { SupplierId uint SupplierName string // 供应商名称 From 87e59e2fee3c9da8f1e3f96a2b804f5d081aa925 Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 9 Mar 2023 14:31:17 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=85=A5=E9=A9=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/enterprise.go | 115 +++++++++++++++++++++++++++++++++++++++++ supplier/supplier.go | 1 + 2 files changed, 116 insertions(+) create mode 100644 supplier/enterprise.go diff --git a/supplier/enterprise.go b/supplier/enterprise.go new file mode 100644 index 0000000..f5635ce --- /dev/null +++ b/supplier/enterprise.go @@ -0,0 +1,115 @@ +package supplier + +import ( + "context" + "git.oa00.com/supply-chain/service/client" + "git.oa00.com/supply-chain/service/lib/bean" +) + +const ( + EnterpriseAuditStatusNone = 1 // 未审核 + EnterpriseAuditStatusAdopt = 2 // 通过 + EnterpriseAuditStatusReject = 3 // 驳回 +) + +type enterprise struct { +} +type ArgsEnterpriseLists struct { + bean.Page +} +type EnterpriseSearch struct { + Name string // 企业名称 + AuditStatus uint // 审核状态 1=待审核 2=通过 3=驳回 +} +type ReplyEnterpriseLists struct { + Lists []EnterpriseItem `json:"lists"` + Total int64 `json:"total"` +} +type EnterpriseItem struct { + Id uint `json:"id"` + Name string `json:"name"` + CreatedAt int64 `json:"createdAt"` + AuditStatus uint `json:"auditStatus"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` +} + +// Lists @Title 审核列表 +func (e *enterprise) Lists(ctx context.Context, args ArgsEnterpriseLists) (reply ReplyEnterpriseLists, err error) { + xClient, err := client.GetClient(e) + if err != nil { + return ReplyEnterpriseLists{}, err + } + err = xClient.Call(ctx, "Lists", args, &reply) + return +} + +type ReplyEnterpriseInfo struct { + Id uint `json:"id"` + AuditStatus uint `json:"auditStatus"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` + Reason string `json:"reason"` + Name string `json:"name"` + BusinessAddress string `json:"businessAddress"` + LegalPersonName string `json:"legalPersonName"` + PayTaxes uint `json:"payTaxes"` + TaxNumber string `json:"taxNumber"` + BankName string `json:"bankName"` + BankCode string `json:"bankCode"` + BankAddress string `json:"bankAddress"` + Phone string `json:"phone"` + CreatedAt int64 `json:"createdAt"` + BusinessLicense string `json:"businessLicense"` + IdPhotoFront string `json:"idPhotoFront"` + IdPhotoBack string `json:"idPhotoBack"` + AccountPhoto string `json:"accountPhoto"` + ContactName string `json:"contactName"` + ContactEmail string `json:"contactEmail"` + ContactPhone string `json:"contactPhone"` + Position string `json:"position"` +} + +// Info @Title 审核详情 +func (e *enterprise) Info(ctx context.Context, enterpriseId uint) (reply ReplyEnterpriseInfo, err error) { + xClient, err := client.GetClient(e) + if err != nil { + return ReplyEnterpriseInfo{}, err + } + err = xClient.Call(ctx, "Info", enterpriseId, &reply) + return +} + +type ArgsEnterpriseAdopt struct { + AuditUserId uint // 审核人id + EnterpriseId uint // 企业id + Account string // 账号 + Password string // 密码 + PayType uint +} + +// Adopt @Title 审核通过 +func (e *enterprise) Adopt(ctx context.Context, args ArgsEnterpriseAdopt) error { + xClient, err := client.GetClient(e) + if err != nil { + return err + } + reply := 0 + return xClient.Call(ctx, "Adopt", args, &reply) +} + +type ArgsEnterpriseReject struct { + AuditUserId uint // 审核人id + EnterpriseId uint // 企业id + Reason string // 驳回原因 +} + +// Reject @Title 审核驳回 +func (e *enterprise) Reject(ctx context.Context, args ArgsEnterpriseReject) error { + xClient, err := client.GetClient(e) + if err != nil { + return err + } + reply := 0 + return xClient.Call(ctx, "Reject", args, &reply) +} diff --git a/supplier/supplier.go b/supplier/supplier.go index 0862e2f..7f2efe0 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -19,6 +19,7 @@ type Supplier struct { Afs afs AfsAudit afsAudit BatchGoods batch.Goods + Enterprise enterprise } type supplier struct { From ddb541b3c4e52010cb14c5d3715608b939178e1c Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 9 Mar 2023 15:19:22 +0800 Subject: [PATCH 16/18] =?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/enterprise.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/supplier/enterprise.go b/supplier/enterprise.go index f5635ce..3fb8aae 100644 --- a/supplier/enterprise.go +++ b/supplier/enterprise.go @@ -15,7 +15,8 @@ const ( type enterprise struct { } type ArgsEnterpriseLists struct { - bean.Page + Search EnterpriseSearch + Page bean.Page } type EnterpriseSearch struct { Name string // 企业名称 From 74a1397907722bba09908b6280374f8fd228642a Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 9 Mar 2023 16:25:36 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/enterprise.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplier/enterprise.go b/supplier/enterprise.go index 3fb8aae..4a5e629 100644 --- a/supplier/enterprise.go +++ b/supplier/enterprise.go @@ -86,7 +86,7 @@ type ArgsEnterpriseAdopt struct { EnterpriseId uint // 企业id Account string // 账号 Password string // 密码 - PayType uint + PayType uint // 结算类型 1=预付款 2=月结 } // Adopt @Title 审核通过 From a5e34fef6bf23f0480941367e54ed0db92c99313 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Mar 2023 11:18:28 +0800 Subject: [PATCH 18/18] =?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/enterprise.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supplier/enterprise.go b/supplier/enterprise.go index 4a5e629..ffa6821 100644 --- a/supplier/enterprise.go +++ b/supplier/enterprise.go @@ -52,6 +52,7 @@ type ReplyEnterpriseInfo struct { AuditAt int64 `json:"auditAt"` Reason string `json:"reason"` Name string `json:"name"` + CreditCode string `json:"creditCode"` BusinessAddress string `json:"businessAddress"` LegalPersonName string `json:"legalPersonName"` PayTaxes uint `json:"payTaxes"`