|
@@ -129,12 +129,12 @@ class TestController extends webApp
|
|
|
$queryList = $queryList->all();
|
|
|
if($queryList){
|
|
|
foreach ($queryList as $item ){
|
|
|
- if($item['order_sn'] && !RedisService::get('order:'.$i.':'.$item['order_sn'])){
|
|
|
+ if($item['order_sn'] && !DB::table('test_logs')->where(['order_sn'=> $item['order_sn'],'page'=> $i])->value('id')){
|
|
|
$item['page'] = $i;
|
|
|
$item['money'] = floatval($item['money']);
|
|
|
$item['code'] = str_replace(['『','』'],['[',']'], $item['code']);
|
|
|
$datas[] = $item;
|
|
|
- RedisService::set('order:'.$i.':'.$item['order_sn'], 11, 30);
|
|
|
+// RedisService::set('order:'.$i.':'.$item['order_sn'], 11, 30);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -142,11 +142,17 @@ class TestController extends webApp
|
|
|
$i++;
|
|
|
RedisService::set("log:page", $i, 600);
|
|
|
}
|
|
|
+ try {
|
|
|
+ if(!DB::table('test_logs')->insert($datas)){
|
|
|
+ return message(1002, true, ['account'=> $account,'count'=> count($datas)]);
|
|
|
+ }
|
|
|
|
|
|
- if(!DB::table('test_logs')->insert($datas)){
|
|
|
- RedisService::set("log:page", $page, 600);
|
|
|
+ return message(1002, true, ['account'=> $account,'count'=> count($datas)]);
|
|
|
+ }catch (\Exception $exception){
|
|
|
+ return message(1001, true, ['account'=> $account,'count'=> count($datas),'error'=> $exception->getMessage()]);
|
|
|
}
|
|
|
- return message(1002, true, ['account'=> $account,'count'=> count($datas)]);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public function export()
|