From 566f34d7ccab94c49a49f179ac496c787c055482 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 7 Feb 2023 11:36:14 +0800 Subject: [PATCH 1/4] =?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 | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/customer/service/audit.go b/customer/service/audit.go index 54a06c7..6400b25 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -28,16 +28,17 @@ type ArgsAuditLists struct { Page bean.Page // 分页 } type AuditItem struct { - Id uint `json:"id"` - ServiceId uint `json:"serviceId"` - UserId uint `json:"userId"` - UserName string `json:"userName"` - ServiceName string `json:"serviceName"` - ApplyUserId uint `json:"applyUserId"` - ApplyAt int64 `json:"applyAt"` - AuditStatus uint `json:"auditStatus"` - AuditUserId uint `json:"auditUserId"` - AuditAt int64 `json:"auditAt"` + Id uint `json:"id"` + ServiceId uint `json:"serviceId"` + UserId uint `json:"userId"` + UserName string `json:"userName"` + ServiceName string `json:"serviceName"` + ApplyUserId uint `json:"applyUserId"` + ApplyUserName string `json:"applyUserName"` + ApplyAt int64 `json:"applyAt"` + AuditStatus uint `json:"auditStatus"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` } type ReplyAuditLists struct { Lists []AuditItem `json:"lists"` From 5aee1c159a6cccb58313997984aa3a4d37d530d2 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 7 Feb 2023 11:46:44 +0800 Subject: [PATCH 2/4] =?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 | 22 +++++++++++----------- customer/user/deposit.go | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/customer/service/audit.go b/customer/service/audit.go index 6400b25..db1bbdb 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -28,17 +28,17 @@ type ArgsAuditLists struct { Page bean.Page // 分页 } type AuditItem struct { - Id uint `json:"id"` - ServiceId uint `json:"serviceId"` - UserId uint `json:"userId"` - UserName string `json:"userName"` - ServiceName string `json:"serviceName"` - ApplyUserId uint `json:"applyUserId"` - ApplyUserName string `json:"applyUserName"` - ApplyAt int64 `json:"applyAt"` - AuditStatus uint `json:"auditStatus"` - AuditUserId uint `json:"auditUserId"` - AuditAt int64 `json:"auditAt"` + Id uint `json:"id"` + ServiceId uint `json:"serviceId"` + UserId uint `json:"userId"` + UserName string `json:"userName"` + ServiceName string `json:"serviceName"` + ApplyUserId uint `json:"applyUserId"` + ApplyType uint `json:"ApplyType"` + ApplyAt int64 `json:"applyAt"` + AuditStatus uint `json:"auditStatus"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` } type ReplyAuditLists struct { Lists []AuditItem `json:"lists"` diff --git a/customer/user/deposit.go b/customer/user/deposit.go index 6f6419f..0817029 100644 --- a/customer/user/deposit.go +++ b/customer/user/deposit.go @@ -10,8 +10,8 @@ type deposit struct { } type applyType uint // 申请人类型 const ( - ApplyTypeCustomer = 1 // 客户 - ApplyTypePlatform = 2 // 平台 + ApplyTypePlatform = 1 // 平台 + ApplyTypeCustomer = 2 // 客户 DepositAuditStatusWait = 1 // 待审核 DepositAuditStatusAdopt = 2 // 审核通过 From 55e2e6abdea194ca86fef34e5ca3424706eef0d5 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 8 Feb 2023 15:44:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jd/task.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jd/task.go b/jd/task.go index a8bf25c..5175506 100644 --- a/jd/task.go +++ b/jd/task.go @@ -39,8 +39,9 @@ func (t *task) RefreshToken(ctx context.Context) error { } type ReplySkuAddStatus struct { - Total uint - Count uint + Total uint + Count uint + StartTime int64 } // GetSkuAddStatus @Title 获取同步状态 From acb766a5f9d73155c1a26723f25b39fa356d9b0c Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 9 Feb 2023 17:15:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/afsAudit.go | 84 ++++++++++++++++++++++++++++++++++++++++++++ supplier/supplier.go | 1 + 2 files changed, 85 insertions(+) create mode 100644 supplier/afsAudit.go diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go new file mode 100644 index 0000000..300e201 --- /dev/null +++ b/supplier/afsAudit.go @@ -0,0 +1,84 @@ +package supplier + +import ( + "context" + "git.oa00.com/supply-chain/service/client" + "git.oa00.com/supply-chain/service/lib/bean" + "github.com/shopspring/decimal" +) + +type afsAudit struct { +} +type ArgsAfsAuditLists struct { + Search AfsAuditSearch + Page bean.Page +} +type AfsAuditSearch struct { + Status uint // 0=全部 1=待审核 2=审核通过 3=审核驳回 + AfsSn string + OrderSubSn string + CreatedStartDate string + CreatedEndDate string +} + +type ReplyAfsAuditLists struct { + Lists []AfsAuditItem + Total int64 +} +type AfsAuditItem struct { + Id uint `json:"id"` + AfsSn uint64 `json:"afsSn"` + OrderSubSn uint64 `json:"orderSubSn"` + Status uint `json:"status"` + Quantity uint `json:"quantity"` + OrderSubAfsId uint `json:"orderSubAfsId"` + RefundFee decimal.Decimal `json:"refundFee"` + Remark string `json:"remark"` + Result string `json:"result"` + Notes string `json:"notes"` + RefundId uint `json:"refundId"` + ApplyUserId uint `json:"applyUserId"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` +} + +// Lists @Title 售后审核列表 +func (a *afsAudit) Lists(ctx context.Context, args ArgsAfsLists) (reply ReplyAfsLists, err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + err = xClient.Call(ctx, "Lists", args, &reply) + return +} + +type ArgsAfsAuditAdopt struct { + AuditUserId uint + AfsAuditId uint +} + +// Adopt @Title 审核通过 +func (a *afsAudit) Adopt(ctx context.Context, args ArgsAfsAuditAdopt) error { + xClient, err := client.GetClient(a) + if err != nil { + return err + } + reply := 0 + return xClient.Call(ctx, "Adopt", args, &reply) +} + +type ArgsAfsAuditReject struct { + AuditUserId uint + Remark string + AfsAuditId uint +} + +// Reject @Title 审核驳回 +func (a *afsAudit) Reject(ctx context.Context, args ArgsAfsAuditReject) error { + xClient, err := client.GetClient(a) + 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 746c54d..306f22f 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -17,6 +17,7 @@ type Supplier struct { LogisticsCompany logisticsCompany ReturnAddress returnAddress Afs afs + AfsAudit afsAudit BatchGoods batch.Goods }