aa

business/jxcallback/scheduler/defsch/defsch.go

@@ -2,6 +2,7 @@ package defsch
 
 import (
 	"fmt"
+	"git.rosy.net.cn/jx-callback/business/jxutils/smsmsg"
 	"math/rand"
 	"sync"
 	"time"
@@ -20,7 +21,6 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
-	"git.rosy.net.cn/jx-callback/business/jxutils/smsmsg"
 	"git.rosy.net.cn/jx-callback/business/msghub"
 
 	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
@@ -293,6 +293,8 @@ func init() {
 				TimeoutAction: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) {
 					if err = sch.autoPickupGood(savedOrderInfo); err != nil {
 						partner.CurOrderManager.OnOrderMsg(savedOrderInfo.order, "自动拣货失败", err.Error())
+					} else {
+						smsmsg.NotifyPickOrder(savedOrderInfo.order)
 					}
 					return nil
 				},
@@ -484,9 +486,6 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
 				if statusChanged && status.Status == model.OrderStatusCanceled {
 					s.notifyOrderCanceled(savedOrderInfo.order)
 				}
-				if status.Status == model.OrderStatusFinishedPickup {
-					smsmsg.NotifyPickOrder(order)
-				}
 				msghub.OnFinishedPickup(savedOrderInfo.order)
 			} else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) ||
 				status.Status == model.OrderStatusApplyFailedGetGoods || //model.IsOrderUnlockStatus(status.Status) ||
@@ -595,9 +594,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 							s.solutionJdsOrder(bill)
 						}
 						//如果是商城的订单, 骑手取货时，需要发短信提醒
-						if bill.Status == model.WaybillStatusDelivering && order.VendorID == model.VendorIDJX && order.OrderType == model.OrderTypeNormal {
-							smsmsg.NotifyJxOrder(order, bill)
-						}
+						//if bill.Status == model.WaybillStatusDelivering && order.VendorID == model.VendorIDJX && order.OrderType == model.OrderTypeNormal {
+						//	smsmsg.NotifyJxOrder(order, bill)
+						//}
 						//门店发单的门店，需要根据实际运费更新账户（多退少补）
 						if storeDetail, err2 := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, ""); err2 == nil {
 							if storeDetail.CreateDeliveryType == model.YES {