Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Goodup.php

@@ -1484,7 +1484,35 @@ class Goodup extends Base
                             "order_id" => $offline_id,//商品下线记录的ID
                             "order_status" => $exam_status, "before_status" => $bifore
                         ]);
-//                        halt($offline_id);
+
+                        //根据权限查询应该接收商品下线通知的人员
+                        $all_uid_name = Db::name('role_action')
+                            ->whereFindInSet('action_conllect','877')//数据写死的，要注意各个环境数据是否一致
+                            ->field('role_id')
+                            ->buildSql();
+
+                        $all_user = Db::name('user_role')
+                            ->alias('ur')
+                            ->where('ur.roleid IN '.$all_uid_name)
+                            ->leftJoin('depart_user du','du.uid = ur.uid AND du.is_del=0')
+                            ->column('ur.uid,du.nickName');
+
+                        $insert_order_msg_data=[];
+                        foreach ($all_user as $itemitem) {
+                            $insert_order_msg_data[] = [
+                                'content' => '商品下线:' . $skuCode . '由' . $creater . '操作下线',
+                                'orderCode' => $skuCode,
+                                'order_type' => 'GOL',
+                                'uid' => $itemitem['uid'],
+                                'uname' => $itemitem['nickName'],
+                                'is_read' => 0,
+                                'addtime' => date('Y-m-d H:i:s'),
+                                'updatetime' => date('Y-m-d H:i:s'),
+                            ];
+                        }
+                        //消息表
+                        Db::name('order_msg')->insertAll($insert_order_msg_data);
+
                     } else {
                         ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
                             "order_code" => $skuCode,//编号
@@ -2698,7 +2726,19 @@ class Goodup extends Base
                 'addtime' => date('Y-m-d H:i:s'),
             ]);
 
-            $insert_good_exam_data = [];
+            //根据权限查询应该接收商品下线通知的人员
+            $all_uid_name = Db::name('role_action')
+                ->whereFindInSet('action_conllect','877')//数据写死的，要注意各个环境数据是否一致
+                ->field('role_id')
+                ->buildSql();
+
+            $all_user = Db::name('user_role')
+                ->alias('ur')
+                ->where('ur.roleid IN '.$all_uid_name)
+                ->leftJoin('depart_user du','du.uid = ur.uid AND du.is_del=0')
+                ->column('ur.uid,du.nickName');
+
+            $insert_good_exam_data = $insert_order_msg_data = [];
             foreach ($skuCodeS as $skuCode => $value) {
                 $insert_good_exam_data[] = [
                     'code' => $skuCode,
@@ -2723,36 +2763,24 @@ class Goodup extends Base
                     "order_id" => $good_offline_log_id,
                     "order_status" => 8, "before_status" => 6
                 ]);
+
+                foreach ($all_user as $itemitem) {
+                    $insert_order_msg_data[] = [
+                        'content' => '商品下线:' . $skuCode . '由' . $creater . '操作下线',
+                        'orderCode' => $skuCode,
+                        'order_type' => 'GOL',
+                        'uid' => $itemitem['uid'],
+                        'uname' => $itemitem['nickName'],
+                        'is_read' => 0,
+                        'addtime' => date('Y-m-d H:i:s'),
+                        'updatetime' => date('Y-m-d H:i:s'),
+                    ];
+                }
             }
 
             //变动记录
             Db::name("good_exam")->insertAll($insert_good_exam_data);
 
-            //根据权限查询应该接收商品下线通知的人员
-            $all_uid_name = Db::name('role_action')
-                ->whereFindInSet('action_conllect','877')//数据写死的，要注意各个环境数据是否一致
-                ->field('role_id')
-                ->buildSql();
-
-            $all_user = Db::name('user_role')
-                ->alias('ur')
-                ->where('ur.roleid IN '.$all_uid_name)
-                ->leftJoin('depart_user du','du.uid = ur.uid AND du.is_del=0')
-                ->column('ur.uid,du.nickName');
-
-            $insert_order_msg_data=[];
-            foreach ($all_user as $itemitem) {
-                $insert_order_msg_data[] = [
-                    'content' => '商品下线:' . $param['spuCode'] . '由' . $creater . '操作下线',
-                    'orderCode' => $param['spuCode'],
-                    'order_type' => 'GOL',
-                    'uid' => $itemitem['uid'],
-                    'uname' => $itemitem['nickName'],
-                    'is_read' => 0,
-                    'addtime' => date('Y-m-d H:i:s'),
-                    'updatetime' => date('Y-m-d H:i:s'),
-                ];
-            }
             //消息表
             Db::name('order_msg')->insertAll($insert_order_msg_data);