liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改美团配送费

Browse Source
This commit is contained in:
邹宗楠
2022-03-01 17:59:43 +08:00
parent f4c41c6f92
commit 2d38ef4307
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platformapi/jdshopapi/jdshopapi.go
View File

@@ -35,9 +35,10 @@ const (
CreateCatType = "3"
UpdateCatType = "1"
VenderID = 10374877
VendorID2 = 10569615
TransportID = 2158480
VenderID = 10374877
VendorID2 = 10569615
TransportID = 2158480
JxBrandId = 559853
BrandIdNO = 44259
JdShopMaxStock = 9999

2
platformapi/jdshopapi/jxshopapi_test.go
View File

@@ -17,7 +17,7 @@ func init() {
//api = New("de8157b447584885910f429011e49cb93yjq", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608")
api = New("9ad9cf5fc8b140b19a1dbbb700b47676kown", "D5E8352BE0786ED16F77B4548F62F09A", "71e1061ac2f246f6ac27efb900edba12")
api.SetCookieWithStr(`
__jdu=16193999982702078345144; shshshfpa=972f47df-9252-dc1a-1d6d-40594ce0501b-1619400562; shshshfpb=msX4 2n384blCOGusOxGDvQ==; shshshfp=9da7a5918c30efff2d83d2e76e038104; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA==; _pst=shop_jxcs2020; unpl=V2_ZzNtbUUDQREhWEEEfRALBWICFw0SABRGJQ4UBiwZVARhUBVVclRCFnUURlRnGl4UZwQZWUtcRh1FCEdkeB5fA2AFEFlBZxBFLV0CFi9JH1c+bRFdQldAEnMNTlJ5KWwGZzMSXHJXRBV9Ck5ccxFVBmECEVxEXkEQcQhDUUspWzVXMxtUQVdAHUUJdlVLWwhZZAcQWEVSDhVyCE5WcxFUDW4AFFxBVkUcdw1CVH4cbARXAA==; __jdv=146675836|baidu|-|organic|not set|1637658437539; mba_muid=16193999982702078345144; language=zh_CN; TrackID=1W8w9NLuq4S50lkwv8JtCUNTvSyYj7bot4ok8TRsqbWlkD-GdnreCK-BqyOp-gUCSeQ9k2TIpy1-CQcfI9YS4-djLQhA2Cdv9QlOLAB0hAsQ; ceshi3.com=000; csrf_token=945bd9f3-589f-4a60-b5e7-22c6c3fb620f; __jda=191429163.16193999982702078345144.1619399998.1638774309.1638778797.26; __jdc=191429163; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C561CF333BD600FBBA0614CC0CC9C84890067CDB94FCA25212A13EB8D5325FD565304346F953AD61D5F826F31654D9FC275C080E316BA6E5F8A170EDEE1FD2818C6CC26047E6CCB39F2D6592D1A34E20EAF472A3FCBB4A3E855DD4E64C7C225A6DFB0291E473782276770B44AD9CC26D1C; __jdb=191429163.7.16193999982702078345144|26.1638778797; 3AB9D23F7A4B3C9B=CKENC5MAUU744ZQDKVRY2L7UIJ23PJRDYJ6HF3ZMQHC5FFD46FMUQXRINFCOC4SKHL5MU3PPNPP4C4AX5ZYBXJ7LZ4; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTWO2FYZUY3LKK3NB5X4VTKS5M2Y; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGC7PMXDQLEPMYSBX5NFL2KW3CPHJVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKLJLFWRDS24AOJXCSSY7KBWJ5OGPRXGVJKSRURJW2KZNUI4WXADSNYUUWH2QNSPLRR4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUV5PU7WXHB5E33C4UDZD56XP2ZMY; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRHSHR25YQUFIV6QAUQKBJV6NUNIQQV7FEF6MBQGPZB6KWTFAM2VFA; chat.jd.com=20170206
__jdu=16193999982702078345144; shshshfpa=972f47df-9252-dc1a-1d6d-40594ce0501b-1619400562; shshshfpb=msX4 2n384blCOGusOxGDvQ==; shshshfp=9da7a5918c30efff2d83d2e76e038104; mba_muid=16193999982702078345144; __jdv=56585130|baidu|-|organic|notset|1642475618920; language=zh_CN; universityLanguage=zh_CN; xue_userTypeCookieName9c23a992282953b93062965821b46770="{\"1\":\"POP\"}"; xue_userTypePageCookieName9c23a992282953b93062965821b46770=1; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTGADOK2RJIU47MKOSXS5VKMNCQI; chat.jd.com=20170206; QRCodeKEY=1F5EF119C39132D572575E642D8094F959F0D1036106C281D79092DB856876439D2938D1818DA81A6C2501F503C01641; AESKEY=0197C6098A07A174; UIDKEY=53834850077161597; TrackID=1tFvOgPmYgLlojcVrvnDA2-HLM9zUdbg9ek1iEXedWjPzG5wjBlXQwcA8VlGfx6H5t6-YgTFqGWO3h0cac3gLOvYyd_YNEYyVTG8SrBvm0yU; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C5BBB00ECA0DC9ADBA47574F9DE63AA2E9B27C6C221CCD68C7F9AF76C77FCB4AEA9AB04368C0374EA19CBFF5DD28084CA8557DEE2659BE17ABF46F57CDD18F2418EC67B1587D130DE623ED4B88809CD57621D5E1F12DEA1BE4B4BF537068173947A1BFF803DE3A49DC134CDD730B2B5832; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; ceshi3.com=000; _tp=VqmxIvk3BVEJnO6UciQrRA==; _pst=shop_jxcs2020; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGCZTAIAAR76MR3JYSCXEL4VRMVHDVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKIYUO7MKGTHLUGGIVONPDTD6V4M7RXGVJKSRURJWGFDX3CRUZ25BRSFLTLY4Y7VPDF4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVQQ2BVHXJJ4G5F4EPTJ7EXKHG2U; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRGKPRJELTMA3XNYJ6L4I5SDCCX3BRBQ5MYIG62BOTHBD2UDQH3VIK; __jda=191429163.16193999982702078345144.1619399998.1637571581.1638761854.24; __jdb=191429163.20.16193999982702078345144|24.1638761854; __jdc=191429163; 3AB9D23F7A4B3C9B=CKENC5MAUU744ZQDKVRY2L7UIJ23PJRDYJ6HF3ZMQHC5FFD46FMUQXRINFCOC4SKHL5MU3PPNPP4C4AX5ZYBXJ7LZ4
`)
// api.SetCookie("thor", "5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C5E43030CF54E4A3A8F5E760492948E69B763D115FE234A59948BA538A4F7E18F38B80F818E28EAE71F1CF5BFE2D0DC456D56E8BEAEF10D398C709D9A4EB46923C7E63867435BD42996F1570A816FD1B0B247CD9756A1184DD61317D28BBF77F828691684AD6E60801B2BB38F9DE086D73")

10
platformapi/jdshopapi/sku_test.go
View File

@@ -177,10 +177,10 @@ func TestCreateSku(t *testing.T) {
// AttrID: "160508",
// AttrValues: []string{"0.5"},
// }
attr4 := &CreateSkuParamAttrs{
AttrID: "140190",
AttrValues: []string{"730802"},
}
//attr4 := &CreateSkuParamAttrs{
// AttrID: "140190",
//AttrValues: []string{"730802"},
//}
// attr5 := &CreateSkuParamAttrs{
// AttrID: "1000022043",
// AttrValues: []string{"2515313135"},
@@ -192,7 +192,7 @@ func TestCreateSku(t *testing.T) {
// attrs = append(attrs, attr1)
// attrs = append(attrs, attr2)
// attrs = append(attrs, attr3)
attrs = append(attrs, attr4)
//attrs = append(attrs, attr4)
// attrs2 = append(attrs2, attr5)
// attrs3 = append(attrs3, attr6)
ware.MultiCateProps = attrs

2
platformapi/jdshopapi/store_page_test.go
View File

@@ -71,7 +71,7 @@ func TestAllOrders(t *testing.T) {
//StoreID: "",
//OrderStatusArray: nil,
//OrderID: "",
OrderCreateDateRange: []string{"2021-12-06 00:00:46", "2021-12-06 17:19:46"},
OrderCreateDateRange: []string{"2022-01-26 00:00:46", "2022-01-26 17:19:46"},
//SelectedTabName: "allOrders",
//SortName: "desc",
})

10
platformapi/mtpsapi/mtpsapi.go
View File

@@ -118,9 +118,10 @@ type OrderInfo struct {
}
type OrderResponse struct {
MtPeisongID string `json:"mt_peisong_id"`
DeliveryID int64 `json:"delivery_id"`
OrderID string `json:"order_id"`
MtPeisongID string `json:"mt_peisong_id"`
DeliveryID int64 `json:"delivery_id"`
OrderID string `json:"order_id"`
DeliveryFee float64 `json:"delivery_fee"`
}
type ResponseResult struct {
@@ -287,11 +288,13 @@ func (a *API) AccessAPI(action string, params map[string]interface{}) (retVal *R
return a.AccessAPI2(mtpsAPIURL, action, params)
}
// 获取美团配送内部订单id，外部系统订单id，美团配送费用
func (a *API) result2OrderResponse(result *ResponseResult) (order *OrderResponse) {
order = new(OrderResponse)
order.MtPeisongID = result.Data["mt_peisong_id"].(string)
order.DeliveryID = utils.MustInterface2Int64(result.Data["delivery_id"])
order.OrderID = result.Data["order_id"].(string)
order.DeliveryFee = utils.MustInterface2Float64(result.Data["delivery_fee"])
return order
}
@@ -311,6 +314,7 @@ func (a *API) CreateOrderByShop(basicParams *CreateOrderByShopParam, addParams m
}
}
// 获取美团订单费用
func (a *API) CreateOrderByShop2(basicParams *CreateOrderByShopParam) (order *OrderResponse, err error) {
params := utils.Struct2MapByJson(basicParams)
if basicParams.OrderType != OrderTypeBook {