diff --git a/business/model/dao/store_sku_sales.go b/business/model/dao/store_sku_sales.go index 47cc675da..5c8b05940 100644 --- a/business/model/dao/store_sku_sales.go +++ b/business/model/dao/store_sku_sales.go @@ -1,6 +1,9 @@ package dao import ( + "time" + + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" ) @@ -10,7 +13,7 @@ func GetSkuSalesCntList(db *DaoDB, storeID, cityCode, dayNum, limit int, skuIDs FROM goods_order t1 JOIN order_sku t2 on t1.vendor_order_id = t2.vendor_order_id and t1.vendor_id = t2.vendor_id JOIN store t3 on t1.jx_store_id = t3.id - WHERE DATE(t1.order_finished_at) BETWEEN DATE_SUB(CURDATE(), INTERVAL ? DAY) and DATE_SUB(CURDATE(), INTERVAL 1 DAY) + WHERE t1.order_finished_at >= ? AND t1.order_finished_at < ? AND t1.status = ? AND t2.jx_sku_id <> 0 AND t3.city_code = ? @@ -18,8 +21,11 @@ func GetSkuSalesCntList(db *DaoDB, storeID, cityCode, dayNum, limit int, skuIDs if dayNum < 0 { dayNum = 30 } + beginTime := utils.GetCurDate().Add(-time.Hour * 24 * time.Duration(dayNum)) + endTime := utils.GetCurDate() sqlParams := []interface{}{ - dayNum, + beginTime, + endTime, model.OrderStatusFinished, cityCode, } @@ -53,15 +59,18 @@ func GetSkuBadCommentCntList(db *DaoDB, storeID, dayNum int) (skuCountList []*mo SELECT t2.jx_sku_id sku_id, COUNT(*) count FROM jx_bad_comments t1 JOIN order_sku t2 ON t1.order_id = t2.vendor_order_id - WHERE DATE(t1.createtime) BETWEEN DATE_SUB(CURDATE(), INTERVAL ? DAY) and DATE_SUB(CURDATE(), INTERVAL 1 DAY) + WHERE t1.createtime >= ? AND t1.createtime < ? AND t1.jxstoreid = ? GROUP BY t2.jx_sku_id ` if dayNum < 0 { dayNum = 30 } + beginTime := utils.GetCurDate().Add(-time.Hour * 24 * time.Duration(dayNum)) + endTime := utils.GetCurDate() sqlParams := []interface{}{ - dayNum, + beginTime, + endTime, storeID, } err = GetRows(db, &skuCountList, sql, sqlParams)