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:
邹宗楠
2024-05-16 13:46:14 +08:00
parent f4d59d2e10
commit 6053aca730
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1070,8 +1070,8 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInfo, bill *model.Waybill, retryCount int, duration time.Duration) {
order := savedOrderInfo.order
if order.WaybillVendorID != order.VendorID {
if err := s.Swtich2SelfDeliver(order, "Swtich2SelfDeliver转自送"); err != nil && (err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation) { //301251饿了转自送 1047美团混合送
partner.CurOrderManager.OnOrderMsg(order, "调用[swtich2SelfDeliverWithRetry]转自送", err.Error())
if err := s.Swtich2SelfDeliver(order, "Swtich2SelfDeliver转自送"); err != nil && err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation { //301251饿了转自送 1047美团混合送
//partner.CurOrderManager.OnOrderMsg(order, "调用[swtich2SelfDeliverWithRetry]转自送", err.Error())
if retryCount > 0 {
utils.AfterFuncWithRecover(duration, func() {
jxutils.CallMsgHandlerAsync(func() {
@@ -1084,7 +1084,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
if err := s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送"); err != nil {
s.notify3rdPartyWaybill(order, bill, false)
s.removeWaybillFromMap(savedOrderInfo, order.VendorID)
partner.CurOrderManager.OnOrderMsg(order, "调用[SelfDeliverDelivering]转自送", err.Error())
//partner.CurOrderManager.OnOrderMsg(order, "调用[SelfDeliverDelivering]转自送", err.Error())
}
} else if strings.Contains(err.Error(), "301251") { //elm 不做处理
//s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrNotAcceptIntime)

7
business/jxstore/act/act.go
View File

@@ -670,6 +670,7 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, vendorOr
}
func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, vendorOrgCode string, actStoreSku []*ActStoreSkuParam) (err error) {
globals.SugarLogger.Debugf("================actStoreSku := %s", utils.Format4Output(actStoreSku, false))
var (
db = dao.GetDB()
actStoreSkuMap = make(map[int][]*model.StoreSkuBind)
@@ -783,6 +784,7 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
return err
}
//同步建到美团
globals.SugarLogger.Debugf("================actStoreSkuMap := %s", utils.Format4Output(actStoreSkuMap, false))
for storeID, storeSkus := range actStoreSkuMap {
if storeDetail, _ := dao.GetStoreDetail(db, storeID, vendorID, vendorOrgCode); storeDetail != nil {
var actData []*mtwmapi.RetailDiscountActData
@@ -799,7 +801,10 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
})
}
actIdResult := make(map[string]int64, 0)
actResult, faileInfoList, _ := api.MtwmAPI.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData)
actResult, faileInfoList, err := api.MtwmAPI.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData)
globals.SugarLogger.Debugf("================actResult := %s", utils.Format4Output(actResult, false))
globals.SugarLogger.Debugf("================faileInfoList := %s", utils.Format4Output(faileInfoList, false))
globals.SugarLogger.Debugf("================err := %v", err)
for _, v := range actResult {
var (
actStoreSkuMapUpdate *model.ActStoreSkuMap