From a5c3a1c9852b4e484e1bfbfe006b6c28d506b492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 2 Apr 2020 13:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=96=E8=B4=A7=E5=A4=B1=E8=B4=A5=E5=B0=9D=E8=AF=95=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4orderflag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 6 +++++-
 business/jxstore/cms/store_sku.go              | 5 +----
 business/model/dao/dao_order.go                | 9 +++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 01a515b14..9fa6a6111 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -417,7 +417,11 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
 					} else if status.Status == model.OrderFlagMaskFailedDeliver {
 						clearFlag = model.OrderFlagMaskFailedDeliver
 					}
-					dao.ClearOrderFlag(dao.GetDB(), model.AdminName, order.VendorOrderID, order.VendorID, clearFlag)
+					if order.Flag > clearFlag {
+						dao.ClearOrderFlag2(dao.GetDB(), model.AdminName, order.VendorOrderID, order.VendorID, clearFlag|model.OrderFlagMaskPrinted)
+					} else {
+						dao.ClearOrderFlag(dao.GetDB(), model.AdminName, order.VendorOrderID, order.VendorID, clearFlag)
+					}
 				}
 			}
 		}
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 94ff4d22c..a2ea1bb36 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -3216,13 +3216,10 @@ func AutoFocusStoreSkusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhe
 					skuName    []*model.SkuName
 					skuNameMap = make(map[int]int)
 				)
-				//物料店和绑定了银豹的店不自动关注畅销品
+				//物料店不自动关注畅销品
 				if v.ID == model.MatterStoreID {
 					return retVal, err
 				}
-				if storeDetail, err2 := dao.GetStoreDetail(db, v.ID, model.VendorIDYB); err2 != nil || storeDetail.VendorStoreID != "" {
-					return retVal, err
-				}
 				sql := `
 					SELECT DISTINCT a.name_id id
 					FROM sku a
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index c91a89b55..9cbd4c970 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -233,6 +233,15 @@ func ClearOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID i
 	return err
 }
 
+func ClearOrderFlag2(db *DaoDB, userName string, vendorOrderID string, vendorID int, flag int) (err error) {
+	_, err = ExecuteSQL(db, `
+	UPDATE goods_order
+	SET flag = ?
+	WHERE vendor_order_id = ? AND vendor_id = ?
+	`, flag, vendorOrderID, vendorID)
+	return err
+}
+
 func SetAfsOrderFlag(db *DaoDB, userName string, afsOrderID string, vendorID int, flag int) (err error) {
 	_, err = ExecuteSQL(db, `
 	UPDATE afs_order