通知

biz/notice/classes/NoticeClass.php

@@ -4,6 +4,7 @@ namespace biz\notice\classes;
 
 use biz\base\classes\BaseClass;
 use biz\shop\classes\ShopAdminClass;
+use biz\shop\classes\ShopClass;
 use common\components\pushNotice;
 use Yii;
 
@@ -55,11 +56,15 @@ class NoticeClass extends BaseClass
     //新客户通知 ssh 20210115
     public static function newCustomNotice($shop, $custom)
     {
-        $shopId = $shop['id'] ?? 0;
         $ptStyle = $shop['ptStyle'] ?? 1;
         $name = $custom['name'] ?? '';
         Yii::$app->params['ptStyle'] = $ptStyle;
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $id = $shop['id'] ?? 0;
+        $newShop = ShopClass::getById($id, true);
+        if (empty($newShop)) {
+            return false;
+        }
+        $adminList = ShopAdminClass::getRemainAdmin($newShop);
         if (empty($adminList)) {
             return false;
         }

biz/shop/classes/ShopAdminClass.php

@@ -224,14 +224,10 @@ class ShopAdminClass extends BaseClass
     }
 
     //获取需要通知的员工 ssh 20210529
-    public static function getRemainAdmin($shopId)
+    public static function getRemainAdmin($shop)
     {
-        $where = [
-            'shopId' => $shopId,
-            'status' => 1,
-            'delStatus' => 0,
-            'remind' => 1
-        ];
+        $mainId = $shop->mainId ?? 0;
+        $where = ['mainId' => $mainId, 'status' => 1, 'delStatus' => 0, 'remind' => 1];
         $shopAdmin = self::getAllByCondition($where, null, 'adminId');
         if (empty($shopAdmin)) {
             return [];

biz/wx/classes/WxMessageClass.php

@@ -118,7 +118,6 @@ class WxMessageClass extends BaseClass
     //供应商新订单通知 ssh 20210529
     public static function newOrderInform($shop, $order)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -136,7 +135,7 @@ class WxMessageClass extends BaseClass
         if (!empty($customName)) {
             $first = '下单客户：' . $customName;
         }
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -166,7 +165,6 @@ class WxMessageClass extends BaseClass
     //花店新订单通知 ssh 20210529
     public static function hdNewOrderInform($shop, $order)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -178,7 +176,7 @@ class WxMessageClass extends BaseClass
         }
         $orderId = $order->id;
         $actPrice = $order->actPrice;
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -208,7 +206,6 @@ class WxMessageClass extends BaseClass
     //审核通过通知 ssh 20210530
     public static function applyPass($shop)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -218,7 +215,7 @@ class WxMessageClass extends BaseClass
         if (empty($tempId)) {
             return false;
         }
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -259,7 +256,6 @@ class WxMessageClass extends BaseClass
     //采购单下单成功 ssh 20210531
     public static function generateCgOrder($shop, $order)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -272,7 +268,7 @@ class WxMessageClass extends BaseClass
         $orderId = $order->id;
         $orderSn = (string)$order->orderSn;
         $totalFee = $order->actPrice;
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -306,7 +302,6 @@ class WxMessageClass extends BaseClass
     //采购单已发货 ssh 20210531
     public static function cgOrderHasSend($shop, $order)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -318,7 +313,7 @@ class WxMessageClass extends BaseClass
         }
         $orderId = $order->id;
         $orderSn = (string)$order->orderSn;
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -349,7 +344,6 @@ class WxMessageClass extends BaseClass
     //零售清算欠款通知供应商 ssh 20210531
     public static function clearInform($shop, $order, $custom)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -362,7 +356,7 @@ class WxMessageClass extends BaseClass
         $actPrice = $order->actPrice;
         $name = $custom->name ?? '';
         $customId = $custom->id;
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -393,7 +387,6 @@ class WxMessageClass extends BaseClass
     //收款码收入通知 ssh 20210531
     public static function gatheringIncomeInform($shop, $order)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -405,7 +398,7 @@ class WxMessageClass extends BaseClass
         }
         $actPrice = $order->actPrice;
         $orderId = $order->id;
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -437,7 +430,6 @@ class WxMessageClass extends BaseClass
     //提现成功通知 ssh 20210531
     public static function cashInform($shop, $cash)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -448,7 +440,7 @@ class WxMessageClass extends BaseClass
             return false;
         }
         $amount = $cash->amount;
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -478,7 +470,6 @@ class WxMessageClass extends BaseClass
     //订单送达通知 ssh 20210607
     public static function reachInform($shop, $order)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -491,7 +482,7 @@ class WxMessageClass extends BaseClass
         $orderId = $order->id ?? '';
         $orderSn = (string)$order->orderSn ?? '';
         $customName = $order->customName ?? '';
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -522,7 +513,6 @@ class WxMessageClass extends BaseClass
     //采购退款成功通知 ssh 20210730
     public static function cgRefundInform($shop, $cg, $amount)
     {
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -534,7 +524,7 @@ class WxMessageClass extends BaseClass
         }
         $orderId = $cg->id ?? '';
         $orderSn = (string)$cg->orderSn ?? '';
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -575,7 +565,6 @@ class WxMessageClass extends BaseClass
             $name = $product->name ?? '';
             $remark .= $name . "({$currentStock}) ";
         }
-        $shopId = $shop->id;
         $ptStyle = $shop->ptStyle;
         $wxBase = WxOpenClass::getWxBase();
         $wx = $wxBase[$ptStyle] ?? [];
@@ -587,7 +576,7 @@ class WxMessageClass extends BaseClass
         }
         $shopName = $shop->shopName ?? '';
         $date = date("Y-m-d H:i:s");
-        $adminList = ShopAdminClass::getRemainAdmin($shopId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }