From a247c24a08d861d0d253267183d441263f505c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 09:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=99=9A=E5=88=B7=E7=BE=8E=E5=9B=A2?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/storeman.go        | 12 ++++++------
 business/partner/delivery/mtps/store.go | 26 +++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go
index 4330ead2b..d77e02159 100644
--- a/business/jxstore/cms/storeman.go
+++ b/business/jxstore/cms/storeman.go
@@ -107,13 +107,13 @@ func (s *StoreManager) OnCourierStoreStatusChanged(ctx *jxcontext.Context, vendo
 		db := dao.GetDB()
 		_, err2 := dao.GetStoreDetail2(db, 0, vendorStoreID, vendorID)
 		if err = err2; err == nil {
-			// status := model.StoreStatusOpened
-			// if auditStatus != model.StoreAuditStatusOnline {
-			// 	status = model.StoreStatusDisabled
-			// }
+			status := model.StoreStatusOpened
+			if auditStatus != model.StoreAuditStatusOnline {
+				status = model.StoreStatusDisabled
+			}
 			_, err = dao.UpdateEntityLogically(db, &model.StoreCourierMap{}, map[string]interface{}{
-				// model.FieldStatus: status,
-				"AuditStatus": auditStatus,
+				model.FieldStatus: status,
+				"AuditStatus":     auditStatus,
 			}, ctx.GetUserName(), map[string]interface{}{
 				model.FieldVendorStoreID: vendorStoreID,
 				model.FieldVendorID:      vendorID,
diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go
index bd1a84651..ff4acd128 100644
--- a/business/partner/delivery/mtps/store.go
+++ b/business/partner/delivery/mtps/store.go
@@ -93,14 +93,36 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
 			},
 			VendorID:      model.VendorIDMTPS,
 			VendorStoreID: shopInfo.ShopID,
-			CourierStatus: model.StoreStatusOpened,
+			// CourierStatus: model.StoreStatusOpened,
 			// AuditStatus:   model.StoreAuditStatusOnline,
 		}
-		// result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName)
+		result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName)
+		if err == nil {
+			storeDetail.AuditStatus = mtpsOpenTypeToJx(result.OpenType)
+			storeDetail.CourierStatus = mtpsOpenTypeToJx2(result.OpenType)
+		}
 	}
 	return storeDetail, err
 }
 
+func mtpsOpenTypeToJx(openType int) (status int) {
+	if openType == 0 {
+		status = model.StoreAuditStatusRejected
+	} else {
+		status = model.StoreAuditStatusOnline
+	}
+	return status
+}
+
+func mtpsOpenTypeToJx2(openType int) (status int) {
+	if openType == 0 {
+		status = model.StoreStatusClosed
+	} else {
+		status = model.StoreStatusOpened
+	}
+	return status
+}
+
 func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool {
 	return mtpsapi.IsErrShopNotExist(err)
 }