From 919368f70ecafeb773fa36d136dd366aa7240205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 15 May 2023 09:31:33 +0800 Subject: [PATCH] 1 --- platformapi/dadaapi/order.go | 2 ++ platformapi/fnpsapi/order.go | 6 ++++-- platformapi/mtpsapi/mtpsapi.go | 2 ++ platformapi/mtwmapi/mtwmapi_test.go | 4 ++-- platformapi/mtwmapi/retail_test.go | 4 ++-- platformapi/tiktok_shop/tiktok_api/afs_test.go | 2 +- platformapi/tiktok_shop/tiktok_api/delete_test.go | 6 ++++++ platformapi/tiktok_shop/tiktok_api/sku_test.go | 2 +- platformapi/uuptapi/waybill.go | 1 + utils/typeconv.go | 5 +++-- 10 files changed, 24 insertions(+), 10 deletions(-) diff --git a/platformapi/dadaapi/order.go b/platformapi/dadaapi/order.go index 62acbb30..ead6b35f 100644 --- a/platformapi/dadaapi/order.go +++ b/platformapi/dadaapi/order.go @@ -136,6 +136,8 @@ func (a *API) QueryOrderInfo(orderID string) (order *OrderInfo, err error) { if err == nil { err = utils.Map2StructByJson(result.Result, &order, false) } + order.DeductFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp) + order.ActualFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp) return order, err } diff --git a/platformapi/fnpsapi/order.go b/platformapi/fnpsapi/order.go index d0c92686..3b5ee76d 100644 --- a/platformapi/fnpsapi/order.go +++ b/platformapi/fnpsapi/order.go @@ -60,8 +60,8 @@ func (a *API) PreCreateByShopFn(basicParams *PreCreateOrder) (deliveryFee, baseD if v.IsValid != 1 { continue } - deliveryFeeFn = v.ActualDeliveryAmountCent - baseDeliveryFeeFn = v.TotalDeliveryAmountCent + deliveryFeeFn = v.ActualDeliveryAmountCent // 优惠后 + baseDeliveryFeeFn = v.TotalDeliveryAmountCent // 原始配送费 } // 异常检测 @@ -206,6 +206,8 @@ func (a *API) QueryOrder(partnerOrderCode string) (result *GetOrderDetailRes, er if err := json.Unmarshal([]byte(data["business_data"].(string)), &fnResult); err != nil { return nil, err } + fnResult.OrderActualAmountCent += int64(utils.WayBillDeliveryMarkUp) + fnResult.OrderTotalAmountCent += int64(utils.WayBillDeliveryMarkUp) return fnResult, nil } diff --git a/platformapi/mtpsapi/mtpsapi.go b/platformapi/mtpsapi/mtpsapi.go index 4305d884..267f0e90 100644 --- a/platformapi/mtpsapi/mtpsapi.go +++ b/platformapi/mtpsapi/mtpsapi.go @@ -346,6 +346,8 @@ func (a *API) QueryOrderStatus(deliveryId int64, mtPeiSongId string) (retVal map if err != nil { return nil, err } + result.Data["delivery_fee"] = utils.MustInterface2Float64(result.Data["delivery_fee"]) + utils.MustInterface2Float64(utils.WayBillDeliveryMarkUp) + result.Data["pay_amount"] = utils.MustInterface2Float64(result.Data["pay_amount"]) + utils.MustInterface2Float64(utils.WayBillDeliveryMarkUp) return result.Data, nil } diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index baa13a44..a7a727d0 100644 --- a/platformapi/mtwmapi/mtwmapi_test.go +++ b/platformapi/mtwmapi/mtwmapi_test.go @@ -24,10 +24,10 @@ func init() { // 果园 // api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "") - api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "") + //api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "") //商超 - //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_n4TwqCntWWuvQwAawzxC0w") //token_n4TwqCntWWuvQwAawzxC0w + api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_nFTOat5DYhvqHIZbDZRJkQ") //token_n4TwqCntWWuvQwAawzxC0w cookieStr := ` acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1; ` diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index f82b6f48..8d53b70a 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -120,10 +120,10 @@ func TestRetailListAll(t *testing.T) { // 删除所有门店商品 func TestReloadStoreSku(t *testing.T) { - result, err := api.RetailListAll("17817296") + result, err := api.RetailListAll("17223201") if err == nil { for i := 0; i < len(result); i++ { - err := api.RetailDelete(utils.Int64ToStr(time.Now().Unix()), "17817296", result[i].AppFoodCode) + err := api.RetailDelete(utils.Int64ToStr(time.Now().Unix()), "17223201", result[i].AppFoodCode) if err != nil { fmt.Println(err) } diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index fb0d6331..a5271778 100644 --- a/platformapi/tiktok_shop/tiktok_api/afs_test.go +++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go @@ -18,7 +18,7 @@ import ( // "authority_id": "" //}` -var token = `{"access_token":"71896365-cec7-4982-a686-0d8f3044cc1e","expires_in":1682872676,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"76d410d2-e869-4ddc-b8ad-0ae652114e13","authority_id":""}` +var token = `{"access_token":"09e5b626-418f-4780-ab33-857ba8f69b49","expires_in":1684077242,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"04a82701-a439-4dad-a20a-48299b0dffcd","authority_id":""}` //var token = `{"access_token":"e3173e9f-266f-4d87-88e7-e7cd837bc9d9","expires_in":1672882632,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"5070aae2-493f-46bd-b5d6-6ea0cd64729f","authority_id":""}` diff --git a/platformapi/tiktok_shop/tiktok_api/delete_test.go b/platformapi/tiktok_shop/tiktok_api/delete_test.go index 39ca56dd..207710a6 100644 --- a/platformapi/tiktok_shop/tiktok_api/delete_test.go +++ b/platformapi/tiktok_shop/tiktok_api/delete_test.go @@ -30,3 +30,9 @@ func tryCatName2Code(originName string) (catCodeStr string) { } return catCodeStr } + +func TestCa(t *testing.T) { + name := "四川省" + fmt.Println(len(name)) + fmt.Println(name[0:6]) +} diff --git a/platformapi/tiktok_shop/tiktok_api/sku_test.go b/platformapi/tiktok_shop/tiktok_api/sku_test.go index c3dcfd40..3d931aad 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go @@ -303,7 +303,7 @@ func TestDeleteSkuAndUploadSkuXiaJiaBiXu(t *testing.T) { CheckStatus: 1, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架 Page: int64(i), Size: 100, - StoreId: v, + StoreId: 63509510, }) if err != nil { globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false)) diff --git a/platformapi/uuptapi/waybill.go b/platformapi/uuptapi/waybill.go index 60a1c7e7..9db2873d 100644 --- a/platformapi/uuptapi/waybill.go +++ b/platformapi/uuptapi/waybill.go @@ -67,6 +67,7 @@ func (a *API) GetOrderDetail(orderCode string) (*GetOrderDetailResp, error) { } con := retVal != GetOrderDetailResp{} if con { + retVal.OrderPrice = utils.Float64ToStr(utils.Str2Float64(retVal.OrderPrice) + float64(utils.WayBillDeliveryMarkUp/100)) return &retVal, nil } else { return nil, fmt.Errorf("UU跑腿未返回运单详情") diff --git a/utils/typeconv.go b/utils/typeconv.go index 66da9b30..32e42cfd 100644 --- a/utils/typeconv.go +++ b/utils/typeconv.go @@ -23,8 +23,9 @@ var json1 = jsoniter.ConfigCompatibleWithStandardLibrary const MaxTimeSecond = 9573800254 // 正常最大的秒数 var ( - DefaultTimeValue = Str2Time("1970-01-01 00:00:00") - ZeroTimeValue = time.Time{} + DefaultTimeValue = Str2Time("1970-01-01 00:00:00") + WayBillDeliveryMarkUp = 20 // 运单加价两毛钱 + ZeroTimeValue = time.Time{} ) func UnmarshalUseNumber(data []byte, result interface{}) error {