[智价云] 发送邮件校验更新

app/Jobs/Manager/Process/SubEmailJobs.php

@@ -81,10 +81,11 @@ class SubEmailJobs implements ShouldQueue
         if (empty($lowprice_ids)) return true;
         //获取开启了通知服务的用户
         $usert_list = $LowPriceGoodsMemberModel
-            ->whereIn('low_price_goods_id', $lowprice_ids)
+            ->whereIn('lowprice_product_logid', $lowprice_ids)
             ->join('personnel_employee', 'process_lowprice_product_member.employee_id', '=', 'personnel_employee.id')
-            ->where('personnel_employee.notice_status', 1)
+            ->where('personnel_employee.open_notice', 0)
             ->where([['personnel_employee.email', '!=', ''], ['personnel_employee.email', '!=', null]])
+            ->select(['process_lowprice_product_member.*', 'personnel_employee.email'])
             ->get()->toArray();
         if (empty($usert_list)) return true;
         //按用户统计待处理的商品数量
@@ -92,10 +93,11 @@ class SubEmailJobs implements ShouldQueue
         foreach ($usert_list as $key => $value) {
             $user_id = $value['employee_id'];
             if (!isset($user_data[$user_id])) {
+                $user_data[$user_id]['employee_id'] = $user_id;
                 $user_data[$user_id]['email'] = $value['email'];
-                $user_data[$user_id]['log_ids'] = [];
+                $user_data[$user_id]['log_ids'][] = $value['lowprice_product_logid'];
             } else {
-                $user_data[$user_id]['log_ids'][] = $value['low_price_goods_id'];
+                $user_data[$user_id]['log_ids'][] = $value['lowprice_product_logid'];
             }
         }
         //发送邮件
@@ -127,9 +129,10 @@ class SubEmailJobs implements ShouldQueue
         //获取开启了通知服务的用户
         $usert_list = $ViolationProductMemberModel
             ->whereIn('violation_product_logid', $violation_price_ids)
-            ->join('personnel_employee', 'process_lowprice_product_member.employee_id', '=', 'personnel_employee.id')
-            ->where('personnel_employee.notice_status', 1)
+            ->join('personnel_employee', 'process_violation_product_member.employee_id', '=', 'personnel_employee.id')
+             ->where('personnel_employee.open_notice', 0)
             ->where([['personnel_employee.email', '!=', ''], ['personnel_employee.email', '!=', null]])
+            ->select(['process_violation_product_member.*', 'personnel_employee.email'])
             ->get()->toArray();
         if (empty($usert_list)) return true;
         //按用户统计待处理的商品数量
@@ -137,8 +140,9 @@ class SubEmailJobs implements ShouldQueue
         foreach ($usert_list as $key => $value) {
             $user_id = $value['employee_id'];
             if (!isset($user_data[$user_id])) {
+                $user_data[$user_id]['employee_id'] = $user_id;
                 $user_data[$user_id]['email'] = $value['email'];
-                $user_data[$user_id]['log_ids'] = [];
+                $user_data[$user_id]['log_ids'][] = $value['violation_product_logid'];
             } else {
                 $user_data[$user_id]['log_ids'][] = $value['violation_product_logid'];
             }