Merge branch 'v3' into test
This commit is contained in:
commit
c086e9ba15
|
|
@ -53,8 +53,7 @@ func (t *ZltxOrderAfterSaleResellerTool) Definition() entitys.ToolDefinition {
|
||||||
type ZltxOrderAfterSaleResellerRequest struct {
|
type ZltxOrderAfterSaleResellerRequest struct {
|
||||||
OrderNumber []string `json:"orderNumber"` // 订单号
|
OrderNumber []string `json:"orderNumber"` // 订单号
|
||||||
Account string `json:"account"` // 充值账号
|
Account string `json:"account"` // 充值账号
|
||||||
OrderTimeStart string `json:"orderTimeStart"` // 订单执行开始时间
|
SerialCreateTime string `json:"serialCreateTime"` // 流水创建时间
|
||||||
OrderTimeEnd string `json:"orderTimeEnd"` // 订单执行结束时间
|
|
||||||
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
||||||
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
||||||
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
||||||
|
|
@ -81,6 +80,7 @@ type ZltxOrderAfterSaleResellerData struct {
|
||||||
OurProductTitle string `json:"ourProductTitle"`
|
OurProductTitle string `json:"ourProductTitle"`
|
||||||
Account []string `json:"account"`
|
Account []string `json:"account"`
|
||||||
Platforms map[int]string `json:"platforms"`
|
Platforms map[int]string `json:"platforms"`
|
||||||
|
CreateTime string `json:"createTime"` // 创建时间
|
||||||
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
||||||
Remark string `json:"remark"` // 售后原因
|
Remark string `json:"remark"` // 售后原因
|
||||||
AfterAmount float64 `json:"afterAmount"` // 售后金额
|
AfterAmount float64 `json:"afterAmount"` // 售后金额
|
||||||
|
|
@ -94,8 +94,8 @@ func (t *ZltxOrderAfterSaleResellerTool) Execute(ctx context.Context, requireDat
|
||||||
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(req.OrderNumber) == 0 && (req.Account == "" || req.OrderTimeStart == "") {
|
if len(req.OrderNumber) == 0 && req.Account == "" {
|
||||||
return fmt.Errorf("订单号 和 充值账号&订单执行时间 不能同时为空")
|
return fmt.Errorf("订单号 和 充值账号 不能同时为空")
|
||||||
}
|
}
|
||||||
|
|
||||||
entitys.ResLog(requireData.Ch, t.Name(), "正在拉取售后订单信息")
|
entitys.ResLog(requireData.Ch, t.Name(), "正在拉取售后订单信息")
|
||||||
|
|
@ -146,6 +146,7 @@ func (t *ZltxOrderAfterSaleResellerTool) checkZltxOrderAfterSaleReseller(req Zlt
|
||||||
OurProductTitle: "爱奇艺黄金会员周卡",
|
OurProductTitle: "爱奇艺黄金会员周卡",
|
||||||
Account: []string{"15516353308"},
|
Account: []string{"15516353308"},
|
||||||
Platforms: map[int]string{4: "爱奇艺"},
|
Platforms: map[int]string{4: "爱奇艺"},
|
||||||
|
CreateTime: "2025-08-10 10:00:00",
|
||||||
AfterType: 1,
|
AfterType: 1,
|
||||||
Remark: "测试售后",
|
Remark: "测试售后",
|
||||||
AfterAmount: 50,
|
AfterAmount: 50,
|
||||||
|
|
@ -165,6 +166,7 @@ func (t *ZltxOrderAfterSaleResellerTool) checkZltxOrderAfterSaleReseller(req Zlt
|
||||||
OurProductTitle: "优酷年卡",
|
OurProductTitle: "优酷年卡",
|
||||||
Account: []string{"18380416326"},
|
Account: []string{"18380416326"},
|
||||||
Platforms: map[int]string{1: "爱瓦力"},
|
Platforms: map[int]string{1: "爱瓦力"},
|
||||||
|
CreateTime: "2025-08-11 10:00:00",
|
||||||
AfterType: 2,
|
AfterType: 2,
|
||||||
Remark: "测试售后2",
|
Remark: "测试售后2",
|
||||||
AfterAmount: 30,
|
AfterAmount: 30,
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,7 @@ type ZltxOrderAfterSaleResellerBatchData struct {
|
||||||
OurProductTitle string `json:"ourProductTitle"`
|
OurProductTitle string `json:"ourProductTitle"`
|
||||||
Account []string `json:"account"`
|
Account []string `json:"account"`
|
||||||
Platforms map[int]string `json:"platforms"`
|
Platforms map[int]string `json:"platforms"`
|
||||||
|
CreateTime string `json:"createTime"` // 创建时间
|
||||||
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
||||||
Remark string `json:"remark"` // 售后原因
|
Remark string `json:"remark"` // 售后原因
|
||||||
AfterAmount float64 `json:"afterAmount"` // 售后金额
|
AfterAmount float64 `json:"afterAmount"` // 售后金额
|
||||||
|
|
@ -143,6 +144,7 @@ func (t *ZltxOrderAfterSaleResellerBatchTool) checkZltxOrderAfterSaleResellerBat
|
||||||
OurProductTitle: "爱奇艺黄金会员周卡",
|
OurProductTitle: "爱奇艺黄金会员周卡",
|
||||||
Account: []string{"15516353308"},
|
Account: []string{"15516353308"},
|
||||||
Platforms: map[int]string{4: "爱奇艺"},
|
Platforms: map[int]string{4: "爱奇艺"},
|
||||||
|
CreateTime: "2025-08-10 10:00:00",
|
||||||
AfterType: 1,
|
AfterType: 1,
|
||||||
Remark: "测试售后",
|
Remark: "测试售后",
|
||||||
AfterAmount: 50,
|
AfterAmount: 50,
|
||||||
|
|
@ -162,6 +164,7 @@ func (t *ZltxOrderAfterSaleResellerBatchTool) checkZltxOrderAfterSaleResellerBat
|
||||||
OurProductTitle: "优酷年卡",
|
OurProductTitle: "优酷年卡",
|
||||||
Account: []string{"18380416326"},
|
Account: []string{"18380416326"},
|
||||||
Platforms: map[int]string{1: "爱瓦力"},
|
Platforms: map[int]string{1: "爱瓦力"},
|
||||||
|
CreateTime: "2025-08-11 10:00:00",
|
||||||
AfterType: 2,
|
AfterType: 2,
|
||||||
Remark: "测试售后2",
|
Remark: "测试售后2",
|
||||||
AfterAmount: 30,
|
AfterAmount: 30,
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,7 @@ func (t *ZltxOrderAfterSaleSupplierTool) Definition() entitys.ToolDefinition {
|
||||||
type ZltxOrderAfterSaleSupplierRequest struct {
|
type ZltxOrderAfterSaleSupplierRequest struct {
|
||||||
SerialNumber []string `json:"serialNumber"` // 流水号
|
SerialNumber []string `json:"serialNumber"` // 流水号
|
||||||
Account string `json:"account"` // 充值账号
|
Account string `json:"account"` // 充值账号
|
||||||
OrderTimeStart string `json:"orderTimeStart"` // 订单执行开始时间
|
SerialCreateTime string `json:"serialCreateTime"` // 流水创建时间
|
||||||
OrderTimeEnd string `json:"orderTimeEnd"` // 订单执行结束时间
|
|
||||||
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
||||||
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
||||||
AfterType int `json:"afterType"` // 售后类型 1.加款 2.扣款
|
AfterType int `json:"afterType"` // 售后类型 1.加款 2.扣款
|
||||||
|
|
@ -89,8 +88,8 @@ func (t *ZltxOrderAfterSaleSupplierTool) Execute(ctx context.Context, requireDat
|
||||||
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(req.SerialNumber) == 0 && (req.Account == "" || req.OrderTimeStart == "") {
|
if len(req.SerialNumber) == 0 && req.Account == "" {
|
||||||
return fmt.Errorf("充值流水号 和 充值账号&订单执行时间 不能同时为空")
|
return fmt.Errorf("充值流水号 和 充值账号 不能同时为空")
|
||||||
}
|
}
|
||||||
|
|
||||||
entitys.ResLog(requireData.Ch, t.Name(), "正在拉取售后订单信息")
|
entitys.ResLog(requireData.Ch, t.Name(), "正在拉取售后订单信息")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue