Merge branch 'master' of git.oa00.com:supply-chain/service

customer/service/audit.go

@@ -34,6 +34,7 @@ type AuditItem struct {
 	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"`

customer/user/deposit.go

@@ -10,8 +10,8 @@ type deposit struct {
 }
 type applyType uint // 申请人类型
 const (
-	ApplyTypeCustomer = 1 // 客户
+	ApplyTypePlatform = 1 // 平台
-	ApplyTypePlatform = 2 // 平台
+	ApplyTypeCustomer = 2 // 客户
 
 	DepositAuditStatusWait   = 1 // 待审核
 	DepositAuditStatusAdopt  = 2 // 审核通过

jd/task.go

@@ -41,6 +41,7 @@ func (t *task) RefreshToken(ctx context.Context) error {
 type ReplySkuAddStatus struct {
 	Total     uint
 	Count     uint
+	StartTime int64
 }
 
 // GetSkuAddStatus @Title 获取同步状态

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)
+}

supplier/supplier.go

@@ -17,6 +17,7 @@ type Supplier struct {
 	LogisticsCompany logisticsCompany
 	ReturnAddress    returnAddress
 	Afs              afs
+	AfsAudit         afsAudit
 	BatchGoods       batch.Goods
 }