This commit is contained in:
邹宗楠
2023-04-23 17:03:29 +08:00
parent 2e7f2d9328
commit 3a3c5887b4
10 changed files with 61 additions and 64 deletions

View File

@@ -18,7 +18,7 @@ import (
// "authority_id": ""
//}`
var token = `{"access_token":"c2c6e258-847d-4e8f-a695-b20488a5a667","expires_in":1682270239,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"ebf0e9f1-b200-47c2-a2bb-bafefbdaed47","authority_id":""}`
var token = `{"access_token":"cfb17c78-6aad-47db-80a3-a9ed9f7b3482","expires_in":1682516556,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"d921257a-1c39-491d-a691-bbf9850ed926","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":""}`

View File

@@ -95,7 +95,7 @@ func (a *API) RefreshToken() (*doudian_sdk.CreateTokenData, error) {
return nil, err
}
if createToken.Code != RequestSuccessCode {
return nil, errors.New(createToken.SubMsg)
return nil, errors.New(createToken.SubMsg + ":" + createToken.LogId)
}
a.accessToken = createToken.Data.AccessToken
a.refreshToken = createToken.Data.RefreshToken

View File

@@ -66,7 +66,7 @@ func (a *APIExpress) CreateToken() (*token_create_response.TokenCreateData, erro
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
a.accessToken = response.Data.AccessToken
@@ -98,7 +98,7 @@ func (a *APIExpress) RefreshToken() (*doudian_sdk.CreateTokenData, error) {
return nil, err
}
if createToken.Code != RequestSuccessCode {
return nil, errors.New(createToken.SubMsg)
return nil, errors.New(createToken.SubMsg + ":" + createToken.LogId)
}
a.accessToken = createToken.Data.AccessToken
a.refreshToken = createToken.Data.RefreshToken
@@ -160,7 +160,7 @@ func (a *APIExpress) OrderStatusAndPsInfo(param map[string]interface{}) error {
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}

View File

@@ -35,7 +35,7 @@ func (a *API) GetTiktokOrderDetail(orderId string) (*order_orderDetail_response.
return nil, err
}
if orderDetail.Code != RequestSuccessCode {
return nil, errors.New(orderDetail.SubMsg)
return nil, errors.New(orderDetail.SubMsg + ":" + orderDetail.LogId)
}
return orderDetail.Data.ShopOrderDetail, nil
@@ -54,7 +54,7 @@ func (a *API) QueryAfsOrderDetail(afterSaleId string, needOperationRecord bool)
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
return result, nil
}
@@ -72,7 +72,7 @@ func (a *API) ApplyMarketAfterSale(skuOrderId, count int64, afterSaleReason int3
return "", err
}
if result.Code != RequestSuccessCode {
return "", errors.New(result.SubMsg)
return "", errors.New(result.SubMsg + ":" + result.LogId)
}
return result.Data.AfterSaleId, nil
}
@@ -155,7 +155,7 @@ func (a *API) AfterSaleOperate(refundType int32, refundId, remark string, storeI
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}
@@ -175,7 +175,7 @@ func (a *API) GetRefundAddressId(storeID int64) (int64, error) {
return 0, err
}
if result.Code != RequestSuccessCode {
return 0, errors.New(result.SubMsg)
return 0, errors.New(result.SubMsg + ":" + result.LogId)
}
if len(result.Data.AddressList) < 1 {
return 0, errors.New("门店详细地址获取错误")
@@ -196,7 +196,7 @@ func (a *API) QueryAllReason(afterSaleId int64) ([]afterSale_rejectReasonCodeLis
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
return result.Data.Items, nil
}
@@ -218,7 +218,7 @@ func (a *API) GetStoreOrderList(queryData time.Time, storeId int64) ([]string, e
return nil, err
}
if orderDetailList.Code != RequestSuccessCode {
return nil, errors.New(orderDetailList.Msg)
return nil, errors.New(orderDetailList.Msg + ":" + orderDetailList.LogId)
}
orderList := make([]string, 0, 0)
@@ -251,7 +251,7 @@ func (a *API) GetStoreOrderList(queryData time.Time, storeId int64) ([]string, e
return nil, err
}
if orderDetailList.Code != RequestSuccessCode {
return nil, errors.New(orderDetailList.Msg)
return nil, errors.New(orderDetailList.Msg + ":" + orderDetailList.LogId)
}
for _, v := range orderDetailList.Data.ShopOrderList {
if v.ShopId == storeId {
@@ -278,7 +278,7 @@ func (a *API) ReturnGoodsToWareHouseSuccess(afsOrderId string) error {
return err // 202210141114300102101071350D6F3847
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}
@@ -314,7 +314,7 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd
return nil
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}

View File

@@ -17,7 +17,7 @@ func (a *API) GetSettleBillDetailV3(param *order_getSettleBillDetailV3_request.O
return 0, "", err
}
if result.Code != RequestSuccessCode {
return 0, "", errors.New(result.SubMsg)
return 0, "", errors.New(result.SubMsg + ":" + result.LogId)
}
if len(result.Data.Data) == 0 {

View File

@@ -53,7 +53,7 @@ func (a *API) UpdateSkuStock(param *sku_syncStock_request.SkuSyncStockParam) err
return err
}
if resp.Code != RequestSuccessCode {
return errors.New(resp.SubMsg)
return errors.New(resp.SubMsg + ":" + resp.LogId)
}
return nil
}
@@ -74,7 +74,7 @@ func (a *API) GetShopCategory(cid int64) ([]*RetailCategoryInfo, error) {
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
categoryAll := make([]*RetailCategoryInfo, 0, 0)
@@ -112,7 +112,7 @@ func (a *API) GetCatePropertyV2(categoryLeftId int64) (*product_getCatePropertyV
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
return result, nil
}
@@ -182,7 +182,7 @@ func (a *API) QualityList(categoryId int64) ([]*product_qualificationConfig_resp
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
configListRequired := make([]*product_qualificationConfig_response.ConfigListItem, 0)
@@ -205,7 +205,7 @@ func (a *API) SyncStockBatch(param *sku_syncStockBatch_request.SkuSyncStockBatch
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}
@@ -220,7 +220,7 @@ func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param)
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}
@@ -235,16 +235,13 @@ func (a *API) EditStoreCommodityCommit(sku *product_editV2_commit_request.Produc
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}
// DeleteStoreCommodity 删除商品
func (a *API) DeleteStoreCommodity(productId int64) error {
globals.SugarLogger.Debugf("----打印看看是否是定时任务删除:%d", productId)
return nil
request := product_del_request.New()
param := request.GetParams()
param.ProductId = productId
@@ -255,7 +252,7 @@ func (a *API) DeleteStoreCommodity(productId int64) error {
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
@@ -272,7 +269,7 @@ func (a *API) ProductSetOffline(productId int64) error {
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}
@@ -294,7 +291,7 @@ func (a *API) GetSkuDetail(productId, outProductId string) (*product_detail_resp
return nil, nil
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
if result.Data.Status == 2 {
return nil, nil
@@ -320,7 +317,7 @@ func (a *API) GetSkuDetailLocalID(productId, outProductId string) (*product_deta
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
if result.Data.Status == 2 {
return nil, nil
@@ -339,7 +336,7 @@ func (a *API) GetSkuDetailList(param *product_listV2_request.ProductListV2Param)
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
return result.Data, nil
@@ -355,7 +352,7 @@ func (a *API) EditPrice(skuPrice *sku_editPrice_request.SkuEditPriceParam) error
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}
@@ -567,7 +564,7 @@ func (a *API) GetProductAuditList(page, pageSize, status int64) ([]product_audit
return nil, 0, err
}
if result.Code != RequestSuccessCode {
return nil, 0, errors.New(result.SubMsg)
return nil, 0, errors.New(result.SubMsg + ":" + result.LogId)
}
return result.Data.Records, result.Data.Total, nil
@@ -591,7 +588,7 @@ func (a *API) GetRecommendCategory(picParams []string) (int64, error) {
return 0, err
}
if result.Code != RequestSuccessCode {
return 0, errors.New(result.SubMsg)
return 0, errors.New(result.SubMsg + ":" + result.LogId)
}
if len(result.Data.CategoryDetails) == 0 {
@@ -660,7 +657,7 @@ func (a *API) BatchRedistributeStoreProduct(param *superm_product_batchRedistrib
return 0, err
}
if result.Code != RequestSuccessCode {
return 0, err
return 0, errors.New(result.SubMsg + ":" + result.LogId)
}
return result.Data.RootTaskId, nil
@@ -676,7 +673,7 @@ func (a *API) BatchApplyStoreProductPrice(mainProductId int64) (int64, error) {
return 0, err
}
if result.Code != RequestSuccessCode {
return 0, errors.New(result.SubMsg)
return 0, errors.New(result.SubMsg + ":" + result.LogId)
}
return result.Data.RootTaskId, nil
@@ -691,7 +688,7 @@ func (a *API) LaunchProduct(productId int64) error {
return err
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
return errors.New(result.SubMsg + ":" + result.LogId)
}
return nil
}

View File

@@ -62,9 +62,9 @@ func TestGetSkuDetailLocalId(t *testing.T) {
func TestUpdateSkuStore(t *testing.T) {
err := a.UpdateSkuStock(&sku_syncStock_request.SkuSyncStockParam{
ProductId: 3612015462742906941,
OutSkuId: 6094281,
StockNum: 9999,
ProductId: 3602878545761816498,
OutSkuId: 25250,
StockNum: 0,
Incremental: false,
})
fmt.Println(err)

View File

@@ -28,7 +28,7 @@ func (a *API) CreateFolder(fileName string) (*material_createFolder_response.Mat
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
return result, nil
}

View File

@@ -72,7 +72,7 @@ func (a *API) GetStoreDetail(param *shop_getStoreDetail_request.ShopGetStoreDeta
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -87,7 +87,7 @@ func (a *API) BatchCreateStore(param *shop_batchCreateStore_request.ShopBatchCre
}
if response.Code != RequestSuccessCode {
//return nil, errors.New(response.Data.ResultList[0].Msg)
return nil, errors.New(response.Msg)
return nil, errors.New(response.Msg + ":" + response.LogId)
}
//if response.Data.ResultList[0].Store.StoreId == 0 {
// return nil, errors.New(response.Msg + "," + response.SubMsg)
@@ -104,7 +104,7 @@ func (a *API) EditStore(param *shop_editStore_request.ShopEditStoreParam) error
return err
}
if response.Code != RequestSuccessCode {
return errors.New(response.SubMsg)
return errors.New(response.SubMsg + ":" + response.LogId)
}
return nil
}
@@ -118,7 +118,7 @@ func (a *API) StoreSuspend(param *shop_storeSuspend_request.ShopStoreSuspendPara
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -131,7 +131,7 @@ func (a *API) StoreSuspend2(storeID int64) (*shop_storeSuspend_response.ShopStor
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -145,7 +145,7 @@ func (a *API) UnsuspendStore(param *shop_unsuspendStore_request.ShopUnsuspendSto
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -157,7 +157,7 @@ func (a *API) UnsuspendStore2(storeID int64) (*shop_unsuspendStore_response.Shop
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -176,7 +176,7 @@ func (a *API) GetStoreList(param *shop_getStoreList_request.ShopGetStoreListPara
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
//测试用
resp := map[int64]string{}
@@ -197,7 +197,7 @@ func (a *API) GetStoreList2(param *shop_getStoreList_request.ShopGetStoreListPar
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response, err
@@ -212,7 +212,7 @@ func (a *API) CreateTradeLimitTemplate(param *trade_createTradeLimitTemplate_req
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -226,7 +226,7 @@ func (a *API) UpdateTradeLimitTemplate(param *trade_UpdateTradeLimitTemplate_req
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -240,7 +240,7 @@ func (a *API) BindStoreSaleLimit(param *shop_bindStoreSaleLimit_request.ShopBind
return err
}
if response.Code != RequestSuccessCode {
return errors.New(response.SubMsg)
return errors.New(response.SubMsg + ":" + response.LogId)
}
return nil
}
@@ -254,7 +254,7 @@ func (a *API) StoreQuerySaleLimitTemp(storeId int64) (int64, error) {
return 0, err
}
if result.Code != RequestSuccessCode {
return 0, errors.New(result.SubMsg)
return 0, errors.New(result.SubMsg + ":" + result.LogId)
}
if result.Data == nil || len(result.Data.StoreSaleLimits) == 0 {
return 0, errors.New("未绑定限售模板,请先绑定")
@@ -271,7 +271,7 @@ func (a *API) GetSaleLimitDetail(saleLimitId *[]int64) (*trade_batchGetTradeLimi
return nil, err
}
if result.Code != RequestSuccessCode {
return nil, errors.New(result.SubMsg)
return nil, errors.New(result.SubMsg + ":" + result.LogId)
}
if result.Data == nil || len(result.Data.TradeLimitTemplateList) == 0 {
return nil, errors.New("未查找到限售模板详情")

View File

@@ -30,7 +30,7 @@ func (a *API) GetDispatcherInfo(storeID int64, shopOrderID string, dispatcherFee
return 0, err
}
if response.Code != RequestSuccessCode {
return 0, errors.New(response.SubMsg)
return 0, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data.DispatcherFee, nil
}
@@ -48,7 +48,7 @@ func (a *API) ShopOrderDispatcher(storeID int64, shopOrderID string, dispatcherT
return err
}
if response.Code != RequestSuccessCode {
return errors.New(response.SubMsg)
return errors.New(response.SubMsg + ":" + response.LogId)
}
return nil
}
@@ -62,7 +62,7 @@ func (a *API) SetStoreAutoCallRider(params *superm_setStoreAutoCallRider_request
return err
}
if response.Code != RequestSuccessCode {
return errors.New(response.SubMsg)
return errors.New(response.SubMsg + ":" + response.LogId)
}
return nil
}
@@ -78,7 +78,7 @@ func (a *API) GetStoreAutoCallRiderInfo(storeID int64) (*superm_getStoreAutoCall
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data.AutoCallInfo, nil
}
@@ -94,7 +94,7 @@ func (a *API) CreateVirtualMobile(shopOrderID int64) (*superm_createVirtualMobil
return nil, err
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data, nil
}
@@ -111,7 +111,7 @@ func (a *API) GetPlatformPickUpEstimatedCharge(afterSaleID int64, inquiryType in
return 0, err
}
if response.Code != RequestSuccessCode {
return 0, errors.New(response.SubMsg)
return 0, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data.PlatformPickupEstimatedCharge, err
}
@@ -127,7 +127,7 @@ func (a *API) ApplyPlatformPickUp(afterSaleID int64) (string, error) {
return "", err
}
if response.Code != RequestSuccessCode {
return "", errors.New(response.SubMsg)
return "", errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data.LogisticsID, err
}
@@ -161,7 +161,7 @@ func (a *API) GetShipmentInfo(shopOrderID, afterSaleID, shipmentType int64) (*su
}
if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg)
return nil, errors.New(response.SubMsg + ":" + response.LogId)
}
return response.Data.ShipmentInfo, err
}
@@ -177,7 +177,7 @@ func (a *API) CancelPlatformPickUp(afterSaleID int64) error {
return err
}
if response.Code != RequestSuccessCode {
return errors.New(response.SubMsg)
return errors.New(response.SubMsg + ":" + response.LogId)
}
return err
}