From ba9db173396cc3e1fd993794120809e51386b47e Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 9 Jun 2021 11:32:39 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jd/order.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 6554ae68e..046cd11b6 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -162,8 +162,16 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
 			order.BuyerComment = msg.OrderBuyerRemark
 		}
 		_, err = dao.UpdateEntity(db, order, "ConsigneeAddress", "ConsigneeName", "ConsigneeMobile", "ConsigneeLat", "ConsigneeLng", "BuyerComment")
-		if !(order.Status >= model.OrderStatusEndBegin && order.Status <= model.OrderStatusEndEnd) {
-			weixinmsg.NotifyOrderChanged(order)
+		if order.Status <= model.OrderStatusEndBegin {
+			if order.BusinessType == model.BusinessTypeImmediate {
+				if time.Now().Sub(order.OrderCreatedAt).Hours() <= 1 {
+					weixinmsg.NotifyOrderChanged(order)
+				}
+			} else {
+				if order.ExpectedDeliveredTime.Sub(time.Now()).Hours() >= 1 {
+					weixinmsg.NotifyOrderChanged(order)
+				}
+			}
 		}
 	}
 	return jdapi.SuccessResponse