diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index adc3e0e8b..6699c3d0b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -4,7 +4,6 @@ import ( "fmt" "git.rosy.net.cn/jx-callback/business/jxutils/smsmsg" "math/rand" - "strings" "sync" "time" @@ -1026,7 +1025,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf order := savedOrderInfo.order globals.SugarLogger.Debugf("swtich2SelfDeliverWithRetry orderID:%s", order.VendorOrderID) if order.WaybillVendorID != order.VendorID { - if err := s.Swtich2SelfDeliver(order, ""); err != nil && (err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation || err != scheduler.ErrOrderStatusAlreadySatisfyCurOperationELM || !strings.Contains(err.Error(), "1047")) { //1047美团混合送 + if err := s.Swtich2SelfDeliver(order, ""); err != nil && (err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation || err != scheduler.ErrOrderStatusAlreadySatisfyCurOperationELM || err != scheduler.ErrOrderStatusAlreadySatisfyCurOperationMTWM) { //1047美团混合送 globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry failed, bill:%v, err:%v", bill, err) if retryCount > 0 { utils.AfterFuncWithRecover(duration, func() { diff --git a/business/jxcallback/scheduler/scheduler.go b/business/jxcallback/scheduler/scheduler.go index 0ded4a456..df7aae943 100644 --- a/business/jxcallback/scheduler/scheduler.go +++ b/business/jxcallback/scheduler/scheduler.go @@ -28,11 +28,10 @@ var ( ) var ( - ErrOrderStatusIsNotSuitable4CurOperation = errors.New("订单锁定或状态不适合当前操作") - ErrOrderStatusAlreadySatisfyCurOperation = errors.New("订单当前状态已满足当前操作") - ErrOrderStatusAlreadySatisfyCurOperationELM = errors.New("无需切自配送") - //ErrOrderStatusAlreadySatisfyCurOperationMTWM = errors.New("非专送、快送、混合送订单不允许调用此接口 level:0, code:1047") - ErrOrderStatusAlreadySatisfyCurOperationMTWM = errors.New("code:1047") + ErrOrderStatusIsNotSuitable4CurOperation = errors.New("订单锁定或状态不适合当前操作") + ErrOrderStatusAlreadySatisfyCurOperation = errors.New("订单当前状态已满足当前操作") + ErrOrderStatusAlreadySatisfyCurOperationELM = errors.New("无需切自配送") + ErrOrderStatusAlreadySatisfyCurOperationMTWM = errors.New("非专送、快送、混合送订单不允许调用此接口 level:0, code:1047") ErrCanNotCreateAtLeastOneWaybill = errors.New("一个运单都不能创建") ErrCanNotFindOrder = errors.New("不能找到订单(一般是由于事件错序)") diff --git a/business/partner/delivery/fn/wayBill_test.go b/business/partner/delivery/fn/wayBill_test.go new file mode 100644 index 000000000..e63598005 --- /dev/null +++ b/business/partner/delivery/fn/wayBill_test.go @@ -0,0 +1,11 @@ +package fn + +import ( + "fmt" + "strings" + "testing" +) + +func TestCC(t *testing.T) { + fmt.Println(strings.Contains("非专送、快送、混合送订单不允许调用此接口 level:0, code:1047", "1047")) +}