1

platformapi/jdapi/jdapi_test.go

@@ -33,8 +33,8 @@ func init() {
 	// 果切
 	//api = New("3ef42248-1247-4efa-8624-43cd3a3b97ae", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26")
 
-	// 京东超市 381564
-	api = New("f99d25b8-33a6-4251-a97c-5e24b80b0005", "d2d1e2e3213d4320bc2712a684307831", "1750f5b9848d4a6492c1c20b487074da")
+	// 京东超市 359459
+	api = New("21ff22c5-0716-4c05-9468-8e4dde2b1cd6", "21b627c23ea04c69b64b48d0b361213e", "51cd27a748e64c829b4b7f83f4844610")
 	//prod zs
 	// api = New("6f8d3290-0120-4ad7-8b53-943c67c84f3f", "789279b9ae814ba091ac52815566b54d", "5d668cd227644637bb0fd73ed8118ec8")
 	// const cookieValue = "YYJV3NHVBPHLD36FWP6F3EM5PTXJ2XZQS7U4HWRIDPP4IWGUKUIB4XG5N26CZRDLDF7PKOXBPD6BNTUAJLETLZOIWMCVFI3K6MYZIY4QBIXIMXYDJNUKFGJVQTN5356SAD6WPCIHWNQAG7DDMF7L7S3SHCT3RM3CQG7IJIPUQ3THS5UIUYWMKINM7ETUOQB7OBPOPZVCT3ZJY55243TDVXLO25PP4UYSPTTPMNQ7HPMWOJKJ3BJWGVHD243MXH7NZWW264TKN5UOCJBSSSOKD2QQII"

platformapi/jdapi/store_page.go

@@ -1033,12 +1033,14 @@ func (a *API) GetJdUpcCodeByName(name, upcCode string, pageNo, pageSize int) (pr
 			for _, vv := range ImgStr {
 				ImgList = append(ImgList, "http://img20.360buyimg.com/vc/"+vv.(string))
 			}
+			category, _ := utils.TryInterface2Int64(v.(map[string]interface{})["thirdCategoryId"])
 			productInfo := &ProductInfo{
 				OriginalName: v.(map[string]interface{})["name"].(string),
 				UpcCode:      v.(map[string]interface{})["upcCode"].(string),
 				Weight:       float32(utils.Interface2Float64WithDefault(v.(map[string]interface{})["weight"], 0) * 1000),
 				ImgList:      ImgList,
 				BrandName:    v.(map[string]interface{})["brandName"].(string),
+				Categories:   []string{utils.Int64ToStr(category)},
 			}
 			productInfos = append(productInfos, productInfo)
 		}

platformapi/mtwmapi/callback.go

@@ -36,6 +36,8 @@ const (
 	MsgTypeStoreAuditStatusChanged = "storeAuditStatusChanged"
 	MsgTypeSkuDelete               = "skuDelete"
 	MsgTypeStoreBind               = "storeBind"
+
+	MsgTypeOrderAgree = "agree" // 同意退款回调
 )
 
 type CallbackResponse struct {

platformapi/mtwmapi/mtwmapi_test.go

@@ -20,13 +20,13 @@ func init() {
 	baseapi.Init(sugarLogger)
 
 	// 菜市
-	api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "")
+	//api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "")
 
 	// 果园
 	//api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")
 
 	//商超
-	//api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_nngsVP37s-HXY86xe85H7Q") //token_n4TwqCntWWuvQwAawzxC0w
+	api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_nngsVP37s-HXY86xe85H7Q") //token_n4TwqCntWWuvQwAawzxC0w
 	//api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_r36FEse6_ywebQI65FNNWA") //token_n4TwqCntWWuvQwAawzxC0w
 	cookieStr := `
 		acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1;

platformapi/mtwmapi/retail_test.go

@@ -93,7 +93,7 @@ func TestRetailCatDelete(t *testing.T) {
 }
 
 func TestRetailList(t *testing.T) {
-	result, err := api.RetailList("18900165", 2100, 100)
+	result, err := api.RetailList("18900165", 1, 100)
 	if err != nil {
 		t.Fatal(err)
 	}