wesmiler 报恩寺项目

app/Services/GongdengOrderService.php

@@ -165,7 +165,7 @@ class GongdengOrderService extends BaseService
 
         // 验证是否供灯过
         $buyType = 1;
-        $gdCheckData = GongdengOrderModel::where(['source_id' => $fid, 'user_id' => $userId, 'status' => 2, 'mark' => 1])
+        $gdCheckData = GongdengOrderModel::where(['source_id' => $fid, 'user_id' => $userId,'lamp_status'=> 2, 'status' => 2, 'mark' => 1])
             ->where('expire_time', '>=', time())
             ->select(['id', 'source_id', 'user_id','device_num', 'expire_time', 'params'])
             ->first();
@@ -195,6 +195,7 @@ class GongdengOrderService extends BaseService
         ];
 
         if($gdCheckData){
+            $data['device_num'] = $gdCheckData->device_num;
             $data['params'] = $gdCheckData->params;
         }