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

supply/channel/afterService.go

@@ -3,6 +3,7 @@ package channel
 import (
 	"context"
 	"git.oa00.com/supply-chain/service/client"
+	"git.oa00.com/supply-chain/service/lib/bean"
 	"github.com/smallnest/rpcx/share"
 )
 
@@ -134,3 +135,43 @@ func (a *afterService) Cancel(ctx context.Context, channelId string, afterServic
 	err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Cancel", afterServiceSn, &reply)
 	return
 }
+
+type AfterServiceSearch struct {
+	Name             string // 商品名称
+	OrderSn          string // 订单单号
+	AfsSn            string // 售后单号
+	CreatedDateStart string // 售后日期开始
+	CreatedDateEnd   string // 售后日期结束
+}
+type ArgsAfterServiceLists struct {
+	Search AfterServiceSearch
+	Page   bean.Page
+}
+type ReplyAfterServiceLists struct {
+	Lists []AfterServiceItem `json:"lists"`
+	Total int64              `json:"total"`
+}
+
+type AfterServiceItem struct {
+	Id             uint   `json:"id"`
+	AfsSn          string `json:"afsSn"`
+	OrderSubSn     string `json:"orderSubSn"`
+	Name           string `json:"name"`
+	ImgUrl         string `json:"imgUrl"`
+	Quantity       uint   `json:"quantity"`
+	TypeReasonName string `json:"typeReasonName"`
+	OrderSubId     uint   `json:"orderSubId"`
+	Status         uint   `json:"status"`
+	CreatedAt      int64  `json:"createdAt"`
+	UpdatedAt      int64  `json:"updatedAt"`
+}
+
+// Lists @Title 售后列表
+func (a *afterService) Lists(ctx context.Context, channelId string, args ArgsAfterServiceLists) (reply ReplyAfterServiceLists, err error) {
+	xClient, err := client.GetClient(a)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Lists", args, &reply)
+	return
+}

supply/order.go

@@ -168,6 +168,9 @@ type OrderSku struct {
 	Name        string          `json:"name"`
 	SupplyPrice decimal.Decimal `json:"supplyPrice"`
 	Rate        decimal.Decimal `json:"rate"`
+	Price       decimal.Decimal `json:"price"`
+	AdjustPrice decimal.Decimal `json:"adjustPrice"`
+	Amount      decimal.Decimal `json:"amount"`
 	ImgUrl      string          `json:"imgUrl"`
 	Quantity    uint            `json:"quantity"`
 }