|
@@ -334,7 +334,7 @@ class BookTest extends Command
|
|
|
$result = [];
|
|
$result = [];
|
|
|
$chapter_model = new ChapterOrder();
|
|
$chapter_model = new ChapterOrder();
|
|
|
foreach ($info as $item){
|
|
foreach ($info as $item){
|
|
|
- $to_bids = YqUserBidRelation::where('uid',$item->uid)->select('to_bid','created_at')->get();
|
|
|
|
|
|
|
+ $to_bids = YqUserBidRelation::where('uid',$item->uid)->where('to_bid','>',0)->select('to_bid','created_at')->get();
|
|
|
$from_bids = YqUserBidRelation::where('uid',$item->uid)->where('from_bid','>',0)->select('from_bid','created_at')->get();
|
|
$from_bids = YqUserBidRelation::where('uid',$item->uid)->where('from_bid','>',0)->select('from_bid','created_at')->get();
|
|
|
$chapter_model->setCurrentTable($item->uid);
|
|
$chapter_model->setCurrentTable($item->uid);
|
|
|
if($to_bids){
|
|
if($to_bids){
|
|
@@ -373,7 +373,6 @@ class BookTest extends Command
|
|
|
foreach ($from_bids as $from_bid){
|
|
foreach ($from_bids as $from_bid){
|
|
|
$bid = $from_bid->from_bid;
|
|
$bid = $from_bid->from_bid;
|
|
|
$time = $from_bid->created_at->format('Y-m-d H:i:s');
|
|
$time = $from_bid->created_at->format('Y-m-d H:i:s');
|
|
|
- if(!$to_bid) continue;
|
|
|
|
|
$fee = $chapter_model->where('uid',$item->uid)
|
|
$fee = $chapter_model->where('uid',$item->uid)
|
|
|
->where('bid',$bid)
|
|
->where('bid',$bid)
|
|
|
->where('created_at','>=',$time)
|
|
->where('created_at','>=',$time)
|
