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-07-26 15:50:37 +08:00
parent 083b8f7e1c 59c137b98b
commit 4666776a41
8 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platformapi/ebaiapi/order.go
View File

@@ -32,6 +32,7 @@ const (
)
const (
WaybillStatusEvent = "1" // 一般事件
WaybillStatusNew = "2" // 生成运单
WaybillStatusRequestDelivery = "3" // 请求配送
WaybillStatusWait4Courier = "4" // 等待分配骑士

9
platformapi/fnpsapi/fn_test.go
View File

@@ -21,7 +21,7 @@ func init() {
api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "5375691", "")
//token, _ := api.GetAccessToken()
api.accessToken = "c7ed10b7-3ecf-4def-adc1-9f43d5e9480c"
api.accessToken = "0d572b0b-9742-4e2b-9d00-5a6609867dd3"
}
// 查询单个门店
@@ -198,3 +198,10 @@ func TestCancelOrder(t *testing.T) {
err := api.CancelOrder(&param) // 1100537991119839487 1100536591119839487
globals.SugarLogger.Debug("err:= %s", utils.Format4Output(err, false))
}
func TestComplaintRider(t *testing.T) {
api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "51658", "")
api.accessToken = "0d572b0b-9742-4e2b-9d00-5a6609867dd3"
err := api.ComplaintRider("1100643132821623946", "300000718145112173", 160, "1")
fmt.Println(err)
}

10
platformapi/fnpsapi/order.go
View File

@@ -269,17 +269,19 @@ func (a *API) ComplaintOrder(req *ComplaintOrderReq) (err error) {
return err
}
func (a *API) ComplaintRider(partnerOrderCode string, orderComplaintCode int) (err error) {
func (a *API) ComplaintRider(partnerOrderCode string, orderId string, orderComplaintCode int, resonDes string) (err error) {
orderHead := a.MakeFnRequestHead()
bytes, err := json.Marshal(map[string]interface{}{
"partner_order_code": partnerOrderCode,
"order_id": orderId,
"order_complaint_code": orderComplaintCode,
"order_complaint_desc": resonDes,
"partner_order_code": partnerOrderCode,
})
if err != nil {
return err
}
orderHead["businessData"] = string(bytes)
_, err = a.AccessAPI(ApiURL, "cancelOrder", RequestPost, orderHead)
orderHead["business_data"] = string(bytes)
_, err = a.AccessAPI(ApiURL, "complaintOrder", RequestPost, orderHead)
return err
}

40
platformapi/tao_vegetable/order_test.go
View File

@@ -21,8 +21,8 @@ func TestName(t *testing.T) {
}
func TestGetOrderDetail(t *testing.T) {
requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
StoreId: utils.String2Pointer("JX668594"),
BizOrderId: utils.Int64ToPointer(5000902065494700922),
StoreId: utils.String2Pointer("JX102751"),
BizOrderId: utils.Int64ToPointer(5000908068888360754),
}}
data, err := apiTao.QueryOrderDetail(requestParam)
globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
@@ -46,12 +46,13 @@ func TestQueryAfsOrderDetail(t *testing.T) {
param := &request591.AlibabaWdkOrderRefundGetRequest{
OrderFrom: utils.Int64ToPointer(31),
ShopId: nil,
StoreId: utils.String2Pointer("JX668594"),
RefundIds: &[]int64{1314241374},
StoreId: utils.String2Pointer("JX102751"),
RefundIds: &[]int64{1315405271},
}
data, err := apiTao.QueryAfsOrderDetail(param)
globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false))
}
// 接单
@@ -87,7 +88,7 @@ func TestDeliveryFinishREJECTED(t *testing.T) {
}
func TestGetTransactionOrderList(t *testing.T) {
queryData := time.Now().AddDate(0, 0, 6)
queryData := time.Now().AddDate(0, 0, 0)
create := time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 0, 0, 0, 0, queryData.Location())
end := time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 23, 59, 59, 59, queryData.Location())
createTime := util.LocalTime(create)
@@ -96,12 +97,12 @@ func TestGetTransactionOrderList(t *testing.T) {
var PageSize int64 = 20
param := &request591.AlibabaWdkOrderListRequest{
BatchQueryRequest: &domain591.AlibabaWdkOrderListBatchQueryRequest{
StoreIds: &[]string{"JX668594"},
StoreIds: &[]string{"JX102751"},
StartTime: &createTime,
EndTime: &endTime,
OrderFrom: utils.Int64ToPointer(ChannelCome),
ShopId: nil,
StoreId: utils.String2Pointer("JX668594"),
StoreId: utils.String2Pointer("JX102751"),
BizType: nil,
},
}
@@ -113,20 +114,21 @@ func TestGetTransactionOrderList(t *testing.T) {
globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false))
return
}
globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
// 取消订单
for _, v := range *data.Orders {
err := apiTao.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{
WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
StoreId: utils.String2Pointer("JX668594"),
BizOrderId: utils.Int64ToPointer(*v.BizOrderId),
Status: utils.String2Pointer("REJECTED"),
},
})
if err != nil {
fmt.Println(err)
}
}
//for _, v := range *data.Orders {
// err := apiTao.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{
// WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
// StoreId: utils.String2Pointer("JX668594"),
// BizOrderId: utils.Int64ToPointer(*v.BizOrderId),
// Status: utils.String2Pointer("REJECTED"),
// },
// })
// if err != nil {
// fmt.Println(err)
// }
//}
}
func TestPickUp(t *testing.T) {

5
platformapi/tao_vegetable/store_sku.go
View File

@@ -15,11 +15,6 @@ import (
func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableResultList, error) {
client := ability585.NewAbility585(&a.client)
data, _ := client.AlibabaWdkSkuAdd(param, a.token)
if !*data.Result.Success {
//globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.Result, false))
return nil, fmt.Errorf(*data.Result.ErrMsg)
}
var foodList = make([]VegetableResultList, 0, len(*data.Result.Models))
for _, v := range *data.Result.Models {
if *v.Success {

10
platformapi/tao_vegetable/store_sku_test.go
View File

@@ -115,11 +115,11 @@ func TestUpdateSku(t *testing.T) {
param := &request585.AlibabaWdkSkuUpdateRequest{}
updateSkuList := make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
updateSku := domain585.AlibabaWdkSkuUpdateSkuDo{
OuCode: utils.String2Pointer("JX668594"),
SkuCode: utils.String2Pointer("19930827"),
AvgWeight: utils.String2Pointer("1"),
ItemTypeNew: utils.Int64ToPointer(1),
OnlineSaleFlag: utils.Int64ToPointer(1),
OuCode: utils.String2Pointer("JX667321"),
SkuCode: utils.String2Pointer("26024"),
ShortTitle: utils.String2Pointer("小时达"),
SkuPrice: utils.String2Pointer("80"),
CleanSkuMemberPrice: utils.Int64ToPointer(1),
}
updateSkuList = append(updateSkuList, updateSku)
param.ParamList = &updateSkuList

2
platformapi/tiktok_shop/tiktok_api/afs_test.go
View File

@@ -18,7 +18,7 @@ import (
// "authority_id": ""
//}`
var token = `{"access_token":"ec2e3053-73dc-4e39-87ba-db081bbb55df","expires_in":1689492851,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"f7d2e88c-28c6-46bd-b63a-3d3c49ce0c76","authority_id":""}`
var token = `{"access_token":"6045a7f5-622e-4126-b555-46a4da29e80a","expires_in":1690341662,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"6092b5c5-af6e-4481-92e1-545632c58247","authority_id":""}`
//var token = `{"access_token":"e3173e9f-266f-4d87-88e7-e7cd837bc9d9","expires_in":1672882632,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"5070aae2-493f-46bd-b5d6-6ea0cd64729f","authority_id":""}`

3
platformapi/tiktok_shop/tiktok_api/sku_test.go
View File

@@ -396,9 +396,10 @@ func TestDeleteSkuAndUploadSkuFengJinBiXu22332(t *testing.T) {
for i := 1; i < 100; i++ {
result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
Status: 0,
CheckStatus: 4, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
Page: int64(i),
Size: 100,
StoreId: 81521327,
})
if err != nil {
globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))