Merge branch 'master' into zhongqi-delivery

app-ghs/controllers/OrderController.php

@@ -1223,12 +1223,28 @@ class OrderController extends BaseController
         $priceMap = CustomClass::$levelPriceKeyMap;
         $addPriceMap = CustomClass::$levelAddPriceKeyMap;
         $level = $custom['level'] ?? 1;
-        foreach ($productList as $currentKey => $currentProduct) {
+        foreach ($productList as $currentProduct) {
             $currentPrice = $currentProduct['price'] ?? 0;
             $currentId = $currentProduct['productId'] ?? 0;
             $systemInfo = $itemInfo[$currentId] ?? [];
             $name = $systemInfo['name'] ?? '';
             $systemPrice = ProductClass::getFinalPrice($systemInfo, $level, $priceMap, $addPriceMap);
+
+            if (getenv('YII_ENV') == 'production') {
+                //苏州小蔡鲜花，几个出车，不能低于原价卖，但可以高于原价卖的
+                if (in_array($shopId, [38231, 38143, 29163, 29161])) {
+                    if ($currentPrice < $systemPrice) {
+                        util::fail('不能低于原价卖');
+                    }
+                }
+            } else {
+                if (in_array($shopId, [36544])) {
+                    if ($currentPrice < $systemPrice) {
+                        util::fail('不能低于原价卖');
+                    }
+                }
+            }
+
             if (floatval($currentPrice) != floatval($systemPrice)) {
                 $diff[] = [
                     'name' => $name,
@@ -1311,36 +1327,8 @@ class OrderController extends BaseController
                 $shop = ShopClass::getById($shopId, true);
                 if (isset($order->payStatus) && $order->payStatus == 1) {
                     if (!empty($shop)) {
-/*
-                        //通知员工
-                        $noticeText = json_encode(['orderId' => $saleId]);
-                        $noticeKey = "hdCgNoticeGhs";
-                        Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
-
-                        //通知花店
-                        //$noticeText = json_encode(['id' => $order->purchaseId]);
-                        //$noticeKey = "ghsKdNoticeHd";
-                        //Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
-
-                        Yii::info('向花店App发通知');
-                        //$custom = CustomClass::getById($order->customId);
-                        //$customShop = ShopClass::getById($custom['shopId'], true, 'merchantName, shopName');
-                        //向花店App发通知
-                        $allDevices = \bizHd\device\classes\HdDeviceClass::getAllByCondition(['shopId'=>$custom['shopId']]);
-                        $cids = array_column($allDevices, 'clientId');
-                        $title = '买花成功';
-                        $shopName = $shop->merchantName . ($shop->shopName != '首店' ? '（' . $shop->shopName . '）' : '');
-                        $content = $shopName . ' ¥' . $order->actPrice;
-                        $payload = [
-                            "page" => "pagesPurchase/purDetails",
-                            "params" => ["id" => $order->purchaseId]
-                        ];
-                        $push = new push('hd', push::MSG_TYPE_ORDER);
-                        $push->pushByCloud($cids, $title, $content, $payload);
-*/
                         GhsNotifyClass::newOrderNotify($saleId);
                         HdNotifyClass::newCgNotify($order->purchaseId);
-
                     }
                 }
                 //订单生成时唤起在线打印

biz-ghs/order/classes/OrderClass.php

@@ -822,8 +822,8 @@ class OrderClass extends BaseClass
 
         $data['orderSn'] = $orderSn;
         $data['payStatus'] = self::PAY_STATUS_UN_PAY;
-        $data['customId'] = isset($data['customId']) && !empty($data['customId']) ? $data['customId'] : 0;
-        $live = isset($data['live']) ? $data['live'] : 1;
+        $data['customId'] = !empty($data['customId']) ? $data['customId'] : 0;
+        $live = $data['live'] ?? 1;
         $currentShopId = $data['shopId'] ?? 0;
         $shop = ShopClass::getLockById($currentShopId);
         if (empty($shop)) {
@@ -970,8 +970,8 @@ class OrderClass extends BaseClass
         $main->unPayOrder += 1;
         $main->save();
 
-        //将当天日期+花店每天的总订单数作为编号
-        $data['sendNum'] = date("j") . StatOrderCountClass::addOrder($shop, $main);
+        //将当天日期+花店每天的总订单数作为编号，批发的加个0作为前缀，跟零售的编号这样来区分
+        $data['sendNum'] = '0' . date("j") . StatOrderCountClass::addOrder($shop, $main);
 
         //订单有效期
         $currentTime = time();

biz-hd/order/classes/OrderClass.php

@@ -273,7 +273,7 @@ class OrderClass extends BaseClass
 
         //将花店每月的总订单数作为编号
         $riseNum = StatOrderCountClass::addOrder($shop, $main);
-        $data['sendNum'] = date("d") . $riseNum;
+        $data['sendNum'] = date("j") . $riseNum;
         $data['totalFlow'] = OrderClass::ORDER_TOTAL_FLOW;
         $salt = stringUtil::charsShuffleLowerCase(10);
         $data['salt'] = $salt;

console/controllers/RabbitController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace console\controllers;
+
+use common\components\noticeUtil;
+use yii\console\Controller;
+use Yii;
+
+class RabbitController extends Controller
+{
+
+    //rabbitMQ保持心跳使用
+    public function actionBeat()
+    {
+        //如果不保持心态，MySQL连接会中断，rabbitMQ会报错：SQLSTATE[HY000]: General error: 2006 MySQL server has gone away
+        Yii::$app->db->createCommand('SELECT 1')->execute();// 心跳查询
+    }
+
+}