From be6bfaccc7696584aebec3ec53ff1bbd100072e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 16:33:09 +0800 Subject: [PATCH 1/6] 1 --- business/partner/purchase/tiktok_store/store.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index cb5ccae83..da4f63a26 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -158,18 +158,8 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if db == nil { db = dao.GetDB() } - sqlStr := ` SELECT - t1.*, - t2.status, t2.vendor_store_id, t2.vendor_org_code, - IF(t1.updated_at > t2.updated_at, t1.last_operator, t2.last_operator) real_last_operator, t2.sync_status, t2.vendor_store_name - FROM store t1 - LEFT JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND (t2.deleted_at = ?) - WHERE t1.id = ? - ORDER BY t2.updated_at` - err = dao.GetRow(db, &storeInfo, sqlStr, model.VendorIDDD, utils.DefaultTimeValue, utils.Int2Str(storeID)) - if err != nil { - return err - } + storeInfo, err = dao.GetStoreDetail(db, storeID, model.VendorIDDD, "") + errList := errlist.New() timeStr := "" m := make(map[int64]string) From 5343519bbbf536473ac981fd6f7686ce81952b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 16:38:51 +0800 Subject: [PATCH 2/6] 1 --- business/partner/purchase/tiktok_store/store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index da4f63a26..3857bc797 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -208,6 +208,8 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } //修改店铺状态 if storeInfo.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 { + globals.SugarLogger.Debug("================1", 1) + globals.SugarLogger.Debug("================mergedStoreStatus", mergedStoreStatus) errList.AddErr(P.UpdateStoreStatus(jxcontext.AdminCtx, storeInfo.VendorOrgCode, storeID, storeInfo.VendorStoreID, mergedStoreStatus)) } _, err3 := api.EditStore(params) @@ -220,7 +222,9 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin // UpdateStoreStatus shop/unsuspendStore 门店恢复营业 func (p *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) { + globals.SugarLogger.Debug("================2", 1) isOnline := bizStatusJX2DouDian(status) + globals.SugarLogger.Debug("================2", isOnline) api := getAPI(vendorOrgCode, storeID, vendorStoreID) if globals.EnableDdStoreWrite { if isOnline != tiktok_api.StoreStatusOnline { //暂停营业状态 From 4baaf56c4dbddca4fa83d57b3e042fa60c2cfb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 16:47:08 +0800 Subject: [PATCH 3/6] 1 --- business/jxstore/cms/store.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 632bc93f2..c478930b1 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1717,7 +1717,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } if err == nil { - // globals.SugarLogger.Debug(utils.Format4Output(valid, false)) + globals.SugarLogger.Debug("==============2525", utils.Format4Output(valid, false)) if len(valid) > 0 { txDB, _ := dao.Begin(db) defer func() { @@ -1743,6 +1743,8 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor dao.Rollback(db, txDB) return 0, err } + globals.SugarLogger.Debug("==============num", num) + if num > 0 { if globals.IsAddEvent { mapBefore := refutil.FindMapAndStructMixed(valid, beforeStoreMap) From 7d387dfb2e54269ee2fada48f54337a4a063d7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 16:53:47 +0800 Subject: [PATCH 4/6] 1 --- business/jxstore/cms/store.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index c478930b1..5326984f1 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1670,6 +1670,11 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, model.FieldDeletedAt); err != nil { return 0, err } + + globals.SugarLogger.Debug("==============payload", utils.Format4Output(payload, false)) + globals.SugarLogger.Debug("==============storeMap", utils.Format4Output(storeMap, false)) + globals.SugarLogger.Debug("==============userName", utils.Format4Output(storeMap, userName)) + var beforeStoreMap = *storeMap syncStatus := model.SyncFlagModifiedMask valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName) From 3d47e4c7e754523a870d4904b6369f15883180c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 16:55:14 +0800 Subject: [PATCH 5/6] 1 --- 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 5326984f1..e13c1a362 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1673,7 +1673,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor globals.SugarLogger.Debug("==============payload", utils.Format4Output(payload, false)) globals.SugarLogger.Debug("==============storeMap", utils.Format4Output(storeMap, false)) - globals.SugarLogger.Debug("==============userName", utils.Format4Output(storeMap, userName)) + globals.SugarLogger.Debug("==============userName", utils.Format4Output(userName, false)) var beforeStoreMap = *storeMap syncStatus := model.SyncFlagModifiedMask From 385d8d5999ae1aafd4909bb8a2518220927fac02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 16:57:27 +0800 Subject: [PATCH 6/6] 1 --- 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 e13c1a362..e663da59a 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1678,6 +1678,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor var beforeStoreMap = *storeMap syncStatus := model.SyncFlagModifiedMask valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName) + globals.SugarLogger.Debug("==============validvalidvalidvalidvalid", utils.Format4Output(valid, false)) if valid["status"] != nil { syncStatus |= model.SyncFlagStoreStatus }