|
|
@@ -219,20 +219,21 @@ class O2oApp {
|
|
|
$g = $collection->group($keys, $initial, $reduce, $condition);
|
|
|
|
|
|
$group_data = $g['retval'];
|
|
|
+ foreach($group_data as $data) {
|
|
|
+ $sum += $data['commision'];
|
|
|
+ }
|
|
|
+
|
|
|
if (!empty($group_data)) {
|
|
|
$group_data = $group_data[0];
|
|
|
$sum = $group_data['sum'];
|
|
|
$order = $group_data['order'];
|
|
|
$append = $group_data['append'];
|
|
|
}
|
|
|
- foreach($group_data as $data) {
|
|
|
- $sum += $group_data['commision'];
|
|
|
- }
|
|
|
- var_dump($sum);
|
|
|
+
|
|
|
$parsedRows = Commision::model()->parse($rows);
|
|
|
$data = array(
|
|
|
'userid' => $this->userid, // 用户企业号内ID
|
|
|
- 'sum1' => $sum, // 总提成数
|
|
|
+ 'sum' => $sum, // 总提成数
|
|
|
'list' => $parsedRows, // 提成列表
|
|
|
'count' => $count, // 总订单数
|
|
|
'append' => $append, // 追加订单数
|
DengTao