liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

门店营业数据全部按完成时间

Browse Source
This commit is contained in:
苏尹岚
2020-03-09 10:35:25 +08:00
parent 8f04360be6
commit 0ed8bfbd92
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/jxcallback/orderman/orderman_ext.go
View File

@@ -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
}

6
business/jxstore/cms/store_sku.go
View File

@@ -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 {