shish 4 éve
szülő
commit
f04789bcb2

+ 1 - 6
biz/shop/classes/ShopAdminClass.php

@@ -230,7 +230,7 @@ class ShopAdminClass extends BaseClass
     }
 
     //获取需要通知的员工 ssh 20220822
-    public static function getRemainAdmin($shop, $currentStaffId = 0)
+    public static function getRemainAdmin($shop)
     {
         $mainId = $shop->mainId ?? 0;
         $where = ['mainId' => $mainId, 'status' => 1, 'delStatus' => 0, 'remind' => 1];
@@ -238,11 +238,6 @@ class ShopAdminClass extends BaseClass
         if (empty($shopAdmin)) {
             return [];
         }
-        foreach ($shopAdmin as $key => $val) {
-            if (!empty($currentStaffId) && $val['id'] == $currentStaffId) {
-                unset($shopAdmin[$key]);
-            }
-        }
         $ids = array_column($shopAdmin, 'adminId');
         $admin = AdminClass::getByIds($ids);
         return $admin;

+ 2 - 4
biz/wx/classes/WxMessageClass.php

@@ -138,8 +138,7 @@ class WxMessageClass extends BaseClass
         if (!empty($customName)) {
             $first = '下单客户:' . $customName;
         }
-        $currentStaffId = $order->shopAdminId ?? 0;
-        $adminList = ShopAdminClass::getRemainAdmin($shop, $currentStaffId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }
@@ -417,8 +416,7 @@ class WxMessageClass extends BaseClass
         }
         $actPrice = $order->actPrice;
         $orderId = $order->id;
-        $currentStaffId = $order->shopAdminId ?? 0;
-        $adminList = ShopAdminClass::getRemainAdmin($shop, $currentStaffId);
+        $adminList = ShopAdminClass::getRemainAdmin($shop);
         if (empty($adminList)) {
             return false;
         }

+ 12 - 0
common/components/wxUtil.php

@@ -541,6 +541,18 @@ class wxUtil
         return $arr;
     }
 
+    public static function sendTaskInform2($data, $merchant, $isOpen = 0)
+    {
+        $accessToken = self::getAuthorizerAccessToken($merchant, $isOpen);
+        $url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={$accessToken}";
+        $data = urldecode(json_encode($data, JSON_UNESCAPED_UNICODE));
+        $curl = new curl\Curl();
+        $response = $curl->setOption(CURLOPT_POSTFIELDS, $data)->post($url);
+        Yii::info('发送模板消息返回:' . $response);
+        $arr = json_decode($response);
+        return $arr;
+    }
+
     /**
      * 创建模板消息
      */

+ 3 - 28
console/controllers/CgController.php

@@ -6,8 +6,11 @@ use biz\product\classes\ProductClass;
 use biz\product\classes\XjClass;
 use biz\shop\classes\ShopClass;
 use biz\wx\classes\WxMessageClass;
+use biz\wx\classes\WxOpenClass;
 use bizGhs\item\classes\ItemClass;
 use bizGhs\order\classes\PurchaseOrderItemClass;
+use common\components\dict;
+use common\components\wxUtil;
 use yii\console\Controller;
 use Yii;
 
@@ -39,32 +42,4 @@ class CgController extends Controller
         }
     }
 
-    public function actionTz()
-    {
-        $shop = ShopClass::getById(36523, true);
-        $ids = [25836, 25841];
-        $productList = ProductClass::getAllByCondition(['id' => ['in', $ids]], null, '*', null, true);
-        if (!empty($productList)) {
-            WxMessageClass::stockWarningInform($shop, $productList);
-        }
-    }
-
-    public function actionXj()
-    {
-        $list = XjClass::getAllByCondition(['id>' => 0], null, '*', null, true);
-        if (!empty($list)) {
-            foreach ($list as $item) {
-                $ptItemId = $item->ptItemId ?? 0;
-                $mainId = $item->mainId ?? 0;
-                $has = ItemClass::getByCondition(['mainId' => $mainId, 'itemId' => $ptItemId], true);
-                if (!empty($has)) {
-                    $productId = $has->id ?? 0;
-                    $item->itemId = $productId;
-                    $item->save();
-                }
-            }
-        }
-    }
-
-
 }