diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 2dd91f12a..cc43b98ca 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2700,7 +2700,6 @@ func UpdateTiktokShopTotalMoney() { } } } - globals.SugarLogger.Debugf("vendorOrderId =========: %s , TotalShopMoney := %d", v.VendorOrderID, v.TotalShopMoney) if _, err := dao.UpdateEntity(db, v, "TotalShopMoney", "NewEarningPrice"); err != nil { globals.SugarLogger.Errorf("更新本地订单结算信息错误 : %s", err) continue diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 2dff9ba7d..12cd02527 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1707,9 +1707,6 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder, isAuto bool) { if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - if order.VendorStoreID == "7290541" { - globals.SugarLogger.Debugf("==================test := %s", utils.Format4Output(order, false)) - } netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 3afbb519d..75d51d94b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -824,11 +824,13 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS if !jxutils.IsLegalStoreID(retVal.ID) { retVal.ID = 0 } - if result.Status <= model.StoreStatusHaveRest { - retVal.BussinessStatus = -1 - } else { - retVal.BussinessStatus = 1 - } + + retVal.BussinessStatus = result.Status // -2 下线,禁用 ,-1 休息 ,1 营业 + //if result.Status <= model.StoreStatusHaveRest { + // retVal.BussinessStatus = -1 + //} else { + // retVal.BussinessStatus = 1 + //} return retVal, nil } return nil, err @@ -1138,8 +1140,6 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa kv[model.FieldStatus] = status } } - globals.SugarLogger.Debugf("=================kv : %s", utils.Format4Output(kv, false)) - globals.SugarLogger.Debugf("=================syncStatus : %s", utils.Format4Output(syncStatus, false)) _, err2 := dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, dummy, kv, userName, map[string]interface{}{ model.FieldStoreID: store.ID, }, model.FieldSyncStatus, syncStatus) diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index 5c79efc1f..fa7313b66 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -347,7 +347,6 @@ func (c *PurchaseHandler) OnStoreMsg(vendorOrgCode string, msg *jdapi.CallbackOr err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDJD, storeStatus) } else { // 可能在门店删除的情况下会出查不到门店的错误 - globals.SugarLogger.Debugf("GetStoreStatus==============%v", err) if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 4 { err = nil } diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 962bfb300..f06ec2368 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -247,9 +247,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin return err } mergedStoreStatus := jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus) - globals.SugarLogger.Debugf("==============mergedStoreStatus := %d", mergedStoreStatus) - globals.SugarLogger.Debugf("==============storeDetail.Status := %d", storeDetail.Status) - globals.SugarLogger.Debugf("==============storeDetail.VendorStatus := %d", storeDetail.VendorStatus) name = remoteStoreInfo.Name if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreName) != 0 { if storeDetail.VendorStoreName != "" { @@ -279,7 +276,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if globals.EnableMtwmStoreWrite { errList.AddErr(mtapi.PoiSave(storeDetail.VendorStoreID, params)) } - globals.SugarLogger.Debugf("==============storeDetail.SyncStatus := %d", storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus)) if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 { errList.AddErr(p.UpdateStoreStatus(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, mergedStoreStatus)) } @@ -361,30 +357,34 @@ func (p *PurchaseHandler) EnableAutoAcceptOrder(ctx *jxcontext.Context, vendorOr func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) { openLevel, isOnline := bizStatusJX2Mtwm(status) - globals.SugarLogger.Debugf("===================openLevel:%d,isOnline : %d", openLevel, isOnline) if globals.EnableMtwmStoreWrite { if isOnline != mtwmapi.PoiStatusOnline { - err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOffline(vendorStoreID) + if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOffline(vendorStoreID); err == nil { + switch beego.BConfig.RunMode { + case "jxgy": + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + default: + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + } + } } else { if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOnline(vendorStoreID); err == nil { // 这个函数成功返回也并不表示上线成功。。。 remoteStoreInfo, err2 := getAPI(vendorOrgCode, storeID, vendorStoreID).PoiGet(vendorStoreID) if err = err2; err != nil { return err } - globals.SugarLogger.Debugf("=========remoteStoreInfo := %s", utils.Format4Output(remoteStoreInfo, false)) if remoteStoreInfo.IsOnline == mtwmapi.PoiStatusOnline { if openLevel == mtwmapi.PoiOpenLevelHaveRest { - // 门店下线时通知给石锋 - if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiClose(vendorStoreID); err == nil { - switch beego.BConfig.RunMode { - case "jxgy": - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") - default: - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiClose(vendorStoreID) + } else { + // open 失败,重新上线在open + for i := 0; i < 3; i++ { + if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOpen(vendorStoreID); err != nil { + getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOnline(vendorStoreID) + } else { + break } } - } else { - err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOpen(vendorStoreID) } } else { err = errors.New("门店还未上线,不能修改营业状态") @@ -483,17 +483,18 @@ func (c *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOr if err = mtwmApi.PoiOnline(vendorStoreID); err == nil { err = mtwmApi.PoiOpen(vendorStoreID) } - default: // 先关店,在下线 - if err = mtwmApi.PoiClose(vendorStoreID); err == nil { - err = mtwmApi.PoiOffline(vendorStoreID) - // 通知给石锋 - switch beego.BConfig.RunMode { - case "jxgy": - err = ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("(果园)美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") - default: - err = ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("(菜市)美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") - } - } + default: // 只关店不下线 + mtwmApi.PoiClose(vendorStoreID) + //if err = mtwmApi.PoiClose(vendorStoreID); err == nil { + // err = mtwmApi.PoiOffline(vendorStoreID) + // // 通知给石锋 + // switch beego.BConfig.RunMode { + // case "jxgy": + // err = ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("(果园)美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + // default: + // err = ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("(菜市)美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") + // } + //} } return err