From 2b9cc1a9709142605a1a72847e766e2fb04c35d9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:00:57 +0800 Subject: [PATCH 01/16] debug --- business/partner/purchase/tiktok_store/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 8357de5f9..1bcc1b9a1 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -94,6 +94,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil { return "", err } else { + globals.SugarLogger.Debug("检测resp==========", resp) for k, v := range resp.ResultList { if k != len(resp.ResultList) { storeIDs += utils.Int64ToStr(v.Store.StoreId) + "," From b718a01363852dd40abb23a797690f8aec4dda2e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:04:22 +0800 Subject: [PATCH 02/16] debug --- business/partner/purchase/tiktok_store/store.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 1bcc1b9a1..e0da50b8c 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -92,9 +92,10 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil { + globals.SugarLogger.Debug("检测resp1==========", resp) return "", err } else { - globals.SugarLogger.Debug("检测resp==========", resp) + globals.SugarLogger.Debug("检测resp2==========", resp) for k, v := range resp.ResultList { if k != len(resp.ResultList) { storeIDs += utils.Int64ToStr(v.Store.StoreId) + "," From d7a4dff2ef51ed1c32d6f512130084b3efc7aa34 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:09:24 +0800 Subject: [PATCH 03/16] debug --- business/partner/purchase/tiktok_store/store.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index e0da50b8c..6c6e23e35 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -66,9 +66,11 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri return "", fmt.Errorf("营业时间必填") } else { timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2) + globals.SugarLogger.Debug("我在splicingTimeToDoudian") } m := make(map[int64]string) for j := 1; j <= 7; j++ { + globals.SugarLogger.Debug("我在==========timeStr") m[int64(j)] = timeStr } list := shop_batchCreateStore_request.StoreListItem{ @@ -86,11 +88,12 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri DayMap: m, }, } + globals.SugarLogger.Debug("检测list========", list) lists = append(lists, list) ShopBatchCreateStoreParam = &shop_batchCreateStore_request.ShopBatchCreateStoreParam{ StoreList: lists, } - + globals.SugarLogger.Debug("检测param========", ShopBatchCreateStoreParam) if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil { globals.SugarLogger.Debug("检测resp1==========", resp) return "", err From 1eb63494ab110529e3fee2cac29cfefa44a5aae0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:14:12 +0800 Subject: [PATCH 04/16] debug --- business/partner/purchase/tiktok_store/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 6c6e23e35..17f468a67 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -94,6 +94,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri StoreList: lists, } globals.SugarLogger.Debug("检测param========", ShopBatchCreateStoreParam) + globals.SugarLogger.Debug("-=-======================", storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID) if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil { globals.SugarLogger.Debug("检测resp1==========", resp) return "", err From 4a16dcaacfe9f4b63c84be4fa671ebc715ea40ef Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:20:17 +0800 Subject: [PATCH 05/16] debug --- business/partner/purchase/tiktok_store/store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 17f468a67..7e39688f2 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -36,18 +36,18 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( if openTime1 != 0 && closeTime1 != 0 { tOpenTime1 := utils.Int64ToStr(int64(openTime1)) len1 := len(tOpenTime1) - 2 - s1 := tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] + s1 := tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] + "0" tCloseTime1 := utils.Int64ToStr(int64(closeTime1)) len2 := len(tCloseTime1) - 2 - s2 := tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] + s2 := tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] + "0" timeStr += s1 + "-" + s2 if openTime2 != 0 && closeTime2 != 0 { tOpenTime2 := utils.Int64ToStr(int64(openTime2)) len3 := len(tOpenTime2) - 2 - s3 := tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + s3 := tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + "0" tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) len4 := len(tCloseTime2) - 2 - s4 := tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + s4 := tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0" timeStr += " " + s3 + "-" + s4 } } From e9af6e4bf24dd35b2cd52b7b0489142c6ea3ebb7 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:22:25 +0800 Subject: [PATCH 06/16] debug --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 7e39688f2..cfb9cf67b 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -48,7 +48,7 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) len4 := len(tCloseTime2) - 2 s4 := tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0" - timeStr += " " + s3 + "-" + s4 + timeStr += "," + s3 + "-" + s4 } } return timeStr From ef099beef866ac42e906b2b24d65bb0521e12032 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:35:06 +0800 Subject: [PATCH 07/16] debug --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index cfb9cf67b..e4466247b 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -66,7 +66,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri return "", fmt.Errorf("营业时间必填") } else { timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2) - globals.SugarLogger.Debug("我在splicingTimeToDoudian") + globals.SugarLogger.Debug("timeStr", timeStr) } m := make(map[int64]string) for j := 1; j <= 7; j++ { From ad81d944f0f351bba7702bbc8217db597688eee5 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 11:50:22 +0800 Subject: [PATCH 08/16] debug --- business/partner/purchase/tiktok_store/store.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index e4466247b..80dd14cae 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -69,14 +69,21 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri globals.SugarLogger.Debug("timeStr", timeStr) } m := make(map[int64]string) - for j := 1; j <= 7; j++ { - globals.SugarLogger.Debug("我在==========timeStr") - m[int64(j)] = timeStr - } + //for j := 1; j <= 7; j++ { + globals.SugarLogger.Debug("我在==========timeStr") + m[1] = timeStr + m[2] = timeStr + m[3] = timeStr + m[4] = timeStr + m[5] = timeStr + m[6] = timeStr + m[7] = timeStr + globals.SugarLogger.Debug("") + //} list := shop_batchCreateStore_request.StoreListItem{ RowId: 1, Name: storeDetail.Name, - StoreCode: storeDetail.VendorStoreID, + StoreCode: utils.Int2Str(storeDetail.ID), Longitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)), Latitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)), Province: storeDetail.ProvinceName, From 0abfc805d47ee684e5a0a3d20475214a623157a0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 12:03:19 +0800 Subject: [PATCH 09/16] debug --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 80dd14cae..c1b8f0cc5 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -113,7 +113,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } storeIDs += utils.Int64ToStr(v.Store.StoreId) } - return storeIDs, nil + return storeIDs, err } } From c7c70332c2543a66e1dcfe9920c71fb398a4c2c4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 12:54:01 +0800 Subject: [PATCH 10/16] debug --- business/jxstore/cms/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b955ee37c..632bc93f2 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4351,6 +4351,7 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma if err != nil { return err } + fmt.Println("======", payload["pricePercentage"]) if vendorStoreID != "" && vendorStoreID != "0" { //AddStoreVendorMap 太复杂了并不满足，还是手动加吧 storeMap := &model.StoreMap{ From d40bbc6c5e44a85bf2d716915c29c362ddb868b8 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 13:38:15 +0800 Subject: [PATCH 11/16] debug --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 632bc93f2..8bcdf54fe 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4361,7 +4361,7 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma VendorOrgCode: payload["vendorOrgCode"].(string), Status: 0, //平台还未审核等 DeliveryType: model.StoreDeliveryTypeByStore, - PricePercentage: int16(utils.MustInterface2Int64(payload["pricePercentage"])), + PricePercentage: int16(utils.Str2Int(utils.Interface2String(payload["pricePercentage"]))), AutoPickup: 1, DeliveryCompetition: 1, IsSync: 1, From c2e2abbca2a7d53b4fc5fa4997872f46415855e1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 13:43:45 +0800 Subject: [PATCH 12/16] debug --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8bcdf54fe..45dfc6b28 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4361,7 +4361,7 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma VendorOrgCode: payload["vendorOrgCode"].(string), Status: 0, //平台还未审核等 DeliveryType: model.StoreDeliveryTypeByStore, - PricePercentage: int16(utils.Str2Int(utils.Interface2String(payload["pricePercentage"]))), + PricePercentage: int16(utils.Str2Int(utils.Interface2String(payload["pricePercentage"].(string)))), AutoPickup: 1, DeliveryCompetition: 1, IsSync: 1, From cecba7c4ec316faad7f4b81bb5c9e11de3618000 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 13:46:11 +0800 Subject: [PATCH 13/16] debug --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 45dfc6b28..c7068646c 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4361,7 +4361,7 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma VendorOrgCode: payload["vendorOrgCode"].(string), Status: 0, //平台还未审核等 DeliveryType: model.StoreDeliveryTypeByStore, - PricePercentage: int16(utils.Str2Int(utils.Interface2String(payload["pricePercentage"].(string)))), + PricePercentage: int16(utils.MustInterface2Int64(payload["pricePercentage"].(interface{}))), AutoPickup: 1, DeliveryCompetition: 1, IsSync: 1, From 09a744efe8b1817ce90cfcf8a6eb93ca7e42e21f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 14:03:35 +0800 Subject: [PATCH 14/16] debug --- business/jxstore/cms/store.go | 1 - 1 file changed, 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index c7068646c..56a0e22b8 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4361,7 +4361,6 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma VendorOrgCode: payload["vendorOrgCode"].(string), Status: 0, //平台还未审核等 DeliveryType: model.StoreDeliveryTypeByStore, - PricePercentage: int16(utils.MustInterface2Int64(payload["pricePercentage"].(interface{}))), AutoPickup: 1, DeliveryCompetition: 1, IsSync: 1, From 403eb79e24338c7d41de37f268053753cab2160f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 14:07:34 +0800 Subject: [PATCH 15/16] debug --- business/jxstore/cms/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 56a0e22b8..632bc93f2 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4361,6 +4361,7 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma VendorOrgCode: payload["vendorOrgCode"].(string), Status: 0, //平台还未审核等 DeliveryType: model.StoreDeliveryTypeByStore, + PricePercentage: int16(utils.MustInterface2Int64(payload["pricePercentage"])), AutoPickup: 1, DeliveryCompetition: 1, IsSync: 1, From 1dbd950d21de4875147de650325f73be10ea368b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 14:09:12 +0800 Subject: [PATCH 16/16] debug --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index c1b8f0cc5..d0fa94233 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -78,7 +78,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri m[5] = timeStr m[6] = timeStr m[7] = timeStr - globals.SugarLogger.Debug("") + globals.SugarLogger.Debug("================", m[1]) //} list := shop_batchCreateStore_request.StoreListItem{ RowId: 1,