diff --git a/platformapi/sfps2/order.go b/platformapi/sfps2/order.go index 01fc8656..739fe2c4 100644 --- a/platformapi/sfps2/order.go +++ b/platformapi/sfps2/order.go @@ -23,13 +23,16 @@ func (a *API) PreCreateOrder(preOrder *PreCreateOrderReq) (price float64, err er if resp.BaseRetVal.ErrorCode != SuccessCode { return 0, fmt.Errorf("%s", resp.BaseRetVal.ErrorMsg) } - retVal := PreCreateOrderResp{} - s, _ := json.Marshal(resp.BaseRetVal.Result) - if err = json.Unmarshal(s, &retVal); err == nil { - return retVal.ChargePriceList.ShopPayPrice, nil - } else { - return 0, err - } + temp := resp.BaseRetVal.Result.(map[string]interface{}) + temp1 := temp["charge_price_list"].(map[string]interface{}) + return temp1["shop_pay_price"].(float64), nil + //retVal := PreCreateOrderResp{} + //s, _ := json.Marshal(resp.BaseRetVal.Result) + //if err = json.Unmarshal(s, &retVal); err == nil { + // return retVal.ChargePriceList.ShopPayPrice, nil + //} else { + // return 0, err + //} } // CreateOrder 创建订单(店铺) diff --git a/platformapi/sfps2/sf_model.go b/platformapi/sfps2/sf_model.go index 005610c7..b3fe8385 100644 --- a/platformapi/sfps2/sf_model.go +++ b/platformapi/sfps2/sf_model.go @@ -22,31 +22,31 @@ const ( //各城市正式店铺id var SFCityStoreIDs = map[string]string{ - "怀化": "3270454065601", - "郴州": "3270454085329", - "岳阳": "3270454110257", - "益阳": "3270454134001", - "常德": "3270454048865", - "湘潭": "3270454033889", - "株洲": "3270454017249", - "长沙": "3270454000177", - "衡阳": "3270454177265", - "邵阳": "3270454197138", - "娄底": "3270454222193", + "怀化市": "3270454065601", + "郴州市": "3270454085329", + "岳阳市": "3270454110257", + "益阳市": "3270454134001", + "常德市": "3270454048865", + "湘潭市": "3270454033889", + "株洲市": "3270454017249", + "长沙市": "3270454000177", + "衡阳市": "3270454177265", + "邵阳市": "3270454197138", + "娄底市": "3270454222193", "张家界市": "3270454152001", - "深圳": "3270426486881", - "东莞": "3270426562113", - "惠州": "3270428815889", - "汕头": "3270428863057", - "汕尾": "3270428939649", - "揭阳": "3270428979601", - "潮州": "3270429008433", - "河源": "3270429030993", + "深圳市": "3270426486881", + "东莞市": "3270426562113", + "惠州市": "3270428815889", + "汕头市": "3270428863057", + "汕尾市": "3270428939649", + "揭阳市": "3270428979601", + "潮州市": "3270429008433", + "河源市": "3270429030993", "眉山市": "3270426822721", "内江市": "3270426793857", "泸州市": "3270426600177", - "成都": "3270426476337", - "郑州": "3270357468929", + "成都市": "3270426476337", + "郑州市": "3270357468929", } const ( diff --git a/platformapi/sfps2/sf_test.go b/platformapi/sfps2/sf_test.go index 7332d6c1..989e46d1 100644 --- a/platformapi/sfps2/sf_test.go +++ b/platformapi/sfps2/sf_test.go @@ -22,27 +22,36 @@ const ( //预下单 func TestPreCreateOrder(t *testing.T) { param := &PreCreateOrderReq{ - DevId: AppID, - ShopId: TestSFStoreID, - UserLng: "116.339392", - UserLat: "40.002349", - UserAddress: "北京市海淀区学清嘉创大厦A座15层", - Weight: 1000, - ProductType: 4, - PushTime: 1684996039, + DevId: 1663705444, + ShopId: "3270426476337", + UserLng: "104.052898", + UserLat: "30.685366", + UserAddress: "四川省成都市金牛区抚琴街道洛克中心写字楼", + Weight: 1, + ProductType: 6, + PushTime: 1691550274, ShopType: 1, - LbsType: LbsTypeGD, + CityName: "", + TotalPrice: 0, + IsAppoint: 0, + AppointType: 0, + ExpectTime: 0, + LbsType: 2, + IsInsured: 0, + IsPersonDirect: 0, + Vehicle: 0, + DeclaredValue: 0, + GratuityFee: 0, RiderPickMethod: 1, ReturnFlag: 1, - //IsAppoint: 0, - //AppointType: 2, - //ExpectPickupTime: int64(time.Now().Unix()), - //RiderPickMethod: 1, - //MultiPickupInfo: []*MultiPickupInfo{{ - // PickupShopAddress: "海淀区清河龙岗路51号清润家园小区 永辉", - // PickupLat: "40.030613", - // PickupLng: "116.354787", - //}}, + //Shop: { + // "shop_name": "印象汇果园测试店", + // "shop_phone": "18981810340", + // "shop_address": "成都市金牛区沙湾路1号汇龙湾生活广场", + // "shop_lng": "104.052898", + // "shop_lat": "30.685366" + //}, + //"multi_pickup_info": null } resp, err := api.PreCreateOrder(param) fmt.Println(resp)