|
@@ -197,7 +197,7 @@ return array
|
|
|
'type' => 'all',
|
|
|
'order' => array('day' => 'desc', 'cdate' => 'desc'),
|
|
|
'page' => array(20, 'list'),
|
|
|
- 'group' => 'CONCAT_WS("_", type, type_id, sku_id)',
|
|
|
+ 'group' => '(case when type == 2 then concat_ws("_", type, type_id) else concat_ws("_", type, type_id, sku_id) end)',
|
|
|
'col' => '*,sum(total_num) as total_num, sum(sell_num) as sell_num, sum(cash) as cash',
|
|
|
),
|
|
|
),
|