From 8a179a496a9053b5af9018d7ec22de71ea0e92b5 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 6 Aug 2021 10:04:20 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go           | 11 ++++++-----
 business/partner/delivery/mtps/store.go | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 12eba8aa6..477981bdd 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -739,11 +739,12 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS
 				Store: store.Store,
 			}
 			retVal.Name = store.Name
-			if retVal.Status == model.StoreStatusDisabled {
-				retVal.BussinessStatus = -1
-			} else {
-				retVal.BussinessStatus = 1
-			}
+			retVal.BussinessStatus = store.CourierStatus
+			//if retVal.Status == model.StoreStatusDisabled {
+			//	retVal.BussinessStatus = -1
+			//} else {
+			//	retVal.BussinessStatus = 1
+			//}
 			return retVal, err
 		}
 	}
diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go
index 5871365ab..708b95277 100644
--- a/business/partner/delivery/mtps/store.go
+++ b/business/partner/delivery/mtps/store.go
@@ -10,6 +10,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
+	"time"
 )
 
 const (
@@ -101,10 +102,18 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
 			// CourierStatus: model.StoreStatusOpened,
 			// AuditStatus:   model.StoreAuditStatusOnline,
 		}
-		result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName)
-		if err == nil {
-			storeDetail.AuditStatus = mtpsOpenTypeToJx(result.DataList[0].OpenType)
-			storeDetail.CourierStatus = mtpsOpenTypeToJx2(result.DataList[0].OpenType)
+		_, err = api.MtpsAPI.CheckOrder(shopInfo.ShopID, shopInfo.ShopAddress, int64(shopInfo.ShopLng), int64(shopInfo.ShopLat), time.Now().Unix())
+		//result, err := api.MtpsAPI.GetStoreStatus(shopInfo.ShopName)
+		//if err == nil {
+		//	storeDetail.AuditStatus = mtpsOpenTypeToJx(result.DataList[0].OpenType)
+		//	storeDetail.CourierStatus = mtpsOpenTypeToJx2(result.DataList[0].OpenType)
+		//}
+		if mtpsapi.IsOpen(err) {
+			storeDetail.AuditStatus = model.StoreAuditStatusOnline
+			storeDetail.CourierStatus = model.StoreStatusOpened
+		} else {
+			storeDetail.AuditStatus = model.StoreAuditStatusRejected
+			storeDetail.CourierStatus = model.StoreStatusClosed
 		}
 	}
 	return storeDetail, err