shish 1 жил өмнө
parent
commit
15e616bae4

+ 8 - 8
biz-ghs/order/classes/OrderClass.php

@@ -355,7 +355,7 @@ class OrderClass extends BaseClass
         util::success(['file' => $fileUrl, 'shortFile' => $file]);
     }
 
-    public static function confirmReach($order,$params=[])
+    public static function confirmReach($order, $params = [])
     {
         $cgId = $order->purchaseId ?? 0;
         $cg = PurchaseClass::getById($cgId, true);
@@ -385,9 +385,9 @@ class OrderClass extends BaseClass
         }
         //订单如果没有发货则先发货
         if ($order->status == 2) {
-            $staffId = $params['staffId']??0;
-            $staffName = $params['staffName']??'';
-            $element = ['staffId'=>$staffId,'staffName'=>$staffName];
+            $staffId = $params['staffId'] ?? 0;
+            $staffName = $params['staffName'] ?? '';
+            $element = ['staffId' => $staffId, 'staffName' => $staffName];
             self::orderSend($order, $element, true);
             $cg = PurchaseClass::getById($cgId, true);
         }
@@ -435,8 +435,8 @@ class OrderClass extends BaseClass
         $order->fhType = $fhType;
         $order->status = 3;
         $order->fhTime = date("Y-m-d H:i:s");
-        $staffId = $params['staffId']??0;
-        $staffName = $params['staffName']??'';
+        $staffId = $params['staffId'] ?? 0;
+        $staffName = $params['staffName'] ?? '';
         $order->sendStaffId = $staffId;
         $order->sendStaffName = $staffName;
         $order->save();
@@ -1880,8 +1880,8 @@ class OrderClass extends BaseClass
         $content .= "<BR>";
 
         if (getenv('YII_ENV') == 'production') {
-            //丽子鲜花、花样年华 不显示扫码买花
-            if (!in_array($orderInfo->shopId, [1527, 1585, 1596, 16454])) {
+            //丽子鲜花、花样年华、镜中花卉不显示扫码买花
+            if (!in_array($orderInfo->shopId, [1527, 1585, 1596, 16454, 33668])) {
                 //勇记、国恋、花悠星零售开单不需要打印扫码买花
                 if ($customId != 12145 || $customId != 12487 || $customId != 12281) {
                     $content .= "<BR>";