From 8c2e1f4f1bb9664df7552e34597edef6d2109dfc Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 29 Mar 2019 15:42:18 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E7=BE=8E=E5=9B=A2=E5=A4=96=E5=8D=96PoiOnli?=
 =?UTF-8?q?ne=E8=BF=94=E5=9B=9E=E6=88=90=E5=8A=9F=E4=B9=9F=E4=B8=8D?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E4=B8=8A=E7=BA=BF=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/store.go |  2 ++
 business/partner/purchase/mtwm/store.go | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index f81c8597f..6f25ab70f 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -199,6 +199,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 								err = nil
 							}
 						}
+					}
+					if err != nil {
 						return err
 					}
 					// todo 饿百 开店审核通过后不允许修改商户信息
diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index 06a606a2a..b20f81b1f 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -132,13 +132,22 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID)
 	} else {
 		if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil {
-			if openLevel == mtwmapi.PoiOpenLevelHaveRest {
-				err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID)
-			} else {
-				err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID)
+			// 这个函数成功返回也并不表示上线成功。。。
+			remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID)
+			if err != nil {
+				return err
 			}
-			if err == nil {
-				err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime))
+			if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline {
+				if openLevel == mtwmapi.PoiOpenLevelHaveRest {
+					err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID)
+				} else {
+					err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID)
+				}
+				if err == nil {
+					err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime))
+				}
+			} else {
+				err = errors.New("门店还未上线，不能修改营业状态")
 			}
 		}
 	}