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

finance
黄伟 2 years ago
commit 32dc10f5c3

@ -30,9 +30,11 @@ type ArgsAuditLists struct {
type AuditItem struct { type AuditItem struct {
Id uint `json:"id"` Id uint `json:"id"`
ServiceId uint `json:"serviceId"` ServiceId uint `json:"serviceId"`
UserId uint `json:"userId"`
UserName string `json:"userName"` UserName string `json:"userName"`
ServiceName string `json:"serviceName"` ServiceName string `json:"serviceName"`
ApplyUserId uint `json:"applyUserId"` ApplyUserId uint `json:"applyUserId"`
ApplyType uint `json:"ApplyType"`
ApplyAt int64 `json:"applyAt"` ApplyAt int64 `json:"applyAt"`
AuditStatus uint `json:"auditStatus"` AuditStatus uint `json:"auditStatus"`
AuditUserId uint `json:"auditUserId"` AuditUserId uint `json:"auditUserId"`
@ -149,6 +151,7 @@ type ReplyAuditInfo struct {
AuditUserId uint `json:"auditUserId"` AuditUserId uint `json:"auditUserId"`
Expand any `json:"expand"` Expand any `json:"expand"`
Enclosure string `json:"enclosure"` Enclosure string `json:"enclosure"`
ApplyType uint `json:"applyType"`
} }
// Info @Title 详情 // Info @Title 详情

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

@ -109,7 +109,7 @@ type ReplyFindByAfsOrderInfo struct {
Result string `json:"result"` // 处理结果 Result string `json:"result"` // 处理结果
SkuName string `json:"skuName"` // 商品名称 SkuName string `json:"skuName"` // 商品名称
SkuId uint `json:"skuId"` // 供应商编码 SkuId uint `json:"skuId"` // 供应商编码
Price decimal.Decimal `json:"price"` // 商品单价 SupplyPrice decimal.Decimal `json:"price"` // 商品单价
Quantity uint `json:"quantity"` // 售后数量 Quantity uint `json:"quantity"` // 售后数量
UpcCode string `json:"upcCode"` // 商品条码 UpcCode string `json:"upcCode"` // 商品条码
} }

@ -291,3 +291,24 @@ func (a *afterService) FindByAfsId(ctx context.Context, afsId uint) (reply Reply
err = xClient.Call(ctx, "FindByAfsId", afsId, &reply) err = xClient.Call(ctx, "FindByAfsId", afsId, &reply)
return return
} }
type ReplySourceSkuIdsAfsInfos struct {
SourceId uint // 供应商Id
SourceName string // 供应商名称
ChannelId uint // 客户Id
SkuId uint // 沙马skuId
SourceSkuId string // 供应商skuId
HopeTypeName string // 期望售后类型
TypeReasonName string // 售后原因
CustomerPrice decimal.Decimal // 销售价格
}
// FindBySourceSkuIdsAfsInfos @Title 根据sourceSkuId查询售后信息
func (a *afterService) FindBySourceSkuIdsAfsInfos(ctx context.Context, sourceSkuIds []uint) (reply []ReplySourceSkuIdsAfsInfos, err error) {
xClient, err := client.GetClient(a)
if err != nil {
return
}
err = xClient.Call(ctx, "FindBySourceSkuIdsAfsInfos", sourceSkuIds, &reply)
return
}

@ -73,6 +73,16 @@ func (b *brand) Add(ctx context.Context, args ArgsBrandAdd) (err error) {
return xClient.Call(ctx, "Add", args, &reply) return xClient.Call(ctx, "Add", args, &reply)
} }
// Adds @Title 添加品牌
func (b *brand) Adds(ctx context.Context, brandNames []string) (err error) {
reply := 0
xClient, err := client.GetClient(b)
if err != nil {
return err
}
return xClient.Call(ctx, "Adds", brandNames, &reply)
}
type ArgsBrandEdit struct { type ArgsBrandEdit struct {
BrandId uint // 品牌id BrandId uint // 品牌id
Name string // 品牌名称 Name string // 品牌名称

@ -40,6 +40,21 @@ func (c *category) Add(ctx context.Context, args ArgsCategoryAdd) (err error) {
return xClient.Call(ctx, "Add", args, &reply) return xClient.Call(ctx, "Add", args, &reply)
} }
type ReplyCategoryAddError struct {
CategoryName string `json:"categoryName"`
ErrMsg string `json:"errMsg"`
}
// Adds @Title 添加分类
func (c *category) Adds(ctx context.Context, args []ArgsCategoryAdd) (reply []ReplyCategoryAddError, err error) {
xClient, err := client.GetClient(c)
if err != nil {
return
}
err = xClient.Call(ctx, "Adds", args, &reply)
return
}
type ArgsCategoryEdit struct { type ArgsCategoryEdit struct {
CategoryId uint // 分类id CategoryId uint // 分类id
Name string // 分类名称 Name string // 分类名称

@ -80,19 +80,17 @@ type SkuEsSearch struct {
MinDiscount decimal.Decimal // 最低折扣 MinDiscount decimal.Decimal // 最低折扣
MaxDiscount decimal.Decimal // 最高折扣 MaxDiscount decimal.Decimal // 最高折扣
Expand []map[string]interface{} // 拓展查询 Expand []map[string]interface{} // 拓展查询
CustomerSearch CustomerSearch // 客户系统的搜索条件 CustomerSearch string // 客户系统搜索参数
MinGuidePrice decimal.Decimal // 市场参考价
MaxGuidePrice decimal.Decimal // 市场参考价
Source uint // 所属供应商
ThirdCategoryIds []uint // 三级分类Ids
} }
type ArgsSkuListsEs struct { type ArgsSkuListsEs struct {
Search SkuEsSearch Search SkuEsSearch
Page bean.Page Page bean.Page
} }
type CustomerSearch struct {
SkuName string
SkuId uint
BrandName string
}
// ListsEs @Title es商品列表 目前最大10000条数据超出不显示 // ListsEs @Title es商品列表 目前最大10000条数据超出不显示
func (s *sku) ListsEs(ctx context.Context, channelId string, args ArgsSkuListsEs) (reply ReplySkuList, err error) { func (s *sku) ListsEs(ctx context.Context, channelId string, args ArgsSkuListsEs) (reply ReplySkuList, err error) {
xClient, err := client.GetClient(s) xClient, err := client.GetClient(s)

@ -4,6 +4,7 @@ import (
"context" "context"
"git.oa00.com/supply-chain/service/client" "git.oa00.com/supply-chain/service/client"
"git.oa00.com/supply-chain/service/lib/bean" "git.oa00.com/supply-chain/service/lib/bean"
_interface "git.oa00.com/supply-chain/service/wholesale/interface"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"github.com/smallnest/rpcx/share" "github.com/smallnest/rpcx/share"
) )
@ -202,3 +203,13 @@ func (o *order) Finish(ctx context.Context, channelId, orderSn string) error {
err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Finish", orderSn, &reply) err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Finish", orderSn, &reply)
return err return err
} }
// Trajectory @Title 获取订单物流信息
func (o *order) Trajectory(ctx context.Context, channelId string, orderSn string) (reply []_interface.ReplyTrajectory, err error) {
xClient, err := client.GetClient(o)
if err != nil {
return
}
err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Trajectory", orderSn, &reply)
return
}

Loading…
Cancel
Save