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

Merge branch 'master' of https://e.coding.net/rosydev/baseapi

Browse Source
This commit is contained in:
richboo111
2023-09-25 15:09:58 +08:00
parent ade9263aa0 bf7364b7c1
commit fa31340d41
10 changed files with 130 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformapi/mtwmapi/mtwmapi.go
View File

@@ -40,7 +40,7 @@ const (
resultKeySuccessMsg = "success_msg"
)
const (
GeneralMaxLimit = 200 // 大多数的API的批处理最大条数
GeneralMaxLimit = 100 // 大多数的API的批处理最大条数
)
const (

2
platformapi/mtwmapi/mtwmapi_test.go
View File

@@ -26,7 +26,7 @@ func init() {
//api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")
//商超
//api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_izAHEkoEl4lV-w4JdJFNww") //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;

13
platformapi/mtwmapi/order_test.go
View File

@@ -17,9 +17,20 @@ func TestOrderViewStatus(t *testing.T) {
}
t.Log(result)
}
func TestTimne(t *testing.T) {
fmt.Println(utils.Interface2Int64WithDefault(1695292241, 0))
fmt.Println(getTimeFromTimestamp(utils.Interface2Int64WithDefault(1695292241, 0)))
}
func getTimeFromTimestamp(timeStamp int64) time.Time {
if timeStamp < 1538103149 { // 立即达订单给的是1（而不是空，0），1538103149不是特殊值，只是一个任意之前的时间，这样写可以处理
return utils.DefaultTimeValue
}
return utils.Timestamp2Time(timeStamp)
}
func TestOrderGetOrderDetail(t *testing.T) {
result, err := api.OrderGetOrderDetail(1100692033635137950, false)
result, err := api.OrderGetOrderDetail(1000732590328335860, false)
if err != nil {
t.Fatal(err)
}

2
platformapi/mtwmapi/poi_test.go
View File

@@ -24,7 +24,7 @@ func TestPoiGetIDs(t *testing.T) {
}
func TestPoiMGet(t *testing.T) {
result, err := api.PoiMGet([]string{"18822904"})
result, err := api.PoiMGet([]string{"18172253"})
t.Log(utils.Format4Output(result, false))
if err != nil {
t.Fatal(err)

33
platformapi/mtwmapi/retail.go
View File

@@ -1,12 +1,10 @@
package mtwmapi
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"regexp"
"strings"
"time"
"git.rosy.net.cn/baseapi/utils"
)
const (
@@ -125,6 +123,7 @@ type AppFood struct {
Unit string `json:"unit"`
Utime int `json:"utime"`
ZhName string `json:"zh_name"`
CommonAttrValue string `json:"common_attr_value"`
}
type AppFoodResult struct {
@@ -187,9 +186,8 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat
params := utils.Struct2MapByJson(updateParams)
params[KeyAppPoiCode] = poiCode
params["category_name"] = catName
time.Sleep(200 * time.Millisecond)
_, err = a.AccessAPI("retailCat/update", false, params)
return err
}
@@ -242,19 +240,16 @@ func (a *API) RetailList(poiCode string, offset, limit int) (foodList []*AppFood
return foodList, err
}
func (a *API) RetailListAll(poiCode string) (foodList []*AppFood, err error) {
offset := 0
for {
batchList, err2 := a.RetailList(poiCode, offset, GeneralMaxLimit)
if err = err2; err == nil {
foodList = append(foodList, batchList...)
}
if len(batchList) < GeneralMaxLimit {
break
}
offset += GeneralMaxLimit
func (a *API) RetailListAll(poiCode string, offset int) (foodList []*AppFood, err error) {
data := make([]*AppFood, 0, 0)
offset = offset * GeneralMaxLimit
batchList, err2 := a.RetailList(poiCode, offset, GeneralMaxLimit) // GeneralMaxLimit
globals.SugarLogger.Debugf("==========batchList %d", len(batchList))
globals.SugarLogger.Debugf("==========batchList %s", utils.Format4Output(err2, false))
if err = err2; err == nil {
data = append(data, batchList...)
}
return foodList, err
return data, err
}
func handleRetailBatchResult(result interface{}) (failedFoodList []*AppFoodResult, err error) {
@@ -296,6 +291,7 @@ func (a *API) RetailInitData(trackInfo, poiCode, foodCode string, params map[str
}
func (a *API) RetailBatchInitData(trackInfo, poiCode string, foodDataList []map[string]interface{}) (failedFoodList []*AppFoodResult, err error) {
globals.SugarLogger.Debugf("foodDataList :%s", utils.Format4Output(foodDataList, false))
result, err := a.AccessAPI2("retail/batchinitdata", false, map[string]interface{}{
KeyAppPoiCode: poiCode,
"food_data": string(utils.MustMarshal(foodDataList)),
@@ -303,6 +299,9 @@ func (a *API) RetailBatchInitData(trackInfo, poiCode string, foodDataList []map[
if err == nil {
failedFoodList, err = handleRetailBatchResult(result)
}
globals.SugarLogger.Debugf("result :%s", utils.Format4Output(result, false))
globals.SugarLogger.Debugf("err :%s", utils.Format4Output(err, false))
return failedFoodList, err
}

116
platformapi/mtwmapi/retail_test.go
View File

@@ -3,21 +3,20 @@ package mtwmapi
import (
"errors"
"fmt"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"strings"
"testing"
"time"
"git.rosy.net.cn/baseapi/utils"
)
// 测试添加分类
func TestRetailCatUpdate(t *testing.T) {
err := api.RetailCatUpdate("17250949", "火腿罐头", &Param4UpdateCat{
CategoryNameOrigin: "",
CategoryCodeOrigin: "",
CategoryCode: "",
Sequence: 0,
err := api.RetailCatUpdate("19120530", "海鲜火锅丸", &Param4UpdateCat{
CategoryNameOrigin: "海鲜火锅丸",
CategoryCodeOrigin: "",
CategoryCode: "",
SecondaryCategoryName: "火锅丸",
Sequence: 1,
})
if err != nil {
t.Fatal(err)
@@ -26,7 +25,7 @@ func TestRetailCatUpdate(t *testing.T) {
// 测试获取门店分类列表
func TestRetailCatList(t *testing.T) {
result, err := api.RetailCatList("12663480")
result, err := api.RetailCatList("18900165")
if err != nil {
t.Fatal(err)
}
@@ -94,8 +93,7 @@ func TestRetailCatDelete(t *testing.T) {
}
func TestRetailList(t *testing.T) {
result, err := api.RetailList("8967897"+
"", 0, 20)
result, err := api.RetailList("18900165", 2100, 100)
if err != nil {
t.Fatal(err)
}
@@ -106,31 +104,6 @@ func TestRetailList(t *testing.T) {
t.Log(len(result))
}
func TestRetailListAll(t *testing.T) {
result, err := api.RetailListAll("8967897")
if err != nil {
t.Fatal(err)
}
if len(result) == 0 {
t.Fatal("should have items")
}
t.Log(utils.Format4Output(result, false))
t.Log(len(result))
}
// 删除所有门店商品
func TestReloadStoreSku(t *testing.T) {
result, err := api.RetailListAll("17924337")
if err == nil {
for i := 0; i < len(result); i++ {
err := api.RetailDelete(utils.Int64ToStr(time.Now().Unix()), "17924337", result[i].AppFoodCode)
if err != nil {
fmt.Println(err)
}
}
}
}
func TestRetailGet(t *testing.T) {
result, err := api.RetailGet("18048546", "305011012")
if err != nil {
@@ -202,52 +175,33 @@ func TestErrList(t *testing.T) {
}
func TestRetailBatchInitData(t *testing.T) {
failedFoods, err := api.RetailBatchInitData(utils.GetUUID(), testPoiCode, []map[string]interface{}{
failedFoods, err := api.RetailBatchInitData(utils.GetUUID(), "19120530", []map[string]interface{}{
map[string]interface{}{
"app_food_code": "23841",
"box_num": 0,
"box_price": 0,
"category_name": "南北干货",
"description": "",
"is_sold_out": 0,
"min_order_count": 1,
"name": "干腐竹约150g/份",
"picture": "http://image.jxc4.com/5f7fba025fc9348796039423c48ac3f5.jpg",
"price": 1000,
"skus": []map[string]interface{}{
map[string]interface{}{
"price": 1000,
"sku_id": "23841",
"spec": "150g",
"stock": "*",
"upc": "",
},
},
// "tag_id": "200000380",
"unit": "份",
},
map[string]interface{}{
"app_food_code": "23840",
"box_num": 0,
"box_price": 0,
"category_name": "南北干货",
"description": "",
"is_sold_out": 0,
"min_order_count": 1,
"name": "干腐竹约150g/份",
"picture": "http://image.jxc4.com/5f7fba025fc9348796039423c48ac3f5.jpg",
"price": 1000,
"skus": []map[string]interface{}{
map[string]interface{}{
"price": 1000,
"sku_id": "23840",
"spec": "150g",
"stock": "*",
"upc": "",
},
},
"tag_id": "200000380",
"unit": "份",
"app_food_code": 1692848899,
"category_name": "调味用品",
"common_attr_value": "[{\"attrId\":1200000094,\"attrName\":\"产地\",\"setAttrId\":true,\"setAttrName\":true,\"setValueList\":true,\"valueList\":[{\"setValue\":true,\"setValueId\":true,\"value\":\"中国\",\"valueId\":100000050}],\"valueListIterator\":[{\"$ref\":\"$[0].valueList[0]\"}],\"valueListSize\":1},{\"attrId\":1200000135,\"attrName\":\"包装方式\",\"setAttrId\":true,\"setAttrName\":true,\"setValueList\":true,\"valueList\":[{\"setValue\":true,\"setValueId\":true,\"value\":\"袋\",\"valueId\":1300004918}],\"valueListIterator\":[{\"$ref\":\"$[1].valueList[0]\"}],\"valueListSize\":1},{\"attrId\":1200000088,\"attrName\":\"品牌\",\"setAttrId\":true,\"setAttrName\":true,\"setValueList\":true,\"valueList\":[{\"setValue\":true,\"setValueId\":true,\"value\":\"吉香居\",\"valueId\":1008695}],\"valueListIterator\":[{\"$ref\":\"$[2].valueList[0]\"}],\"valueListSize\":1}]",
"description": "",
"is_sold_out": 0,
"min_order_count": 1,
"name": "吉香居 麻辣萝卜干泡菜 52g/袋",
"picture": "http://p0.meituan.net/retailsp/f2aec3c090c7ee952f61301848f27c09917081.jpg,http://p0.meituan.net/retailsp/c93074d623f04272b28d7b03fd2b8699852829.jpg,http://p0.meituan.net/retailsp/8d2ef2c6f92b7c48f3673a67fe420fbe111196.jpg",
"picture_contents": "",
"price": 4.5,
"sequence": -117,
"skus": ` [
{
"ladder_box_num": "",
"ladder_box_price": "0.0",
"price": "4.5",
"sku_id": 1692848899,
"spec": "52g*1袋",
"stock": "9999",
"upc": "6926896703303",
"weight": "52"
}
]`,
"tag_id": 200005035,
"unit": "",
},
})
if err != nil {