From 20abc54e364a84c00d551d8e96fde8085f80fcab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 13 Aug 2020 08:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     | 26 +++++++++++++++++--
 .../jxcallback/scheduler/defsch/defsch_ext.go | 22 ----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index d67ec8997..cfe2d1d84 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -736,8 +736,30 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				// if order.VendorID == model.VendorIDJX {
 				// 	excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
 				// }
-				if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {
-					savedOrderInfo.retryCount++
+				if savedOrderInfo != nil {
+					//TODO 2020-07-21 发单时间要在门店的营业时间内
+					if savedOrderInfo.storeDetail != nil {
+						if savedOrderInfo.storeDetail.OpenTime1 != 0 && savedOrderInfo.storeDetail.CloseTime1 != 0 {
+							time1 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime1, time.Now())
+							time2 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime1, time.Now())
+							if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 {
+								if savedOrderInfo.storeDetail.OpenTime2 != 0 && savedOrderInfo.storeDetail.CloseTime2 != 0 {
+									time3 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime2, time.Now())
+									time4 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime2, time.Now())
+									if time.Now().Sub(time3) < 0 || time.Now().Sub(time4) > 0 {
+										err = fmt.Errorf("不在门店营业时间范围内！")
+									}
+								} else {
+									err = fmt.Errorf("不在门店营业时间范围内！")
+								}
+							}
+						}
+					}
+				}
+				if err == nil {
+					if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {
+						savedOrderInfo.retryCount++
+					}
 				}
 			} else {
 				errMsg := fmt.Sprintf("订单:%s已经自动创建过了%d次运单，仍然无法配送，请关注！", order.VendorOrderID, savedOrderInfo.retryCount)
diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go
index 3159be54c..d76f3e3fc 100644
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -87,28 +87,6 @@ func (s *DefScheduler) canOrderCreateWaybillNormally(order *model.GoodsOrder, sa
 	} else if model.IsOrderHaveWaybill(order) {
 		err = fmt.Errorf("当前订单%s已经有了有效的承运人%s了", order.VendorOrderID, jxutils.GetVendorName(order.WaybillVendorID))
 	}
-	if savedOrderInfo != nil {
-		//TODO 2020-07-21 发单时间要在门店的营业时间内
-		if savedOrderInfo.storeDetail != nil {
-			if savedOrderInfo.storeDetail.OpenTime1 != 0 && savedOrderInfo.storeDetail.CloseTime1 != 0 {
-				time1 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime1, time.Now())
-				time2 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime1, time.Now())
-				if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 {
-					if savedOrderInfo.storeDetail.OpenTime2 != 0 && savedOrderInfo.storeDetail.CloseTime2 != 0 {
-						time3 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime2, time.Now())
-						time4 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime2, time.Now())
-						if time.Now().Sub(time3) < 0 || time.Now().Sub(time4) > 0 {
-							// globals.SugarLogger.Warnf("createWaybillOn3rdProviders return orderID: %s,不在门店营业时间范围内1！", order.VendorOrderID)
-							err = fmt.Errorf("不在门店营业时间范围内！")
-						}
-					} else {
-						// globals.SugarLogger.Warnf("createWaybillOn3rdProviders return orderID: %s,不在门店营业时间范围内2！", order.VendorOrderID)
-						err = fmt.Errorf("不在门店营业时间范围内！")
-					}
-				}
-			}
-		}
-	}
 	return err
 }