From 21e67f90d63fa852f79e4c0f3661e2e73793dc55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 11:02:34 +0800 Subject: [PATCH 01/10] 1 --- business/jxstore/cms/store.go | 5 ++--- business/model/model.go | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 9045e8357..d3f536a4e 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1137,13 +1137,12 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa kv := make(map[string]interface{}) if valid["status"] != nil { //if syncStatus&model.SyncFlagStoreStatus != 0 && status == model.StoreStatusOpened { - kv[model.FieldStatus] = status + kv[model.FieldStatus2] = status //} } - globals.SugarLogger.Debugf("data := %s,%d", utils.Format4Output(kv, false), store.ID) _, err2 := dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, dummy, kv, userName, map[string]interface{}{ model.FieldStoreID: store.ID, - }, model.FieldSyncStatus, syncStatus) + }, model.FieldSyncStatus2, syncStatus) if err = err2; err == nil { dao.Commit(db, txDB) _, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName) diff --git a/business/model/model.go b/business/model/model.go index 69bc36e88..020e59664 100644 --- a/business/model/model.go +++ b/business/model/model.go @@ -5,6 +5,9 @@ import ( ) const ( + FieldStatus2 = "status" + FieldSyncStatus2 = "sync_status" + FieldID = "ID" FieldParentID = "ParentID" FieldDeletedAt = "DeletedAt" From dd9bae15d6797610acd9e628ed410b39ed544b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 11:06:29 +0800 Subject: [PATCH 02/10] 1 --- business/jxstore/cms/store.go | 4 ++-- business/model/model.go | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index d3f536a4e..ed6098102 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1137,12 +1137,12 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa kv := make(map[string]interface{}) if valid["status"] != nil { //if syncStatus&model.SyncFlagStoreStatus != 0 && status == model.StoreStatusOpened { - kv[model.FieldStatus2] = status + kv[model.FieldStatus] = status //} } _, err2 := dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, dummy, kv, userName, map[string]interface{}{ model.FieldStoreID: store.ID, - }, model.FieldSyncStatus2, syncStatus) + }, model.FieldSyncStatus, syncStatus) if err = err2; err == nil { dao.Commit(db, txDB) _, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName) diff --git a/business/model/model.go b/business/model/model.go index 020e59664..69bc36e88 100644 --- a/business/model/model.go +++ b/business/model/model.go @@ -5,9 +5,6 @@ import ( ) const ( - FieldStatus2 = "status" - FieldSyncStatus2 = "sync_status" - FieldID = "ID" FieldParentID = "ParentID" FieldDeletedAt = "DeletedAt" From 0a4aa7398346a824457b882a5c95d1422980ff71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 11:44:53 +0800 Subject: [PATCH 03/10] 1 --- business/model/dao/dao_bz.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/business/model/dao/dao_bz.go b/business/model/dao/dao_bz.go index ff39590fe..34b0a3de3 100644 --- a/business/model/dao/dao_bz.go +++ b/business/model/dao/dao_bz.go @@ -54,6 +54,8 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c qs = qs.Filter(k, v) } } + globals.SugarLogger.Debugf("==========kvs := %s", utils.Format4Output(kvs, false)) + globals.SugarLogger.Debugf("==========kvsv := %v", utils.Format4Output(refutil.GetObjFieldByName(item, model.FieldID), false)) num, err = qs.Update(kvs) if err != nil && !IsDuplicateError(err) { globals.SugarLogger.Errorf("UpdateEntityByKV %s failed with error:%v", reflect.TypeOf(item).Name(), err) @@ -142,10 +144,7 @@ func UpdateEntityLogicallyAndUpdateSyncStatus(db *DaoDB, item interface{}, kvs m if userName != "" { params[model.FieldLastOperator] = userName } - globals.SugarLogger.Debugf("=========MergeMaps := %s", utils.Format4Output(utils.MergeMaps(kvs, params), false)) num2, err2 := UpdateEntityByKV(db, value.Interface(), utils.MergeMaps(kvs, params), nil) - globals.SugarLogger.Debugf("=========num := %d", num2) - globals.SugarLogger.Debugf("=========err := %v", err2) if err = err2; err == nil { num += num2 } else { From c7ed30ee86acfb0e6a3f457b9081c1bb06b9706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 14:08:52 +0800 Subject: [PATCH 04/10] 1 --- business/model/dao/dao_bz.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/model/dao/dao_bz.go b/business/model/dao/dao_bz.go index 34b0a3de3..02c523c72 100644 --- a/business/model/dao/dao_bz.go +++ b/business/model/dao/dao_bz.go @@ -46,6 +46,7 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c if db == nil { db = GetDB() } + globals.SugarLogger.Debugf("item==============%s", utils.Format4Output(item, false)) qs := db.Db.QueryTable(item) if conditions == nil { qs = qs.Filter(model.FieldID, refutil.GetObjFieldByName(item, model.FieldID)) @@ -134,6 +135,7 @@ func UpdateEntityLogicallyAndUpdateSyncStatus(db *DaoDB, item interface{}, kvs m rows := valueRows.Interface() if err = GetEntitiesByKV(db, rows, conditions, false); err == nil { valueRows = reflect.Indirect(valueRows) + globals.SugarLogger.Debugf("valueRows =========== := %s", utils.Format4Output(valueRows, false)) for i := 0; i < valueRows.Len(); i++ { value := reflect.Indirect(valueRows.Index(i)) status := value.FieldByName(syncStatusFieldName).Int() | int64(valueMask) From 26aff89ce3e4737bc5387d13bcbffc94cde44516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 14:41:09 +0800 Subject: [PATCH 05/10] 1 --- business/jxstore/cms/store.go | 4 +--- business/model/dao/dao_bz.go | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index ed6098102..49d860e2c 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1145,7 +1145,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa }, model.FieldSyncStatus, syncStatus) if err = err2; err == nil { dao.Commit(db, txDB) - _, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName) + //_, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName) if valid["tel1"] != nil || valid["tel2"] != nil { TryAddStoreBossRole4StoreByMobile(ctx, store.ID, []string{utils.Interface2String(valid["tel1"]), utils.Interface2String(valid["tel2"])}) } @@ -1170,9 +1170,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa } else { globals.SugarLogger.Debugf("UpdateStore track:%s, store:%s", ctx.GetTrackInfo(), utils.Format4Output(store, true)) } - if status == -2 { - } return num, err } diff --git a/business/model/dao/dao_bz.go b/business/model/dao/dao_bz.go index 02c523c72..3c6fc8fd2 100644 --- a/business/model/dao/dao_bz.go +++ b/business/model/dao/dao_bz.go @@ -46,7 +46,6 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c if db == nil { db = GetDB() } - globals.SugarLogger.Debugf("item==============%s", utils.Format4Output(item, false)) qs := db.Db.QueryTable(item) if conditions == nil { qs = qs.Filter(model.FieldID, refutil.GetObjFieldByName(item, model.FieldID)) @@ -55,8 +54,6 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c qs = qs.Filter(k, v) } } - globals.SugarLogger.Debugf("==========kvs := %s", utils.Format4Output(kvs, false)) - globals.SugarLogger.Debugf("==========kvsv := %v", utils.Format4Output(refutil.GetObjFieldByName(item, model.FieldID), false)) num, err = qs.Update(kvs) if err != nil && !IsDuplicateError(err) { globals.SugarLogger.Errorf("UpdateEntityByKV %s failed with error:%v", reflect.TypeOf(item).Name(), err) @@ -135,7 +132,6 @@ func UpdateEntityLogicallyAndUpdateSyncStatus(db *DaoDB, item interface{}, kvs m rows := valueRows.Interface() if err = GetEntitiesByKV(db, rows, conditions, false); err == nil { valueRows = reflect.Indirect(valueRows) - globals.SugarLogger.Debugf("valueRows =========== := %s", utils.Format4Output(valueRows, false)) for i := 0; i < valueRows.Len(); i++ { value := reflect.Indirect(valueRows.Index(i)) status := value.FieldByName(syncStatusFieldName).Int() | int64(valueMask) From 05c5d680ed2ff41edb34ea4cab5f341ea247b7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 14:44:08 +0800 Subject: [PATCH 06/10] 1 --- business/jxstore/cms/store.go | 2 +- business/partner/purchase/ebai/store.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 49d860e2c..b827559dd 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1145,7 +1145,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa }, model.FieldSyncStatus, syncStatus) if err = err2; err == nil { dao.Commit(db, txDB) - //_, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName) + _, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName) if valid["tel1"] != nil || valid["tel2"] != nil { TryAddStoreBossRole4StoreByMobile(ctx, store.ID, []string{utils.Interface2String(valid["tel1"]), utils.Interface2String(valid["tel2"])}) } diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 6eeef91ec..77e9793b7 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -242,6 +242,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo } func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) { + return nil var stores []*tEbaiStoreInfo sql := ` SELECT From 1047926773ded14a810fee9b096b5470bb71c7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 15:02:02 +0800 Subject: [PATCH 07/10] 1 --- business/partner/purchase/ebai/callback.go | 2 ++ business/partner/purchase/ebai/store.go | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index 075131ff1..15b325355 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -8,6 +8,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -26,6 +27,7 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse if /*msg.Cmd == ebaiapi.CmdOrderPartRefund || msg.Cmd == ebaiapi.CmdOrderUserCancel || */ msg.Cmd == ebaiapi.CmdOrderDeliveryStatus { response = CurPurchaseHandler.OnFinancialMsg(msg) } else if msg.Cmd == ebaiapi.CmdShopMsgPush { + globals.SugarLogger.Debugf("=============baidushopmsg := %s", utils.Format4Output(msg, false)) response = CurPurchaseHandler.onShopMsgPush(msg) } else if msg.Cmd == ebaiapi.CmdShopUnbindMsg { // 门店授权发生变化 17,失去授权 diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 77e9793b7..10a0d7578 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -242,7 +242,6 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo } func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) { - return nil var stores []*tEbaiStoreInfo sql := ` SELECT @@ -281,16 +280,16 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if err = p.UpdateStoreStatus(jxcontext.AdminCtx, store.VendorOrgCode, storeID, store.VendorStoreID, mergeStatus); err != nil { return err } - store := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(ebai):%d", storeID, store.Name, store2.Status, store.Status, mergeStatus, store.VendorOrgCode) - event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), store, "", "", 10, "UpdateStore") + updateStoreInfo := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(ebai):%d", storeID, store.Name, store2.Status, store.Status, mergeStatus, store.VendorOrgCode) + event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), updateStoreInfo, "", "", 10, "UpdateStore") } params := genStoreMapFromStore(store) if err = api.EbaiAPI.ShopUpdate(params); err == nil { if store.PromoteInfo != "" { err = api.EbaiAPI.ShopAnnouncementSet("", utils.Str2Int64(store.VendorStoreID), store.PromoteInfo) } - store := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(ebai):%d", storeID, store.Name, store2.Status, store.Status, 100, store.VendorOrgCode) - event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), store, "", "", 10, "UpdateStore") + updateStoreInfo := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(ebai):%d", storeID, store.Name, store2.Status, store.Status, 100, store.VendorOrgCode) + event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), updateStoreInfo, "", "", 10, "UpdateStore") } } @@ -629,7 +628,6 @@ func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod err = api.EbaiAPI.ShopClose("", utils.Str2Int64(vendorStoreID)) } else if status == model.StoreStatusDisabled { err = api.EbaiAPI.ShopClose("", utils.Str2Int64(vendorStoreID)) - // err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(vendorStoreID)) } if err != nil { if remoteStatus, err2 := c.GetStoreStatus(ctx, vendorOrgCode, storeID, vendorStoreID); err2 == nil && remoteStatus == status { From 8bb479c8898086738f620189e7662edae67eb566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 15:11:33 +0800 Subject: [PATCH 08/10] 1 --- business/jxstore/cms/storeman.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index b95807ea5..e8e010841 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" + "git.rosy.net.cn/jx-callback/globals" ) type StoreManager struct { @@ -22,9 +23,10 @@ func init() { } func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeStatus int) (err error) { - //return err db := dao.GetDB() storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID, "") + globals.SugarLogger.Debugf("==========storeDetail := %s", utils.Format4Output(storeDetail, false)) + globals.SugarLogger.Debugf("==========storeStatus := %s", utils.Format4Output(storeStatus, false)) if err == nil { if storeDetail.IsSync == model.NO || storeDetail.Status == model.StoreStatusDisabled || storeDetail.Status == model.StoreStatusHaveRest { return err From 556aff0d13c93dfcfffa7a5099cecbcecd567a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 15:53:34 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=91=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/auto_delivery/auto_delivery.go | 1 - business/jxcallback/orderman/order.go | 1 - business/jxstore/cms/storeman.go | 13 +------------ business/partner/delivery/mtps/waybill.go | 1 - business/partner/purchase/ebai/callback.go | 2 -- business/partner/purchase/mtwm/store.go | 2 -- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/business/jxcallback/auto_delivery/auto_delivery.go b/business/jxcallback/auto_delivery/auto_delivery.go index a41cdd877..6b94a2d3a 100644 --- a/business/jxcallback/auto_delivery/auto_delivery.go +++ b/business/jxcallback/auto_delivery/auto_delivery.go @@ -126,7 +126,6 @@ func AutoSettingFakeDelivery() { } else { place, err := dao.GetParentCodeByCode(db, storeDetail.CityCode) if err != nil { - globals.SugarLogger.Debugf("根据门店的城市code获取省份code错误: %s", err) return } if strings.Contains(place.Name, "省") { diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 51d124f3a..71d7daf52 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2687,7 +2687,6 @@ func UpdateTiktokShopTotalMoney(storeId int64, startTime, endTime time.Time) err } for _, v := range goodsOrders { - globals.SugarLogger.Debugf("=============测试打印: %s", v.VendorOrderID) orderDetail, err := tiktok_store.GetOrderDetail(v.VendorOrgCode, v.VendorOrderID) if err != nil { errList = append(errList, fmt.Sprintf("详情错误orderID[%s],%v", v.VendorOrderID, err)) diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index e8e010841..932aa5810 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -7,7 +7,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" - "git.rosy.net.cn/jx-callback/globals" ) type StoreManager struct { @@ -25,8 +24,6 @@ func init() { func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeStatus int) (err error) { db := dao.GetDB() storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID, "") - globals.SugarLogger.Debugf("==========storeDetail := %s", utils.Format4Output(storeDetail, false)) - globals.SugarLogger.Debugf("==========storeStatus := %s", utils.Format4Output(storeStatus, false)) if err == nil { if storeDetail.IsSync == model.NO || storeDetail.Status == model.StoreStatusDisabled || storeDetail.Status == model.StoreStatusHaveRest { return err @@ -37,10 +34,6 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeKV = map[string]interface{}{ "Status": model.StoreStatusOpened, } - //content := "您的门店 [" + storeDetail.Name + "]，ID:[" + utils.Int2Str(storeDetail.ID) + "]，在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致！平台状态：【营业】，京西状态：【非营业】" - //if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { - // ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) - //} } if storeDetail.VendorStatus != model.StoreStatusOpened { storeMapKV = map[string]interface{}{ @@ -54,14 +47,10 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, "Status": storeStatus, } } - //content := "您的门店 [" + storeDetail.Name + "]，ID:[" + utils.Int2Str(storeDetail.ID) + "]，在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致！平台状态：【非营业】，京西状态：【营业】" - //if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { - // ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) - //} } else if storeDetail.Status <= storeStatus { if storeDetail.VendorStatus != model.StoreStatusOpened { storeMapKV = map[string]interface{}{ - "Status": model.StoreStatusOpened, + "Status": storeStatus, } } } diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index e7795bbcb..a5f1e3c8b 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -331,7 +331,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee return nil, fmt.Errorf("此平台配送已被系统关闭，暂不发配送 [%v]", vendorOrgCode[0].Comment) } - globals.SugarLogger.Debugf("===================maxDeliveryFee := %d", maxDeliveryFee) if maxDeliveryFee == model.NO { fee, err := c.GetWaybillFee(order) if err != nil { diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index 15b325355..075131ff1 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -8,7 +8,6 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -27,7 +26,6 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse if /*msg.Cmd == ebaiapi.CmdOrderPartRefund || msg.Cmd == ebaiapi.CmdOrderUserCancel || */ msg.Cmd == ebaiapi.CmdOrderDeliveryStatus { response = CurPurchaseHandler.OnFinancialMsg(msg) } else if msg.Cmd == ebaiapi.CmdShopMsgPush { - globals.SugarLogger.Debugf("=============baidushopmsg := %s", utils.Format4Output(msg, false)) response = CurPurchaseHandler.onShopMsgPush(msg) } else if msg.Cmd == ebaiapi.CmdShopUnbindMsg { // 门店授权发生变化 17,失去授权 diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 7ac2ad352..5ad0a0eb8 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -230,7 +230,6 @@ func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName strin } func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) { - globals.SugarLogger.Debugf("===========data : %s",utils.Format4Output(storeID,false)) if db == nil { db = dao.GetDB() } @@ -281,7 +280,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } if globals.EnableMtwmStoreWrite { - globals.SugarLogger.Debugf("===========data : %s",utils.Format4Output(params,false)) errList.AddErr(mtapi.PoiSave(storeDetail.VendorStoreID, params)) } if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 { From ca8203e0f4b83b33a3c0acc366affa4a9933fa0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 18 Feb 2024 16:01:12 +0800 Subject: [PATCH 10/10] : --- business/jxstore/cms/storeman.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 932aa5810..790792804 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -48,7 +48,7 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, } } } else if storeDetail.Status <= storeStatus { - if storeDetail.VendorStatus != model.StoreStatusOpened { + if storeDetail.VendorStatus != storeStatus { storeMapKV = map[string]interface{}{ "Status": storeStatus, }