1
This commit is contained in:
@@ -902,7 +902,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
|||||||
|
|
||||||
orderIDMap := make(map[string]struct{})
|
orderIDMap := make(map[string]struct{})
|
||||||
var vendorOrderIDs []string
|
var vendorOrderIDs []string
|
||||||
orderSkuList, err := dao.GetStoreOrderSkuList(db, storeIDList, fromTime, toTime, statusList, true, isService)
|
orderSkuList, err := dao.GetStoreOrderSkuList(db, storeIDList, fromTime, toTime, statusList, true, isService) // 所有的完成订单
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package dao
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"git.rosy.net.cn/jx-callback/globals"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
@@ -407,6 +408,8 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt
|
|||||||
sqlParams = append(sqlParams, model.VendorIDMTWM)
|
sqlParams = append(sqlParams, model.VendorIDMTWM)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
globals.SugarLogger.Debugf("==========GetStoreOrderSkuList := %s", sql)
|
||||||
|
globals.SugarLogger.Debugf("==========GetStoreOrderSkuListparm := %s", utils.Format4Output(sqlParams, false))
|
||||||
err = GetRows(db, &skuList, sql, sqlParams...)
|
err = GetRows(db, &skuList, sql, sqlParams...)
|
||||||
return skuList, err
|
return skuList, err
|
||||||
}
|
}
|
||||||
@@ -458,6 +461,9 @@ func GetStoreOrderSkuList4Afs2(db *DaoDB, vendorOrderIDs []string) (skuList []*O
|
|||||||
`
|
`
|
||||||
sqlParams = append(sqlParams, vendorOrderIDs)
|
sqlParams = append(sqlParams, vendorOrderIDs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
globals.SugarLogger.Debugf("==========GetStoreOrderSkuList4Afs2 := %s", sql)
|
||||||
|
globals.SugarLogger.Debugf("==========GetStoreOrderSkuList4Afs2 := %s", utils.Format4Output(sqlParams, false))
|
||||||
err = GetRows(db, &skuList, sql, sqlParams...)
|
err = GetRows(db, &skuList, sql, sqlParams...)
|
||||||
return skuList, err
|
return skuList, err
|
||||||
}
|
}
|
||||||
@@ -502,6 +508,9 @@ func GetStoreAfsOrderSkuList2(db *DaoDB, vendorOrderIDs []string) (afsSkuList []
|
|||||||
sql += " AND t2.vendor_order_id IN (" + GenQuestionMarks(len(vendorOrderIDs)) + ")"
|
sql += " AND t2.vendor_order_id IN (" + GenQuestionMarks(len(vendorOrderIDs)) + ")"
|
||||||
sqlParams = append(sqlParams, vendorOrderIDs)
|
sqlParams = append(sqlParams, vendorOrderIDs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
globals.SugarLogger.Debugf("==========GetStoreAfsOrderSkuList2 := %s", sql)
|
||||||
|
globals.SugarLogger.Debugf("==========GetStoreAfsOrderSkuList2 := %s", utils.Format4Output(sqlParams, false))
|
||||||
err = GetRows(db, &afsSkuList, sql, sqlParams...)
|
err = GetRows(db, &afsSkuList, sql, sqlParams...)
|
||||||
return afsSkuList, err
|
return afsSkuList, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user