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

customer/service/audit.go

@@ -44,3 +44,31 @@ func (a *audit) Lists(ctx context.Context, args ArgsAuditLists) (reply ReplyAudi
 	err = xClient.Call(ctx, "Lists", args, &reply)
 	return
 }
+
+type ArgsHistory struct {
+	Page       bean.Page
+	CustomerId uint
+}
+
+type ReplyHistoryLists struct {
+	Lists []HistoryItem `json:"lists"`
+	Total int64         `json:"total"`
+}
+
+type HistoryItem struct {
+	ServiceId    uint   `json:"serviceId"`
+	Remark       string `json:"remark"`
+	ExpirationAt int64  `json:"expirationAt"`
+	ApplyAt      int64  `json:"applyAt"`
+	AuditStatus  uint   `json:"auditStatus"`
+}
+
+// History @Title 服务申请记录
+func (a *audit) History(ctx context.Context, args ArgsHistory) (reply ReplyHistoryLists, err error) {
+	xClient, err := client.GetClient(a)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "History", args, &reply)
+	return
+}

customer/service/service.go

@@ -35,3 +35,19 @@ func (s *service) All(ctx context.Context, customerId uint) (reply []ReplyServic
 	err = xClient.Call(ctx, "All", customerId, &reply)
 	return
 }
+
+type ReplyServiceSelect struct {
+	Id   uint   `json:"id"`
+	Name string `json:"name"`
+}
+
+// Select @Title 服务筛选
+func (s *service) Select(ctx context.Context) (reply []ReplyServiceSelect, err error) {
+	xClient, err := client.GetClient(s)
+	if err != nil {
+		return
+	}
+	args := 0
+	err = xClient.Call(ctx, "Select", args, &reply)
+	return
+}

customer/sku/sale.go

@@ -90,3 +90,13 @@ func (s *sale) DelAll(ctx context.Context) error {
 	reply := 0
 	return xClient.Call(ctx, "DelAll", args, &reply)
 }
+
+// FindBySkuIds @Title 根据SkuId查询数据
+func (s *sale) FindBySkuIds(ctx context.Context, skuIds []uint) (reply []SaleSkuItem, err error) {
+	xClient, err := client.GetClient(s)
+	if err != nil {
+		return nil, err
+	}
+	err = xClient.Call(ctx, "FindBySkuIds", skuIds, &reply)
+	return
+}