Skip to content

Commit 74065cd

Browse files
liujiaqi222liujiaqi222
committed
fix(query): resolve GROUP BY compatibility with ONLY_FULL_GROUP_BY mode
1 parent cef8316 commit 74065cd

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

‎crmeb/app/dao/activity/coupon/StoreCouponUserDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function memberCouponUserGroupBymonth(array $where)
176176
->whereMonth('add_time')
177177
->whereIn('cid', $where['couponIds'])
178178
->field('count(id) as num,FROM_UNIXTIME(add_time, \'%Y-%m\') as time')
179-
->group("FROM_UNIXTIME(add_time, '%Y-%m')")
179+
->group("time")
180180
->select()->toArray();
181181
}
182182

‎crmeb/app/dao/order/OtherOrderDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function getGroupField(array $where, string $field, string $group)
107107
$query->field("sum($field) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
108108
$query->group("FROM_UNIXTIME($group, '$timeUinx')");
109109
})
110-
->order('add_time ASC')->select()->toArray();
110+
->order('time ASC')->select()->toArray();
111111
}
112112

113113
/**根据条件获取单条信息

‎crmeb/app/dao/order/StoreOrderDao.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,9 @@ public function orderAddTimeList($datebefor, $dateafter, $timeType = "week")
352352
break;
353353
}
354354
$query->field("FROM_UNIXTIME(add_time,'$timeUnix') as day,count(*) as count,sum(pay_price) as price");
355-
$query->group("FROM_UNIXTIME(add_time, '$timeUnix')");
355+
$query->group("day");
356356
})
357-
->order('add_time asc')
357+
->order('day asc')
358358
->select()->toArray();
359359
}
360360

@@ -397,9 +397,9 @@ public function nowOrderList($now_datebefor, $now_dateafter, $timeType = "week")
397397
break;
398398
}
399399
$query->field("FROM_UNIXTIME(add_time,'$timeUnix') as day,count(*) as count,sum(pay_price) as price");
400-
$query->group("FROM_UNIXTIME(add_time, '$timeUnix')");
400+
$query->group("day");
401401
})
402-
->order('add_time asc')
402+
->order('day asc')
403403
->select()->toArray();
404404
}
405405

@@ -712,7 +712,7 @@ public function getDayGroupMoney(array $where, string $sumField, string $group)
712712
$timeUinx = "%Y-%m";
713713
}
714714
$query->field("sum($sumField) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
715-
$query->group("FROM_UNIXTIME($group, '$timeUinx')");
715+
$query->group("time");
716716
})
717717
->order('pay_time ASC,id DESC')->select()->toArray();
718718
}
@@ -740,7 +740,7 @@ public function getOrderGroupCount(array $where, string $sumField = "*")
740740
$timeUinx = "%Y-%m";
741741
}
742742
$query->field("count($sumField) as number,FROM_UNIXTIME(pay_time, '$timeUinx') as time");
743-
$query->group("FROM_UNIXTIME(pay_time, '$timeUinx')");
743+
$query->group("time");
744744
})
745745
->order('pay_time ASC,id DESC')->select()->toArray();
746746
}
@@ -783,7 +783,7 @@ public function getPayOrderGroupPeople($where)
783783
$timeUinx = "%H";
784784
}
785785
$query->field("count(distinct uid) as number,FROM_UNIXTIME(pay_time, '$timeUinx') as time");
786-
$query->group("FROM_UNIXTIME(pay_time, '$timeUinx')");
786+
$query->group("time");
787787
})
788788
->order('pay_time ASC,id DESC')->select()->toArray();
789789
}

‎crmeb/app/dao/order/StoreOrderRefundDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function getDayGroupMoney(array $where, string $sumField, string $group)
166166
$timeUinx = "%Y-%m";
167167
}
168168
$query->field("sum($sumField) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
169-
$query->group("FROM_UNIXTIME($group, '$timeUinx')");
169+
$query->group("time");
170170
})
171171
->order('add_time ASC')->select()->toArray();
172172
}

‎crmeb/app/dao/system/statistics/CapitalFlowDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getRecordList($where, int $page = 0, int $limit = 0)
6969
$model = $this->search($where, false)
7070
->when(isset($where['type']) && $where['type'] !== '', function ($query) use ($where, $timeUnix) {
7171
$query->field("FROM_UNIXTIME(add_time,'$timeUnix') as day,sum(if(price >= 0,price,0)) as income_price,sum(if(price < 0,price,0)) as exp_price,add_time");
72-
$query->group("FROM_UNIXTIME(add_time, '$timeUnix')");
72+
$query->group("day");
7373
});
7474
$count = $model->count();
7575
$list = $model->when($page && $limit, function ($query) use ($page, $limit) {

‎crmeb/app/dao/user/UserBillDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public function getGroupField(array $where, string $field, string $group)
273273
$timeUinx = "%Y-%m";
274274
}
275275
$query->field("sum($field) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
276-
$query->group("FROM_UNIXTIME($group, '$timeUinx')");
276+
$query->group("time");
277277
})
278278
->order('add_time ASC')->select()->toArray();
279279
}

‎crmeb/app/dao/user/UserDao.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ public function userList($starday, $yesterday)
249249
return $this->getModel()
250250
->whereBetweenTime('add_time', $starday, $yesterday)
251251
->field("FROM_UNIXTIME(add_time,'%m-%e') as day,count(*) as count")
252-
->group("FROM_UNIXTIME(add_time, '%Y%m%e')")
253-
->order('add_time asc')->select()->toArray();
252+
->group("day")
253+
->order('day asc')->select()->toArray();
254254
}
255255

256256
/**

‎crmeb/app/dao/user/UserExtractDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function getGroupField(array $where, string $field, string $group)
112112
$timeUinx = "%Y-%m";
113113
}
114114
$query->field("sum($field) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
115-
$query->group("FROM_UNIXTIME($group, '$timeUinx')");
115+
$query->group("time");
116116
})
117117
->order('add_time ASC')->select()->toArray();
118118
}

‎crmeb/app/dao/user/UserMoneyDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function getGroupField(array $where, string $field, string $group)
108108
$timeUinx = "%Y-%m";
109109
}
110110
$query->field("sum($field) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
111-
$query->group("FROM_UNIXTIME($group, '$timeUinx')");
111+
$query->group("time");
112112
})
113113
->order('add_time ASC')->select()->toArray();
114114
}

‎crmeb/app/dao/user/UserRechargeDao.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function getGroupField(array $where, string $field, string $group)
8888
$timeUinx = "%Y-%m";
8989
}
9090
$query->field("sum($field) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
91-
$query->group("FROM_UNIXTIME($group, '$timeUinx')");
91+
$query->group("time");
9292
})
9393
->order('add_time ASC')->select()->toArray();
9494

0 commit comments

Comments
 (0)