liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-12-20 17:07:43 +08:00
parent a7703aa3b7
commit 98c0db0fdb
5 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/orderman/order.go
View File

@@ -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 { if _, err := dao.UpdateEntity(db, v, "TotalShopMoney", "NewEarningPrice"); err != nil {
globals.SugarLogger.Errorf("更新本地订单结算信息错误 : %s", err) globals.SugarLogger.Errorf("更新本地订单结算信息错误 : %s", err)
continue continue

3
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -1707,9 +1707,6 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder, isAuto bool) {
if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI { if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
// order = setFakeActualPayPrice(order) // order = setFakeActualPayPrice(order)
if order.VendorStoreID == "7290541" {
globals.SugarLogger.Debugf("==================test := %s", utils.Format4Output(order, false))
}
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil)
//目前暂且认为AdjustCount > 0 就是调整单 //目前暂且认为AdjustCount > 0 就是调整单
if order.AdjustCount > 0 { if order.AdjustCount > 0 {

14
business/jxstore/cms/store.go
View File

@@ -824,11 +824,13 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS
if !jxutils.IsLegalStoreID(retVal.ID) { if !jxutils.IsLegalStoreID(retVal.ID) {
retVal.ID = 0 retVal.ID = 0
} }
if result.Status <= model.StoreStatusHaveRest {
retVal.BussinessStatus = -1 retVal.BussinessStatus = result.Status // -2 下线,禁用 ,-1 休息 ,1 营业
} else { //if result.Status <= model.StoreStatusHaveRest {
retVal.BussinessStatus = 1 // retVal.BussinessStatus = -1
} //} else {
// retVal.BussinessStatus = 1
//}
return retVal, nil return retVal, nil
} }
return nil, err return nil, err
@@ -1138,8 +1140,6 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
kv[model.FieldStatus] = status 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{}{ _, err2 := dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, dummy, kv, userName, map[string]interface{}{
model.FieldStoreID: store.ID, model.FieldStoreID: store.ID,
}, model.FieldSyncStatus, syncStatus) }, model.FieldSyncStatus, syncStatus)

1
business/partner/purchase/jd/store.go
View File

@@ -347,7 +347,6 @@ func (c *PurchaseHandler) OnStoreMsg(vendorOrgCode string, msg *jdapi.CallbackOr
err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDJD, storeStatus) err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDJD, storeStatus)
} else { } else {
// 可能在门店删除的情况下会出查不到门店的错误 // 可能在门店删除的情况下会出查不到门店的错误
globals.SugarLogger.Debugf("GetStoreStatus==============%v", err)
if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 4 { if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 4 {
err = nil err = nil
} }

55
business/partner/purchase/mtwm/store.go
View File

@@ -247,9 +247,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
return err return err
} }
mergedStoreStatus := jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus) 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 name = remoteStoreInfo.Name
if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreName) != 0 { if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreName) != 0 {
if storeDetail.VendorStoreName != "" { if storeDetail.VendorStoreName != "" {
@@ -279,7 +276,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
if globals.EnableMtwmStoreWrite { if globals.EnableMtwmStoreWrite {
errList.AddErr(mtapi.PoiSave(storeDetail.VendorStoreID, params)) 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 { if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
errList.AddErr(p.UpdateStoreStatus(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, mergedStoreStatus)) 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) { func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) {
openLevel, isOnline := bizStatusJX2Mtwm(status) openLevel, isOnline := bizStatusJX2Mtwm(status)
globals.SugarLogger.Debugf("===================openLevel:%d,isOnline : %d", openLevel, isOnline)
if globals.EnableMtwmStoreWrite { if globals.EnableMtwmStoreWrite {
if isOnline != mtwmapi.PoiStatusOnline { 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 { } else {
if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOnline(vendorStoreID); err == nil { // 这个函数成功返回也并不表示上线成功。。。 if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOnline(vendorStoreID); err == nil { // 这个函数成功返回也并不表示上线成功。。。
remoteStoreInfo, err2 := getAPI(vendorOrgCode, storeID, vendorStoreID).PoiGet(vendorStoreID) remoteStoreInfo, err2 := getAPI(vendorOrgCode, storeID, vendorStoreID).PoiGet(vendorStoreID)
if err = err2; err != nil { if err = err2; err != nil {
return err return err
} }
globals.SugarLogger.Debugf("=========remoteStoreInfo := %s", utils.Format4Output(remoteStoreInfo, false))
if remoteStoreInfo.IsOnline == mtwmapi.PoiStatusOnline { if remoteStoreInfo.IsOnline == mtwmapi.PoiStatusOnline {
if openLevel == mtwmapi.PoiOpenLevelHaveRest { if openLevel == mtwmapi.PoiOpenLevelHaveRest {
// 门店下线时通知给石锋 err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiClose(vendorStoreID)
if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiClose(vendorStoreID); err == nil { } else {
switch beego.BConfig.RunMode { // open 失败,重新上线在open
case "jxgy": for i := 0; i < 3; i++ {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOpen(vendorStoreID); err != nil {
default: getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOnline(vendorStoreID)
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") } else {
break
} }
} }
} else {
err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOpen(vendorStoreID)
} }
} else { } else {
err = errors.New("门店还未上线，不能修改营业状态") err = errors.New("门店还未上线，不能修改营业状态")
@@ -483,17 +483,18 @@ func (c *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOr
if err = mtwmApi.PoiOnline(vendorStoreID); err == nil { if err = mtwmApi.PoiOnline(vendorStoreID); err == nil {
err = mtwmApi.PoiOpen(vendorStoreID) err = mtwmApi.PoiOpen(vendorStoreID)
} }
default: // 先关店,在下线 default: // 只关店不下线
if err = mtwmApi.PoiClose(vendorStoreID); err == nil { mtwmApi.PoiClose(vendorStoreID)
err = mtwmApi.PoiOffline(vendorStoreID) //if err = mtwmApi.PoiClose(vendorStoreID); err == nil {
// 通知给石锋 // err = mtwmApi.PoiOffline(vendorStoreID)
switch beego.BConfig.RunMode { // // 通知给石锋
case "jxgy": // switch beego.BConfig.RunMode {
err = ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("(果园)美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!") // case "jxgy":
default: // err = ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("(果园)美团门店被关闭了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!")
err = ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, 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 return err