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

Accept Merge Request #48: (yonghui -> mark)

Browse Source 
Merge Request: 门店订单归属补漏
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48
This commit is contained in:
徐建华
2019-12-02 14:37:09 +08:00
parent 351551bfe1 d4edd5d06d
commit 34a1f1d954
13 changed files with 389 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
business/model/dao/dao_order.go
View File

@@ -919,6 +919,37 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
return orders, totalCount, err
}
func UpdateOrdersWithoutJxStoreID(db *DaoDB, fromDate, toDate time.Time) (count int64, err error) {
sql := `
UPDATE goods_order t1
JOIN store_map a ON a.vendor_store_id = t1.vendor_store_id AND a.vendor_id = t1.vendor_id
SET t1.jx_store_id = a.store_id
WHERE t1.jx_store_id = 0
AND a.deleted_at = ?
AND t1.order_created_at >= ? AND t1.order_created_at <= ?
`
sqlParams := []interface{}{
utils.DefaultTimeValue,
}
if !utils.IsTimeZero(fromDate) {
sqlParams = append(sqlParams, fromDate)
if !utils.IsTimeZero(toDate) {
sqlParams = append(sqlParams, toDate)
} else {
sqlParams = append(sqlParams, time.Now())
}
} else {
if !utils.IsTimeZero(toDate) {
sqlParams = append(sqlParams, toDate.AddDate(0, 0, -5))
sqlParams = append(sqlParams, toDate)
} else {
sqlParams = append(sqlParams, time.Now().AddDate(0, 0, -5))
sqlParams = append(sqlParams, time.Now())
}
}
return ExecuteSQL(db, sql, sqlParams)
}
func GetMyOrderCountInfo(db *DaoDB, userID string, fromDate, toDate time.Time, statuss []int) (countInfo []*model.GoodsOrderCountInfo, err error) {
if utils.IsTimeZero(fromDate) {
return nil, fmt.Errorf("必须指定开始日期")