From d841f5ab5c6307f65c941f7192852919ff68dd93 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 3 Mar 2023 17:23:53 +0800 Subject: [PATCH 01/11] 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 02/11] 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 03/11] =?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 04/11] =?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 05/11] =?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 06/11] =?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 07/11] =?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 08/11] =?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"` From 680b3a08b09cf5ac81aeaa13fa20c58aeea1c826 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 15 Mar 2023 13:07:42 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B4=B9=E7=8E=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/audit.go | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/customer/service/audit.go b/customer/service/audit.go index db1bbdb..f460715 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -180,3 +180,48 @@ func (a *audit) GetProof(ctx context.Context, userServiceId uint) (reply ReplyPr err = xClient.Call(ctx, "GetProof", userServiceId, &reply) return } + +type ArgsRateChange struct { + UserServiceId uint // 客户服务id + ChangeUserId uint // 修改人id + NewRateId uint // 新费率id +} + +// Change @Title 修改费率 +func (a *audit) Change(ctx context.Context, args ArgsRateChange) (err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + reply := 0 + err = xClient.Call(ctx, "Change", args, &reply) + return +} + +type ArgsRateChangeHistory struct { + UserId int + Page bean.Page +} + +type ReplyRateChangeHistory struct { + Lists []RateChangeHistoryItem `json:"lists"` + Total int64 `json:"total"` +} + +type RateChangeHistoryItem struct { + Id uint `json:"id"` + UserId uint `json:"userId"` // 用户id + ChangeUserId uint `json:"changeUserId"` // 修改人 + OldRateId uint `json:"oldRateId"` // 老费率 + NewRateId uint `json:"newRateId"` // 新费率 +} + +// RateChangeHistory @Title 服务修改记录 +func (a *audit) RateChangeHistory(ctx context.Context, args ArgsRateChangeHistory) (reply ReplyRateChangeHistory, err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + err = xClient.Call(ctx, "RateChangeHistory", args, &reply) + return +} From 5df631cae5971ee552fd6b3ce838ed8aeed3e5b3 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 15 Mar 2023 13:23:41 +0800 Subject: [PATCH 10/11] =?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.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customer/service/audit.go b/customer/service/audit.go index f460715..13e51e1 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -199,7 +199,7 @@ func (a *audit) Change(ctx context.Context, args ArgsRateChange) (err error) { } type ArgsRateChangeHistory struct { - UserId int + UserId uint Page bean.Page } From bf6c9898c582bcd00a9b5dde091c83a8aa3ede3e Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 15 Mar 2023 13:27:03 +0800 Subject: [PATCH 11/11] =?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.go | 1 + 1 file changed, 1 insertion(+) diff --git a/customer/service/audit.go b/customer/service/audit.go index 13e51e1..6e7e78b 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -212,6 +212,7 @@ type RateChangeHistoryItem struct { Id uint `json:"id"` UserId uint `json:"userId"` // 用户id ChangeUserId uint `json:"changeUserId"` // 修改人 + ServiceId uint `json:"serviceId"` // 服务id OldRateId uint `json:"oldRateId"` // 老费率 NewRateId uint `json:"newRateId"` // 新费率 }