Merge branch 'master' of git.huaml.com:zhh/huahuibao

biz-ghs/order/classes/OrderClass.php

@@ -2047,7 +2047,7 @@ class OrderClass extends BaseClass
 
         if (getenv('YII_ENV') == 'production') {
             //丽子鲜花、花样年华、镜中花卉、满天星、世纪花、盛丰、福清辉煌、美阁都不显示扫码买花
-            if (!in_array($orderInfo->shopId, [1527, 1585, 1596, 16454, 33668, 38492, 36596, 35389, 38322, 43274, 40312, 44556, 42946, 51758, 8391, 65591])) {
+            if (!in_array($orderInfo->shopId, [1527, 1585, 1596, 16454, 33668, 38492, 36596, 35389, 38322, 43274, 40312, 44556, 42946, 51758, 8391, 65591, 8596])) {
                 //勇记、国恋、花悠星零售开单不需要打印扫码买花
                 if ($customId != 12145 || $customId != 12487 || $customId != 12281) {
                     $content .= "<BR>";