diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index 1011db01..20c2689f 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -387,10 +387,14 @@ func TestCategoryAttrList(t *testing.T) { //特殊属性查询 func TestCategoryAttrValueList(t *testing.T) { - result, err := api.CategoryAttrValueList(1200000088, "散装糖果") + result, err := api.CategoryAttrValueList(1200000088, "【常用调味】干花椒 红花椒 ") + if len(result) > 0 { + fmt.Println("jejeje") + } if err != nil { t.Fatal(err) } + t.Log(utils.Format4Output(result, false)) } diff --git a/platformapi/sfps2/callback.go b/platformapi/sfps2/callback.go index 44a2eff0..f7bc65b9 100644 --- a/platformapi/sfps2/callback.go +++ b/platformapi/sfps2/callback.go @@ -68,17 +68,15 @@ type OrderComplete struct { OperatorPhone string `json:"operator_phone"` //配送员电话 OrderStatus float64 `json:"order_status"` //17配送员点击完成 PushTime int `json:"push_time"` //完成时间 - ReceiptType float64 `json:"receipt_type"` //1:正常签收, 2:商家退回签收 - RiderLng string `json:"rider_lng"` //配送员位置经度 - RiderLat string `json:"rider_lat"` //配送员位置纬度 - SFOrderID string `json:"sf_order_id"` //顺丰订单ID - SFUCode string `json:"sf_ucode"` - ShopId float64 `json:"shop_id"` // 店铺ID - ShopOrderID string `json:"shop_order_id"` //商家订单ID - UrlIndex string `json:"url_index"` //回调url前缀 - StatusDesc string `json:"status_desc"` //状态描述 - //PickUpPic string `json:"pickup_pic"` //只有在店铺打开妥投照片回调开关且有妥投照片时才有此字段 - + ReceiRptType float64 `json:"receiRpt_type"` + RiderLat float64 `json:"rider_lat"` + RiderLng float64 `json:"rider_lng"` + SfOrderID string `json:"sf_order_id"` + SfUcode string `json:"sf_ucode"` + ShopId float64 `json:"shop_id"` // 店铺ID + ShopOrderID string `json:"shop_order_id"` + StatusDesc string `json:"status_desc"` //状态描述 + UrlIndex string `json:"url_index"` } // SFCancel 顺丰原因订单取消回调 @@ -146,13 +144,10 @@ func (a *API) GetCallbackUrlIndex(request *http.Request) (map[string]interface{} temp = map[string]interface{}{} ) if err = json.Unmarshal(data, &temp); err == nil { - globals.SugarLogger.Debugf("GetCallbackUrlIndex temp=%s", utils.Format4Output(temp, false)) urlIndex = temp["url_index"].(string) - fmt.Println(urlIndex) } result := make(map[string]interface{}, 0) - switch urlIndex { case UrlIndexRiderStatus: retVal := RiderStatus{} diff --git a/platformapi/sfps2/sf_model.go b/platformapi/sfps2/sf_model.go index 61896fab..32731930 100644 --- a/platformapi/sfps2/sf_model.go +++ b/platformapi/sfps2/sf_model.go @@ -20,7 +20,7 @@ const ( DefaultVersion = 19 //参照文档主版本号填写 如:文档版本号1.9,version=19,推荐使用版本19 ) -//各城市正式店铺id +// SFCityStoreIDs 各城市正式店铺id var SFCityStoreIDs = map[string]string{ "怀化市": "3270454065601", "郴州市": "3270454085329", @@ -51,7 +51,7 @@ var SFCityStoreIDs = map[string]string{ "许昌市": "3270458247585", "开封市": "3270458296977", "商丘市": "3270641341457", - "驻马店市": "3270641372769", + "驻马市": "3270641372769", "新乡市": "3270641398977", "信阳市": "3270641464177", "安阳市": "3270641489553", @@ -67,6 +67,20 @@ var SFCityStoreIDs = map[string]string{ "承德市": "3270459200625", "秦皇岛市": "3270459223617", "张家口市": "3270459240321", + "武汉市": "3270468391969", + "襄阳市": "3270468418785", + "宜昌市": "3270468434017", + "荆州市": "3270468445137", + "荆门市": "3270468456545", + "孝感市": "3270468472897", + "鄂州店": "3270527285137", + "黄石市": "3270527303521", + "南宁市": "3270650685793", + "桂林市": "3270650714881", + "三亚市": "3270650742017", + "海口市": "3270650813681", + "柳州市": "3270650844193", + "北海市": "3270650890577", } const ( diff --git a/platformapi/sfps2/sf_test.go b/platformapi/sfps2/sf_test.go index cf58b84c..0389259a 100644 --- a/platformapi/sfps2/sf_test.go +++ b/platformapi/sfps2/sf_test.go @@ -7,8 +7,8 @@ import ( "testing" ) -//var api = New(AppID, AppKey)//测试 -var api = New(AppID2, AppKey2) //正式 +var api = New(AppID, AppKey) //测试 +//var api = New(AppID2, AppKey2) //正式 const ( //正式环境 @@ -64,11 +64,13 @@ func TestCreateOrder(t *testing.T) { param := &CreateOrderReq{ DevId: AppID, ShopId: TestSFStoreID, - ShopOrderId: "20230525Test", + ShopType: 1, + ShopOrderId: "2023090806", OrderSequence: "测试", OrderSource: OrderSourceELM, - OrderTime: 1684997166, - PushTime: 1684997166, + OrderTime: 1694168441, + LbsType: LbsTypeGD, + PushTime: 1694168441, Version: 19, ReturnFlag: 511, Receive: &ReceiveAddress{ diff --git a/platformapi/tao_vegetable/store_test.go b/platformapi/tao_vegetable/store_test.go index f9aa2a8e..f8472323 100644 --- a/platformapi/tao_vegetable/store_test.go +++ b/platformapi/tao_vegetable/store_test.go @@ -138,10 +138,12 @@ func TestUpdateStoreTest(t *testing.T) { } func TestShopUpdateStatus(t *testing.T) { - err := apiTao.ShopUpdateStatus("JX667321", 1) - if err != nil { - fmt.Println(err) - } + value := int(172736400) + fmt.Println(float64(value) / 1000000) + //err := apiTao.ShopUpdateStatus("JX667321", 1) + //if err != nil { + // fmt.Println(err) + //} } func TestSFStore(t *testing.T) {