diff --git a/platformapi/sfps2/order.go b/platformapi/sfps2/order.go index 01fc8656..12ca1c5b 100644 --- a/platformapi/sfps2/order.go +++ b/platformapi/sfps2/order.go @@ -13,7 +13,7 @@ import ( func (a *API) PreCreateOrder(preOrder *PreCreateOrderReq) (price float64, err error) { //补全默认参数 preOrder.PushTime = time.Now().Unix() - preOrder.DevId = a.devId + //preOrder.DevId = a.devId resp := a.HttpPostJson("precreateorder", preOrder) globals.SugarLogger.Debugf("sfps PreCreateOrder:preOrder=%s", utils.Format4Output(preOrder, false)) globals.SugarLogger.Debugf("sfps PreCreateOrder:resp=%s", utils.Format4Output(resp, false)) @@ -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_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)