From 19bb1fbdadca87924bffae645e0afce62955b3a1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 26 Jul 2022 17:25:13 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=87=BA?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/q_bida/q_bida_params.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformapi/q_bida/q_bida_params.go b/platformapi/q_bida/q_bida_params.go index af6e6bb5..c90233eb 100644 --- a/platformapi/q_bida/q_bida_params.go +++ b/platformapi/q_bida/q_bida_params.go @@ -151,8 +151,8 @@ type OrderDetail struct { InsuranceFee float64 `json:"insuranceFee"` // 保价费元 IsForward bool `json:"isForward"` // 是否转寄单0否1是(转寄单额外收取50%运费) IsLimit bool `json:"isLimit"` // 是否超限0否1是 - OriginalFee int `json:"originalFee"` // 官方原价 - OtherFee int `json:"otherFee"` // 其他费用 + OriginalFee float64 `json:"originalFee"` // 官方原价 + OtherFee float64 `json:"otherFee"` // 其他费用 OverWeightStatus int `json:"overWeightStatus"` // 超重状态 PackageNum int `json:"packageNum"` // 包裹数 ReceiveAddress string `json:"receiveAddress"` // 收件人地址 From 491819864f88d04e2abd814e44da52fe0bdd1c9e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 27 Jul 2022 14:11:20 +0800 Subject: [PATCH 02/10] err --- platformapi/q_bida/q_bida_client.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platformapi/q_bida/q_bida_client.go b/platformapi/q_bida/q_bida_client.go index de1132d8..d02b45d9 100644 --- a/platformapi/q_bida/q_bida_client.go +++ b/platformapi/q_bida/q_bida_client.go @@ -3,6 +3,7 @@ package q_bida import ( "errors" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" "net/http" "strings" "time" @@ -85,6 +86,7 @@ func (a *Api) CancelOrder(param *CancelOrderReq) error { } result, err := a.AccessInfo(BaseQBiDaUrl, CancelWayBailOrderUrl, http.MethodPost, utils.Struct2FlatMap(param)) + globals.SugarLogger.Debug("err= =====ded==================", err) if err != nil && !strings.Contains(err.Error(), "成功") { return err } From 065db2f32d5a299e08af8b211dc5faf97ae3038b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 3 Aug 2022 15:36:32 +0800 Subject: [PATCH 03/10] test --- platformapi/q_bida/q_bida_access.go | 2 ++ platformapi/q_bida/q_bida_client.go | 1 + 2 files changed, 3 insertions(+) diff --git a/platformapi/q_bida/q_bida_access.go b/platformapi/q_bida/q_bida_access.go index 11089e5e..2870fcf9 100644 --- a/platformapi/q_bida/q_bida_access.go +++ b/platformapi/q_bida/q_bida_access.go @@ -39,6 +39,8 @@ func (a *Api) SetExpirationTime(expiration int64) { // NewQBiDa 初始化token func NewQBiDa(account, password string, config ...*platformapi.APIConfig) *Api { + //account = "18048531223" + //password = "18080188338" if account == "" || password == "" { panic("账号密码不能为空") } diff --git a/platformapi/q_bida/q_bida_client.go b/platformapi/q_bida/q_bida_client.go index d02b45d9..bbe99e1a 100644 --- a/platformapi/q_bida/q_bida_client.go +++ b/platformapi/q_bida/q_bida_client.go @@ -87,6 +87,7 @@ func (a *Api) CancelOrder(param *CancelOrderReq) error { result, err := a.AccessInfo(BaseQBiDaUrl, CancelWayBailOrderUrl, http.MethodPost, utils.Struct2FlatMap(param)) globals.SugarLogger.Debug("err= =====ded==================", err) + err = nil //TODO 测试部分，记得删除 if err != nil && !strings.Contains(err.Error(), "成功") { return err } From 0772e303c4c10b5bab0e8a2743af2014b02f5a5c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 3 Aug 2022 15:40:30 +0800 Subject: [PATCH 04/10] 1 --- platformapi/q_bida/q_bida_client.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platformapi/q_bida/q_bida_client.go b/platformapi/q_bida/q_bida_client.go index bbe99e1a..a148c2eb 100644 --- a/platformapi/q_bida/q_bida_client.go +++ b/platformapi/q_bida/q_bida_client.go @@ -87,9 +87,10 @@ func (a *Api) CancelOrder(param *CancelOrderReq) error { result, err := a.AccessInfo(BaseQBiDaUrl, CancelWayBailOrderUrl, http.MethodPost, utils.Struct2FlatMap(param)) globals.SugarLogger.Debug("err= =====ded==================", err) - err = nil //TODO 测试部分，记得删除 + if err != nil && !strings.Contains(err.Error(), "成功") { - return err + err = nil //TODO 测试部分，记得删除 + //return err } resultData := &PublicParams{} From db58d23371b48c9bce3d192e599285ac51c31e9a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 3 Aug 2022 16:07:37 +0800 Subject: [PATCH 05/10] 1 --- platformapi/q_bida/q_bida_client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/platformapi/q_bida/q_bida_client.go b/platformapi/q_bida/q_bida_client.go index a148c2eb..e421ffee 100644 --- a/platformapi/q_bida/q_bida_client.go +++ b/platformapi/q_bida/q_bida_client.go @@ -94,6 +94,7 @@ func (a *Api) CancelOrder(param *CancelOrderReq) error { } resultData := &PublicParams{} + globals.SugarLogger.Debug("resultData===================", resultData.Code, resultData.Msg) if err := utils.Map2StructByJson(result, resultData, false); err != nil { return err } From 29c85e56d3857bb4f300b44de61756c7953ebcc4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 4 Aug 2022 10:02:35 +0800 Subject: [PATCH 06/10] refund --- platformapi/tonglianpayapi/tonglianpayapi.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platformapi/tonglianpayapi/tonglianpayapi.go b/platformapi/tonglianpayapi/tonglianpayapi.go index cc577c84..7891eea2 100644 --- a/platformapi/tonglianpayapi/tonglianpayapi.go +++ b/platformapi/tonglianpayapi/tonglianpayapi.go @@ -3,6 +3,7 @@ package tonglianpayapi import ( "crypto/md5" "fmt" + "git.rosy.net.cn/jx-callback/globals" "net/http" "sort" "strings" @@ -208,9 +209,12 @@ func (a *API) PayRefund(param *PayRefundParam) (result *PayRefundResult, err err params["remark"] = param.Remark params["oldtrxid"] = param.OldTrxID retVal, err := a.AccessAPI("unitorder/refund", params) + globals.SugarLogger.Debug("PayRefund打印输出 trxamt", params["trxamt"]) + globals.SugarLogger.Debug("PayRefund打印输出 oldtrxid", params["oldtrxid"]) if err == nil { utils.Map2StructByJson(retVal, &result, false) } + globals.SugarLogger.Debug("PayRefund打印输出 result", result) return result, err } From 0f0d1595f752284c6745526752a9bdc06641678a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 4 Aug 2022 10:07:49 +0800 Subject: [PATCH 07/10] refund --- platformapi/tonglianpayapi/tonglianpayapi.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platformapi/tonglianpayapi/tonglianpayapi.go b/platformapi/tonglianpayapi/tonglianpayapi.go index 7891eea2..97eee4d6 100644 --- a/platformapi/tonglianpayapi/tonglianpayapi.go +++ b/platformapi/tonglianpayapi/tonglianpayapi.go @@ -205,12 +205,13 @@ func (a *API) PayRefund(param *PayRefundParam) (result *PayRefundResult, err err params := make(map[string]interface{}) params["trxamt"] = param.Trxamt params["reqsn"] = param.Reqsn - // params["oldreqsn"] = param.OldReqsn + params["oldreqsn"] = param.OldReqsn params["remark"] = param.Remark params["oldtrxid"] = param.OldTrxID retVal, err := a.AccessAPI("unitorder/refund", params) globals.SugarLogger.Debug("PayRefund打印输出 trxamt", params["trxamt"]) - globals.SugarLogger.Debug("PayRefund打印输出 oldtrxid", params["oldtrxid"]) + globals.SugarLogger.Debug("PayRefund打印输出 oldtrxid", params["oldtrxid"]) //nil + globals.SugarLogger.Debug("PayRefund打印输出 oldreqsn", params["oldreqsn"]) if err == nil { utils.Map2StructByJson(retVal, &result, false) } From 5849eceab805696f39e8fc57e0d3d9057f5507b9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 4 Aug 2022 10:12:27 +0800 Subject: [PATCH 08/10] refund --- platformapi/tonglianpayapi/tonglianpayapi.go | 1 + 1 file changed, 1 insertion(+) diff --git a/platformapi/tonglianpayapi/tonglianpayapi.go b/platformapi/tonglianpayapi/tonglianpayapi.go index 97eee4d6..b72ca4e5 100644 --- a/platformapi/tonglianpayapi/tonglianpayapi.go +++ b/platformapi/tonglianpayapi/tonglianpayapi.go @@ -209,6 +209,7 @@ func (a *API) PayRefund(param *PayRefundParam) (result *PayRefundResult, err err params["remark"] = param.Remark params["oldtrxid"] = param.OldTrxID retVal, err := a.AccessAPI("unitorder/refund", params) + globals.SugarLogger.Debug("PayRefund打印输出 err", err) globals.SugarLogger.Debug("PayRefund打印输出 trxamt", params["trxamt"]) globals.SugarLogger.Debug("PayRefund打印输出 oldtrxid", params["oldtrxid"]) //nil globals.SugarLogger.Debug("PayRefund打印输出 oldreqsn", params["oldreqsn"]) From d2d0ac3e9329872d2c685b6ca4e83bf1d873ab9c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 4 Aug 2022 18:12:55 +0800 Subject: [PATCH 09/10] query --- platformapi/q_bida/q_bida_client.go | 6 ++++++ platformapi/tonglianpayapi/tonglianpayapi.go | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/platformapi/q_bida/q_bida_client.go b/platformapi/q_bida/q_bida_client.go index e421ffee..6234acf4 100644 --- a/platformapi/q_bida/q_bida_client.go +++ b/platformapi/q_bida/q_bida_client.go @@ -42,10 +42,15 @@ func (a *Api) GetToken() error { // GetExpressPrice 获取快递费用 func (a *Api) GetExpressPrice(param *GetExpressPriceReq) (*GetExpressPriceRes, error) { + globals.SugarLogger.Debug("进入GetExpressPrice") if err := a.CheckTokenExpiration(); err != nil { + globals.SugarLogger.Debug("打印err1===================", err) return nil, err } + result, err := a.AccessInfo(BaseQBiDaUrl, GetWayBailMoneyUrl, http.MethodPost, utils.Struct2FlatMap(param)) + globals.SugarLogger.Debug("打印result===================", result) + globals.SugarLogger.Debug("打印err2===================", err) if err != nil && !strings.Contains(err.Error(), "成功") { return nil, err } @@ -57,6 +62,7 @@ func (a *Api) GetExpressPrice(param *GetExpressPriceReq) (*GetExpressPriceRes, e if resultData.Code != 0 { return nil, errors.New(resultData.Msg) } + globals.SugarLogger.Debug("返回前打印resultData===================", resultData) return resultData, nil } diff --git a/platformapi/tonglianpayapi/tonglianpayapi.go b/platformapi/tonglianpayapi/tonglianpayapi.go index b72ca4e5..8c9a10f0 100644 --- a/platformapi/tonglianpayapi/tonglianpayapi.go +++ b/platformapi/tonglianpayapi/tonglianpayapi.go @@ -205,10 +205,11 @@ func (a *API) PayRefund(param *PayRefundParam) (result *PayRefundResult, err err params := make(map[string]interface{}) params["trxamt"] = param.Trxamt params["reqsn"] = param.Reqsn - params["oldreqsn"] = param.OldReqsn + //params["oldreqsn"] = param.OldReqsn params["remark"] = param.Remark params["oldtrxid"] = param.OldTrxID retVal, err := a.AccessAPI("unitorder/refund", params) + globals.SugarLogger.Debug("PayRefund打印输出 err", err) globals.SugarLogger.Debug("PayRefund打印输出 trxamt", params["trxamt"]) globals.SugarLogger.Debug("PayRefund打印输出 oldtrxid", params["oldtrxid"]) //nil From 1bd0c60649670e5bf6eebb05488d29fe87bce6ae Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 5 Aug 2022 16:42:25 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=94=AE=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/ebaiapi/order.go | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/platformapi/ebaiapi/order.go b/platformapi/ebaiapi/order.go index c2b77e18..4f024552 100644 --- a/platformapi/ebaiapi/order.go +++ b/platformapi/ebaiapi/order.go @@ -560,13 +560,38 @@ func (a *API) OrderDisagreeRefund(orderID, refuseReason string) (err error) { } func (a *API) OrderPartRefund(orderID string, removeSkuList []*RefundSku) (err error) { - _, err = a.AccessAPI("order.partrefund", map[string]interface{}{ + _, err = a.AccessAPI("order.manyTimesPartrefund", map[string]interface{}{ "order_id": orderID, "products": removeSkuList, }) return err } +//售后 同意用户多次部分取消 +func (a *API) OrderAgreePartRefund(orderID string) (err error) { + _, err = a.AccessAPI("order.agreepartrefund", map[string]interface{}{ + "order_id": orderID, + }) + return err +} + +//售后 同意退货退款 +func (a *API) OrderAgreeReturnGoods(orderID string) (err error) { + _, err = a.AccessAPI("order.agreereturngoods", map[string]interface{}{ + "order_id": orderID, + }) + return err +} + +//售后 拒绝退货退款 +func (a *API) OrderDisagreeReturnGoods(orderID string, reason string) (err error) { + _, err = a.AccessAPI("order.disagreereturngoods", map[string]interface{}{ + "order_id": orderID, + "reason": reason, + }) + return err +} + func (a *API) OrderCheckout(orderID, pickUpCode string) (err error) { _, err = a.AccessAPI("order.checkout", map[string]interface{}{ "order_id": orderID,