订单第二次取货失败尝试清除orderflag

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)
+					}
 				}
 			}
 		}

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

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