From 46ab7d94861982170514857e22f28859751a0908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 10:33:25 +0800 Subject: [PATCH 1/7] 1 --- platformapi/tiktok_shop/tiktok_api/order.go | 72 +++++++-------------- 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index a2c602a0..d573de68 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -336,170 +336,148 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd } // CreateOrderCallback 订单创建,抖店创建订单后,回调消息通知本服务器 -func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, map[int64]bool, *CallbackResponse) { +func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, *CallbackResponse) { var resp []*OrderCallback if err := json.Unmarshal(orderStatus, &resp); err != nil { - return nil, nil, &CallbackResponse{Code: CallbackFailCode, Msg: CallbackFail} + return nil, &CallbackResponse{Code: CallbackFailCode, Msg: CallbackFail} } callbackResult := make(map[string][]interface{}, 0) - storeIdMap := make(map[int64]bool, 0) for _, data := range resp { switch data.Tag { case CallbackCreatedOrderMsgTagId: // 创建订单 create := CreateOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackCreatedOrderMsgTagId] = append(callbackResult[CallbackCreatedOrderMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackPayOrderMsgTagId: // 支付订单 create := PayOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackPayOrderMsgTagId] = append(callbackResult[CallbackPayOrderMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackWaitOrderMsgTagId: // 支付订单待处理(风控审核) create := WaitOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackWaitOrderMsgTagId] = append(callbackResult[CallbackWaitOrderMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackPartGoodsMsgTagId: // 卖家部分发货 create := SomeSendOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackPartGoodsMsgTagId] = append(callbackResult[CallbackPartGoodsMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackPartAllGoodsMsgTagId: // 卖家发货 create := BusinessDeliveryData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackPartAllGoodsMsgTagId] = append(callbackResult[CallbackPartAllGoodsMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackCancelOrderMsgTagId: // 取消订单 create := CreateOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackCancelOrderMsgTagId] = append(callbackResult[CallbackCancelOrderMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackSuccessOrderMsgTagId: // 卖家确认收货时,会自动完成 create := SuccessOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackSuccessOrderMsgTagId] = append(callbackResult[CallbackSuccessOrderMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackWayBillChangeOrderMsgTagId: // 发货物流消息便跟 create := WayBillChangeData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackWayBillChangeOrderMsgTagId] = append(callbackResult[CallbackWayBillChangeOrderMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackReceivingChangeOrderMsgTagId: // 收货地址消息变更(商家审核通过触发) create := ReceivingAddressChangeData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackReceivingChangeOrderMsgTagId] = append(callbackResult[CallbackReceivingChangeOrderMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackChangeMoneyMsgTagId: // 卖家修改订单/运单金额回调 create := UpdateAmountChangeData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackChangeMoneyMsgTagId] = append(callbackResult[CallbackChangeMoneyMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackBusinessRemarkMsgTagId: // 买家收货消息变更(手机,地址,姓名),用户C端修改触发(需要上面审核接口) create := BuyerUpdateWayBillData{} if err := json.Unmarshal([]byte(data.Data), create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackBusinessRemarkMsgTagId] = append(callbackResult[CallbackBusinessRemarkMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackApplyUpdateAddressMsgTagId: // 商家修改交易备注回调 create := BusinessUpdateRemakeData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackApplyUpdateAddressMsgTagId] = append(callbackResult[CallbackApplyUpdateAddressMsgTagId], create) - storeIdMap[create.ShopId] = true case CallbackSendOrderTimeChangeMsgTagId: // 订单发货时消息变更回调 create := AppointmentChangeData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackSendOrderTimeChangeMsgTagId] = append(callbackResult[CallbackSendOrderTimeChangeMsgTagId], create) - storeIdMap[create.ShopId] = true /*********下面属于订单退货消息************/ case CallbackRefundOrderMsgTagId: // 买家发起售后申请消息 create := BuyerRefundCreatedData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackRefundOrderMsgTagId] = append(callbackResult[CallbackRefundOrderMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true case CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息 create := BuyerRefundModifiedData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackUpdateRefundOrderMsgTagId] = append(callbackResult[CallbackUpdateRefundOrderMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true case CallbackRefundOrderSuccessMsgTagId: // 退款成功消息 create := BusinessRefundSuccessData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackRefundOrderSuccessMsgTagId] = append(callbackResult[CallbackRefundOrderSuccessMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true case CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息 create := BusinessNotRefundRefusedData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackRefundOrderRefuseMsgTagId] = append(callbackResult[CallbackRefundOrderRefuseMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true case CallbackRefundShopMsgTagId: // 拒绝退货申请消息 create := BusinessNotReturnApplyRefusedData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackRefundShopMsgTagId] = append(callbackResult[CallbackRefundShopMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true case CallbackReturnApplyAgreedMsgTagId: // 卖家同意时，推送此消息 create := BusinessReturnApplyAgreedData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackReturnApplyAgreedMsgTagId] = append(callbackResult[CallbackReturnApplyAgreedMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true case CallbackReturnRefundAgreedMsgTagId: // 同意退款消息 create := BusinessRefundAgreedData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true case CallbackRefundClosedMsgTagId: create := UserCancelRefundOrderData{} if err := json.Unmarshal([]byte(data.Data), &create); err != nil { - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } callbackResult[CallbackRefundClosedMsgTagId] = append(callbackResult[CallbackRefundClosedMsgTagId], create) - storeIdMap[int64(create.ShopId)] = true default: - return nil, nil, CallbackResponseErr(false) + return nil, CallbackResponseErr(false) } } - return callbackResult, storeIdMap, &CallbackResponse{Code: CallbackSuccessCode, Msg: CallbackSuccess} + return callbackResult, &CallbackResponse{Code: CallbackSuccessCode, Msg: CallbackSuccess} } // GetCallbackOrderId 获取回调函数订单id From c9f16565c518c05cfdb71c3e0a2bb93d1f459b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 10:42:35 +0800 Subject: [PATCH 2/7] 1 --- platformapi/jdapi/sku.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platformapi/jdapi/sku.go b/platformapi/jdapi/sku.go index 27d711ef..0e855650 100644 --- a/platformapi/jdapi/sku.go +++ b/platformapi/jdapi/sku.go @@ -2,6 +2,7 @@ package jdapi import ( "fmt" + "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" @@ -320,6 +321,7 @@ func (a *API) AddShopCategory(pid int64, shopCategoryName string, shopCategoryLe params["createPin"] = utils.GetAPIOperator(userName) } result, err := a.AccessAPINoPage("pms/addShopCategory", params, nil, nil, nil) + globals.SugarLogger.Debugf("========result : %s", utils.Format4Output(result, false)) if err == nil { return (result.(map[string]interface{}))["id"].(string), nil } From d29192732d5ca0ee02cd1f227b2b4c46bc6886e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 11:33:34 +0800 Subject: [PATCH 3/7] 1 --- platformapi/jdapi/sku.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platformapi/jdapi/sku.go b/platformapi/jdapi/sku.go index 0e855650..2362fba7 100644 --- a/platformapi/jdapi/sku.go +++ b/platformapi/jdapi/sku.go @@ -338,6 +338,8 @@ func (a *API) QueryCategoriesByOrgCode() (catList []*CategoryInfo, err error) { "SHOP_CATEGORY_LEVEL", "SORT", }), nil, nil, nil) + globals.SugarLogger.Debugf("=========result := %s", utils.Format4Output(result, false)) + globals.SugarLogger.Debugf("=========result := %s", err) if err == nil { return interface2CatList(result, 1, nil), nil } From 93123a7d5c74991537cfe940384457e36c8ac683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 11:41:26 +0800 Subject: [PATCH 4/7] 1 --- platformapi/jdapi/sku.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platformapi/jdapi/sku.go b/platformapi/jdapi/sku.go index 2362fba7..f9e5318c 100644 --- a/platformapi/jdapi/sku.go +++ b/platformapi/jdapi/sku.go @@ -461,8 +461,11 @@ func (a *API) QuerySkuInfos(queryParam *QuerySkuParam) (skuList []*SkuMain, tota queryParam.PageSize = MaxPageSize4QuerySku } result, totalCount, err := a.AccessAPIHavePage("pms/querySkuInfos", utils.Struct2MapByJson(queryParam), nil, nil, nil) + globals.SugarLogger.Debugf("============QuerySkuInfos====%s", utils.Format4Output(result, false)) + globals.SugarLogger.Debugf("============QuerySkuInfos====%s", err) if err == nil { err = JdMap2StructByJson(result, &skuList, false) + globals.SugarLogger.Debugf("============JdMap2StructByJson====%s", err) } return skuList, totalCount, err } From 9c5148cbc792dcaca1c5123098aa6ba6cc5f8976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 11:48:17 +0800 Subject: [PATCH 5/7] 1 --- platformapi/jdapi/jdapi.go | 3 +++ platformapi/jdapi/sku.go | 1 + 2 files changed, 4 insertions(+) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index 64ad81f9..02b9b96d 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -7,6 +7,7 @@ import ( "encoding/json" "errors" "fmt" + "git.rosy.net.cn/jx-callback/globals" "net/http" "reflect" "sort" @@ -391,6 +392,8 @@ func (a *API) AccessAPIHavePage(apiStr string, jdParams map[string]interface{}, localJdParams[KeyPageNo] = curPage localJdParams[KeyPageSize] = pageSize jsonResult, err := a.AccessAPI(apiStr, localJdParams) + globals.SugarLogger.Debugf("============jsonResult====%s", utils.Format4Output(jsonResult, false)) + globals.SugarLogger.Debugf("============err====%s", err) if err != nil { return nil, totalCount, err } diff --git a/platformapi/jdapi/sku.go b/platformapi/jdapi/sku.go index f9e5318c..a02ba662 100644 --- a/platformapi/jdapi/sku.go +++ b/platformapi/jdapi/sku.go @@ -454,6 +454,7 @@ func (a *API) BatchUpdateOutSkuId(skuInfoList []*SkuIDPair) (failedList []*Batch // https://opendj.jd.com/staticnew/widgets/resources.html?groupid=180&apiid=e433b95f74524dab91718432c0358977 // pageNo 从1开始 func (a *API) QuerySkuInfos(queryParam *QuerySkuParam) (skuList []*SkuMain, totalCount int, err error) { + globals.SugarLogger.Debugf("============queryParam====%s", utils.Format4Output(queryParam, false)) if queryParam.PageNo <= 0 { queryParam.PageNo = 1 } From c799328eabef53edeab214f503e49832be1b9e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 13:35:09 +0800 Subject: [PATCH 6/7] 1 --- platformapi/jdapi/jdapi.go | 19 +++++++++++++------ platformapi/jdapi/sku.go | 8 -------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index 02b9b96d..a1d648ed 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -7,7 +7,6 @@ import ( "encoding/json" "errors" "fmt" - "git.rosy.net.cn/jx-callback/globals" "net/http" "reflect" "sort" @@ -392,15 +391,23 @@ func (a *API) AccessAPIHavePage(apiStr string, jdParams map[string]interface{}, localJdParams[KeyPageNo] = curPage localJdParams[KeyPageSize] = pageSize jsonResult, err := a.AccessAPI(apiStr, localJdParams) - globals.SugarLogger.Debugf("============jsonResult====%s", utils.Format4Output(jsonResult, false)) - globals.SugarLogger.Debugf("============err====%s", err) if err != nil { return nil, totalCount, err } var data map[string]interface{} - encryptData, err := JDDecodeToData(a.appSecret, jsonResult["encryptData"].(string)) - - if err := utils.UnmarshalUseNumber(encryptData, &data); err != nil { + if jsonResult["encryptData"] != nil { + encryptData, err := JDDecodeToData(a.appSecret, jsonResult["encryptData"].(string)) + if err != nil { + return nil, totalCount, platformapi.ErrResponseDataFormatWrong + } + if err := utils.UnmarshalUseNumber(encryptData, &data); err != nil { + return nil, totalCount, platformapi.ErrResponseDataFormatWrong + } + } else if jsonResult["encryptData"] == nil && jsonResult["data"] != nil { + if err := utils.UnmarshalUseNumber([]byte(jsonResult["data"].(string)), &data); err != nil { + return nil, totalCount, platformapi.ErrResponseDataFormatWrong + } + } else { return nil, totalCount, platformapi.ErrResponseDataFormatWrong } diff --git a/platformapi/jdapi/sku.go b/platformapi/jdapi/sku.go index a02ba662..27d711ef 100644 --- a/platformapi/jdapi/sku.go +++ b/platformapi/jdapi/sku.go @@ -2,7 +2,6 @@ package jdapi import ( "fmt" - "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" @@ -321,7 +320,6 @@ func (a *API) AddShopCategory(pid int64, shopCategoryName string, shopCategoryLe params["createPin"] = utils.GetAPIOperator(userName) } result, err := a.AccessAPINoPage("pms/addShopCategory", params, nil, nil, nil) - globals.SugarLogger.Debugf("========result : %s", utils.Format4Output(result, false)) if err == nil { return (result.(map[string]interface{}))["id"].(string), nil } @@ -338,8 +336,6 @@ func (a *API) QueryCategoriesByOrgCode() (catList []*CategoryInfo, err error) { "SHOP_CATEGORY_LEVEL", "SORT", }), nil, nil, nil) - globals.SugarLogger.Debugf("=========result := %s", utils.Format4Output(result, false)) - globals.SugarLogger.Debugf("=========result := %s", err) if err == nil { return interface2CatList(result, 1, nil), nil } @@ -454,7 +450,6 @@ func (a *API) BatchUpdateOutSkuId(skuInfoList []*SkuIDPair) (failedList []*Batch // https://opendj.jd.com/staticnew/widgets/resources.html?groupid=180&apiid=e433b95f74524dab91718432c0358977 // pageNo 从1开始 func (a *API) QuerySkuInfos(queryParam *QuerySkuParam) (skuList []*SkuMain, totalCount int, err error) { - globals.SugarLogger.Debugf("============queryParam====%s", utils.Format4Output(queryParam, false)) if queryParam.PageNo <= 0 { queryParam.PageNo = 1 } @@ -462,11 +457,8 @@ func (a *API) QuerySkuInfos(queryParam *QuerySkuParam) (skuList []*SkuMain, tota queryParam.PageSize = MaxPageSize4QuerySku } result, totalCount, err := a.AccessAPIHavePage("pms/querySkuInfos", utils.Struct2MapByJson(queryParam), nil, nil, nil) - globals.SugarLogger.Debugf("============QuerySkuInfos====%s", utils.Format4Output(result, false)) - globals.SugarLogger.Debugf("============QuerySkuInfos====%s", err) if err == nil { err = JdMap2StructByJson(result, &skuList, false) - globals.SugarLogger.Debugf("============JdMap2StructByJson====%s", err) } return skuList, totalCount, err } From 29c6e6d00aa7c27d29d69175e33eb4d945c84d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 18 Nov 2022 11:17:59 +0800 Subject: [PATCH 7/7] 1 --- platformapi/jdapi/store_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index 739e33d1..ac18300e 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -165,3 +165,6 @@ func TestQueryMerchantMemberInfo(t *testing.T) { } baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) } + +func Test1111(t *testing.T) { +}