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

supply/channel/afterService.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"git.oa00.com/supply-chain/service/client"
 	"git.oa00.com/supply-chain/service/lib/bean"
+	"github.com/shopspring/decimal"
 	"github.com/smallnest/rpcx/share"
 )
 
@@ -161,6 +162,7 @@ type AfterServiceItem struct {
 	Quantity       uint   `json:"quantity"`
 	TypeReasonName string `json:"typeReasonName"`
 	OrderSubId     uint   `json:"orderSubId"`
+	Result         string `json:"result"`
 	Status         uint   `json:"status"`
 	CreatedAt      int64  `json:"createdAt"`
 	UpdatedAt      int64  `json:"updatedAt"`
@@ -175,3 +177,32 @@ func (a *afterService) Lists(ctx context.Context, channelId string, args ArgsAft
 	err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Lists", args, &reply)
 	return
 }
+
+type ReplyAfterServiceDetail struct {
+	Id             uint            `json:"id"`
+	AfsSn          string          `json:"afsSn"`
+	ReceiverName   string          `json:"receiverName"`
+	ReceiverMobile string          `json:"receiverMobile"`
+	Status         uint            `json:"status"`
+	Result         string          `json:"result"`
+	CreatedAt      int64           `json:"createdAt"`
+	UpdatedAt      int64           `json:"updatedAt"`
+	SkuName        string          `json:"skuName"`
+	ImgUrl         string          `json:"imgUrl"`
+	SkuId          uint            `json:"skuId"`
+	Price          decimal.Decimal `json:"price"`
+	Quantity       uint            `json:"quantity"`
+	HopeTypeName   string          `json:"hopeTypeName"`
+	TypeReasonName string          `json:"typeReasonName"`
+	Imgs           []string        `json:"imgs"`
+}
+
+// Detail @Title 售后详情
+func (a *afterService) Detail(ctx context.Context, channelId string, afsSn string) (reply ReplyAfterServiceDetail, err error) {
+	xClient, err := client.GetClient(a)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Detail", afsSn, &reply)
+	return
+}

supply/channel/mq.go

@@ -6,9 +6,13 @@ import (
 	"github.com/smallnest/rpcx/share"
 )
 
+const (
+	MqSubscribeNameSkuPriceChange = "sku_price_change" // sku价格变动
+	MqSubscribeNameSkuChange      = "sku_change"       // sku信息变动
+)
+
 type mq struct {
 }
-
 type ArgsMqSubscribe struct {
 	Name string // 队列名称
 }

supply/order.go

@@ -118,7 +118,7 @@ type RetailOrderSearch struct {
 
 type RetailOrderItem struct {
 	Id             uint            `json:"id"`
-	OrderSubSn     uint64          `json:"orderSubSn"`
+	OrderSubSn     string          `json:"orderSubSn"`
 	SourceName     string          `json:"sourceName"`
 	CustomerName   string          `json:"customerName"`
 	OrderStatus    uint            `json:"orderStatus"`