From 6bda593cb441b01eedde270a9d0da86ee8012cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 7 Sep 2020 16:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E9=97=A8=E5=BA=97=E8=90=A5?=
 =?UTF-8?q?=E4=B8=9A=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E5=86=85=E8=A6=81?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=BF=90=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     | 28 ++++++++++++++++++-
 business/partner/partner.go                   |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 629ba16ff..1fed69dcc 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -556,6 +556,8 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 						}
 						s.updateOrderByBill(order, bill, false)
 						s.cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+						//若接单时间不在门店的营业时间范围内要取消运单
+						s.cancelWaybillNotInStoreOpentime(savedOrderInfo, bill)
 						//京东商城的话，需要去把订单出库,如果是转移过的订单，则需要修改转移订单号
 						if order.VendorID == model.VendorIDJDShop {
 							s.solutionJdsOrder(bill)
@@ -677,6 +679,31 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 	return err
 }
 
+func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) {
+	if savedOrderInfo != nil {
+		//TODO 2020-09-07 不在门店的营业时间内取消运单
+		order := savedOrderInfo.order
+		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 {
+							s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonNotInStoreOpenTime)
+						}
+					} else {
+						s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonNotInStoreOpenTime)
+					}
+				}
+			}
+		}
+	}
+	return err
+}
+
 func (s *DefScheduler) sendCourierOrderSMS(bill *model.Waybill) (err error) {
 	err = smsmsg.NotifyNewCourierOrder(bill)
 	return err
@@ -766,7 +793,6 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 								} else {
 									err = fmt.Errorf("不在门店营业时间范围内！")
 								}
-
 							}
 						}
 					}
diff --git a/business/partner/partner.go b/business/partner/partner.go
index bd4e9d041..030d2fe75 100644
--- a/business/partner/partner.go
+++ b/business/partner/partner.go
@@ -71,6 +71,7 @@ var (
 	CancelWaybillReasonStrSwitch2SelfFailed    = "转自送失败"
 	CancelWaybillReasonStrOrderAlreadyFinished = "订单已经结束"
 	CancelWaybillReasonStrActive               = "操作由人员主动发起"
+	CancelWaybillReasonNotInStoreOpenTime      = "不在门店的营业时间范围内"
 )
 
 var (