From 6fc02ac6cda7e35a19423993ccc57334c8ff99bf Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 20 Jul 2018 09:08:44 +0800
Subject: [PATCH] - don't send OrderStatusWaitOutStore to freshfood.

---
 legacy/jd/controller/order.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/legacy/jd/controller/order.go b/legacy/jd/controller/order.go
index 2291f12fa..99d03b50d 100644
--- a/legacy/jd/controller/order.go
+++ b/legacy/jd/controller/order.go
@@ -215,14 +215,16 @@ func normalOrderStatus(msg *jdapi.CallbackOrderMsg) (err error) {
 			if rec.OrderStatus == int(utils.Str2Int64(msg.StatusID)) {
 				globals.SugarLogger.Infof("Duplicate message msg:%v", msg)
 			} else {
-				if err = freshfood.FreshFoodAPI.JDOrderStatus(msg); err == nil && msg.StatusID != jdapi.OrderStatusWaitOutStore { // 老系统没有处理OrderStatusWaitOutStore，不转发
-					rec.OrderStatus = int(utils.Str2Int64(msg.StatusID))
-					rec.OrderStatusTime = msg.Timestamp
-					rec.Code = "0"
-					err = utils.CallFuncLogError(func() error {
-						_, err := db.Update(rec, "OrderStatus", "OrderStatusTime", "Code")
-						return err
-					}, globals.ErrStrAccessDB)
+				if msg.StatusID != jdapi.OrderStatusWaitOutStore { // 老系统没有处理OrderStatusWaitOutStore，不转发
+					if err = freshfood.FreshFoodAPI.JDOrderStatus(msg); err == nil {
+						rec.OrderStatus = int(utils.Str2Int64(msg.StatusID))
+						rec.OrderStatusTime = msg.Timestamp
+						rec.Code = "0"
+						err = utils.CallFuncLogError(func() error {
+							_, err := db.Update(rec, "OrderStatus", "OrderStatusTime", "Code")
+							return err
+						}, globals.ErrStrAccessDB)
+					}
 				}
 			}
 		}