From f60554f514004845a6b25ba6c3d6746a6ca60a7f Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 20 Sep 2019 16:30:57 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E7=9B=91=E6=8E=A7=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=B9=B3=E5=8F=B0=E9=97=A8=E5=BA=97=E6=98=AF=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8E=A5=E5=8D=95=E7=9A=84=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=9D=9E=E8=87=AA=E5=8A=A8=E6=8E=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go         | 13 +++++++++++++
 business/model/dao/store.go           |  2 ++
 business/model/store.go               |  1 +
 business/partner/purchase/jd/store.go |  5 +++++
 4 files changed, 21 insertions(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index d028028f3..256abb016 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1432,6 +1432,7 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v
 
 							DeliveryType: store.DeliveryType,
 							StoreName:    store.OriginalName,
+							IsAutoOrder:  store.IsAutoOrder,
 						}}
 					}
 				}
@@ -1483,6 +1484,18 @@ func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.V
 		}
 	}
 	dao.Commit(db)
+
+	utils.CallFuncAsync(func() {
+		for _, v := range storeMapList {
+			if snapshot := snapshotMap[jxutils.Combine2Int(v.StoreID, v.VendorID)]; snapshot != nil {
+				if snapshot.IsAutoOrder == 1 {
+					if handler, ok := partner.GetPurchasePlatformFromVendorID(snapshot.VendorID).(partner.IStoreHandler); ok {
+						handler.EnableAutoAcceptOrder(jxcontext.AdminCtx, v.StoreID, v.VendorStoreID, false)
+					}
+				}
+			}
+		}
+	})
 	return err
 }
 
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index eb9e0ca4f..1206d6d0e 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -30,6 +30,8 @@ type StoreDetail struct {
 
 	DistrictName string `json:"districtName"`
 	CityName     string `json:"cityName"`
+
+	IsAutoOrder int8 `json:"isAutoOrder"` // 平台是否自动接单，-1：否，0：未知，1：是
 }
 
 // 带快递门店信息的
diff --git a/business/model/store.go b/business/model/store.go
index 5e4b5af37..2fb4c0819 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -412,6 +412,7 @@ type VendorStoreSnapshot struct {
 	CloseTime2   int16  `json:"closeTime2"`                    // 格式同上
 	DeliveryType int8   `orm:"default(0)" json:"deliveryType"` // 配送类型
 	StoreName    string `orm:"size(255)" json:"storeName"`     // 平台门店的名字
+	IsAutoOrder  int8   `json:"isAutoOrder"`                   // 平台是否自动接单，-1：否，0：未知，1：是
 }
 
 func (*VendorStoreSnapshot) TableUnique() [][]string {
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 86de5ca96..37f9808d4 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -46,6 +46,11 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string
 				Tel1:       result.Phone,
 			},
 		}
+		if result.IsAutoOrder == 0 {
+			retVal.IsAutoOrder = 1
+		} else {
+			retVal.IsAutoOrder = -1
+		}
 		retVal.OriginalName = result.StationName
 		_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
 		retVal.DeliveryType = JdDeliveryType2Jx(result.CarrierNo)