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

customer/service/audit.go

@@ -7,6 +7,12 @@ import (
 	"time"
 )
 
+const (
+	AuditHistoryAuditStatusNone   = 1 // 待审核
+	AuditHistoryAuditStatusAdopt  = 2 // 审核通过
+	AuditHistoryAuditStatusReject = 3 // 审核驳回
+)
+
 type audit struct {
 }
 type AuditSearch struct {
@@ -45,13 +51,15 @@ func (a *audit) Lists(ctx context.Context, args ArgsAuditLists) (reply ReplyAudi
 }
 
 type ArgsHistory struct {
-	Page       bean.Page
-	CustomerId uint
+	Page        bean.Page
+	CustomerId  uint
+	AuditStatus uint
 }
 
 type ReplyHistoryLists struct {
-	Lists []HistoryItem `json:"lists"`
-	Total int64         `json:"total"`
+	Lists       []HistoryItem `json:"lists"`
+	Total       int64         `json:"total"`
+	AuditStatus uint          `json:"auditStatus"` // 审核状态
 }
 
 type HistoryItem struct {

supply/skuAudit.go

@@ -31,6 +31,7 @@ type SkuAuditEsSearch struct {
 	SourceSonId      uint            // 沙马供应商的供应商
 	AdjustType       uint            // 加价类型
 	Status           uint            // 状态 1=未审核 2=通过 3=驳回
+	BrandName        string          // 品牌名称
 	AfterMinDiscount decimal.Decimal // 加价后最低折扣
 	AfterMaxDiscount decimal.Decimal // 加价后最高折扣
 }