- GetAfsOrders添加参数skuIDs
This commit is contained in:
@@ -893,7 +893,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
return saleInfoList, err
|
||||
}
|
||||
|
||||
func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID, vendorOrderID string, vendorIDList, appealTypeList, storeIDList, statusList []int, fromTime, toTime time.Time, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
|
||||
func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID, vendorOrderID string, vendorIDList, appealTypeList, storeIDList, statusList, skuIDs []int, fromTime, toTime time.Time, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
|
||||
globals.SugarLogger.Debugf("GetAfsOrders")
|
||||
|
||||
pageSize = jxutils.FormalizePageSize(pageSize)
|
||||
@@ -901,7 +901,8 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
|
||||
offset = 0
|
||||
}
|
||||
sql := `
|
||||
SELECT SQL_CALC_FOUND_ROWS t1.*
|
||||
SELECT SQL_CALC_FOUND_ROWS
|
||||
t1.*
|
||||
FROM afs_order t1
|
||||
`
|
||||
var (
|
||||
@@ -912,25 +913,27 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
|
||||
if keyword != "" {
|
||||
if jxutils.GetPossibleVendorIDFromAfsOrderID(keyword) > model.VendorIDUnknown && afsOrderID == "" {
|
||||
afsOrderID = keyword
|
||||
keyword = ""
|
||||
} else if jxutils.GetPossibleVendorIDFromVendorOrderID(keyword) > model.VendorIDUnknown && vendorOrderID == "" {
|
||||
}
|
||||
if jxutils.GetPossibleVendorIDFromVendorOrderID(keyword) > model.VendorIDUnknown && vendorOrderID == "" {
|
||||
vendorOrderID = keyword
|
||||
keyword = ""
|
||||
}
|
||||
}
|
||||
if vendorOrderID != "" || afsOrderID != "" {
|
||||
sqlWhere = "WHERE (0 = 1"
|
||||
if vendorOrderID != "" {
|
||||
sqlWhere = " WHERE (t1.vendor_order_id = ? OR t1.vendor_order_id2 = ?)"
|
||||
sqlParams = []interface{}{
|
||||
sqlWhere += " OR (t1.vendor_order_id = ? OR t1.vendor_order_id2 = ?)"
|
||||
sqlParams = append(sqlParams, []interface{}{
|
||||
vendorOrderID,
|
||||
vendorOrderID,
|
||||
}
|
||||
} else {
|
||||
sqlWhere = " WHERE (t1.afs_order_id = ?)"
|
||||
sqlParams = []interface{}{
|
||||
afsOrderID,
|
||||
}
|
||||
})
|
||||
}
|
||||
if afsOrderID != "" {
|
||||
sqlWhere += " OR (t1.afs_order_id = ?)"
|
||||
sqlParams = append(sqlParams, []interface{}{
|
||||
afsOrderID,
|
||||
})
|
||||
}
|
||||
sqlWhere += ")"
|
||||
} else {
|
||||
if toTime.Sub(fromTime) > 24*time.Hour*60 {
|
||||
return nil, fmt.Errorf("售后单查询时间不能超过60天")
|
||||
@@ -967,12 +970,15 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
|
||||
sqlWhere += " AND t1.appeal_type IN (" + dao.GenQuestionMarks(len(appealTypeList)) + ")"
|
||||
sqlParams = append(sqlParams, appealTypeList)
|
||||
}
|
||||
if len(skuIDs) > 0 {
|
||||
sqlWhere += " AND (SELECT COUNT(*) FROM order_sku_financial t11 WHERE t11.is_afs_order = 1 AND t11.afs_order_id = t1.afs_order_id AND t11.vendor_id = t1.vendor_id AND t11.jx_sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")) > 0"
|
||||
sqlParams = append(sqlParams, skuIDs)
|
||||
}
|
||||
if len(vendorIDList) > 0 {
|
||||
sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDList)) + ")"
|
||||
sqlParams = append(sqlParams, vendorIDList)
|
||||
}
|
||||
}
|
||||
if len(vendorIDList) > 0 {
|
||||
sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDList)) + ")"
|
||||
sqlParams = append(sqlParams, vendorIDList)
|
||||
}
|
||||
|
||||
sql += sqlWhere
|
||||
sql += `
|
||||
ORDER BY t1.afs_created_at DESC
|
||||
|
||||
Reference in New Issue
Block a user