|
|
@@ -309,8 +309,8 @@ class Other extends BaseController
|
|
309
|
309
|
$list = Db::name('order_dy')
|
|
310
|
310
|
->field('order_dy_id id,product_id goods_id,order_sn,product_num goods_num,product_img goods_img,product_name goods_name,commission,total_pay_amount pay_money,bill_status,bill_end_time,create_time,flow_point status,pay_success_time')
|
|
311
|
311
|
->where('uid', $userId)
|
|
312
|
|
- ->where('pay_success_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
|
|
313
|
|
- ->where('pay_success_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
|
|
|
312
|
+ ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
|
|
|
313
|
+ ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
|
|
314
|
314
|
->order('id', 'desc')
|
|
315
|
315
|
->page($page, $limit)->select()
|
|
316
|
316
|
->each(function ($value) {
|