- SelfDeliveringAndUpdateStatus中添加订单日志

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -23,12 +23,13 @@ func (s *DefScheduler) loadSavedOrderByID(vendorOrderID string, vendorID int, is
 }
 
 func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) {
+	var order *model.GoodsOrder
 	jxutils.CallMsgHandler(func() {
 		err = func() (err error) {
 			globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
 			savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
 			if savedOrderInfo != nil {
-				order := savedOrderInfo.order
+				order = savedOrderInfo.order
 				if err = s.isPossibleSwitch2SelfDelivery(order); err == nil {
 					err = s.cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
 					if err == nil {
@@ -60,12 +61,23 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 					}
 				}
 			} else {
+				order = &model.GoodsOrder{
+					VendorOrderID: vendorOrderID,
+					VendorID:      vendorID,
+				}
 				err = scheduler.ErrCanNotFindOrder
 			}
 			globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
 			return err
 		}()
 	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
+	vendorStatus := fmt.Sprintf("%s转商户自送成功", ctx.GetUserName())
+	remark := ""
+	if err != nil {
+		vendorStatus = fmt.Sprintf("%s转商户自送失败", ctx.GetUserName())
+		remark = err.Error()
+	}
+	partner.CurOrderManager.OnOrderMsg(order, vendorStatus, remark)
 	return err
 }