|
|
@@ -88,12 +88,12 @@ class Money_buy_simplex extends Model {
|
|
|
public function winLoseRecord($where, $between, $begin = '', $pageSize = '') {
|
|
|
$select = ['money_time', 'gain_money', 'money', 'order_id'];
|
|
|
$mnyBuyStrMdl = lm('Money_buy_str', "commons");
|
|
|
- $mnyBuyStrSql = $mnyBuyStrMdl->select($select)->where($where);
|
|
|
+ $mnyBuyStrSql = $mnyBuyStrMdl->select($select)->where($where)->whereBetween('money_time', $between);
|
|
|
$mnyBuySpxSql = $this
|
|
|
->select($select)
|
|
|
->where($where)
|
|
|
- ->unionAll($mnyBuyStrSql)
|
|
|
->whereBetween('money_time', $between)
|
|
|
+ ->unionAll($mnyBuyStrSql)
|
|
|
->offset($begin)
|
|
|
->limit($pageSize)
|
|
|
->orderBy('money_time','DESC')
|