From 0ed8bfbd92935f4ed7efbdf804107b05e47b5322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 9 Mar 2020 10:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E8=90=A5=E4=B8=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=85=A8=E9=83=A8=E6=8C=89=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 14 +++++++-------
 business/jxstore/cms/store_sku.go            |  6 +-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 16f400ee9..0fc85ad5d 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -622,19 +622,19 @@ func (c *OrderManager) GetStoresOrderSaleInfo(ctx *jxcontext.Context, storeIDLis
 
 func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeIDList []int, fromTime time.Time, toTime time.Time, statusList []int) (saleInfoList []*dao.StoresOrderSaleInfo, err error) {
 	db := dao.GetDB()
-	var isFinish = true
-	if toTime.Sub(fromTime).Hours() > 24 {
-		isFinish = false
-	}
-	orderSkuList, err := dao.GetStoreOrderSkuList(db, storeIDList, fromTime, toTime, statusList, isFinish)
+	// var isFinish = true
+	// if toTime.Sub(fromTime).Hours() > 24 {
+	// 	isFinish = false
+	// }
+	orderSkuList, err := dao.GetStoreOrderSkuList(db, storeIDList, fromTime, toTime, statusList, true)
 	if err != nil {
 		return nil, err
 	}
-	afsSkuList, err := dao.GetStoreAfsOrderSkuList(db, storeIDList, fromTime, toTime, []int{model.AfsOrderStatusFinished}, isFinish)
+	afsSkuList, err := dao.GetStoreAfsOrderSkuList(db, storeIDList, fromTime, toTime, []int{model.AfsOrderStatusFinished}, true)
 	if err != nil {
 		return nil, err
 	}
-	orderSkuList4Afs, err := dao.GetStoreOrderSkuList4Afs(db, storeIDList, fromTime, toTime, isFinish)
+	orderSkuList4Afs, err := dao.GetStoreOrderSkuList4Afs(db, storeIDList, fromTime, toTime, true)
 	if err != nil {
 		return nil, err
 	}
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 2980be0ae..8c3415e08 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -3903,8 +3903,7 @@ func ReturnStoreSkuBind(ctx *jxcontext.Context, snapshotAt string, storeIDs, sku
 		sql += " AND sku_id IN(" + dao.GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
-	num, err := dao.ExecuteSQL(db, sql, sqlParams)
-	fmt.Println("delete:", num)
+	_, err = dao.ExecuteSQL(db, sql, sqlParams)
 	//查询备份的门店商品
 	var storeHiss []*model.StoreSkuBindHistory
 	sql2 := `SELECT * FROM store_sku_bind_history WHERE snapshot_at = ? AND store_id IN(` + dao.GenQuestionMarks(len(storeIDs)) + `)`
@@ -3914,9 +3913,6 @@ func ReturnStoreSkuBind(ctx *jxcontext.Context, snapshotAt string, storeIDs, sku
 		sqlParams2 = append(sqlParams2, skuIDs)
 	}
 	err = dao.GetRows(db, &storeHiss, sql2, sqlParams2)
-	for _, v := range storeHiss {
-		fmt.Println("storeHiss:", *v)
-	}
 	//插入到现在
 	var storeSkus []*model.StoreSkuBind
 	for _, v := range storeHiss {