Merge branch 'master' into minus

app-ghs/controllers/OrderController.php

@@ -800,14 +800,10 @@ class OrderController extends BaseController
                 $cg->codePay = 1;
                 $cg->payOpenId = $openId;
                 $cg->aliUserId = $aliUserId;
-                //自取订单
-                $cg->getType = PurchaseClass::GET_TYPE_SELF_GET;
                 $cg->save();
 
                 $order->onlinePay = dict::getDict('onlinePay', 'yes');
                 $order->codePay = 1;
-                //自取订单
-                $order->sendType = OrderClass::SEND_TYPE_NO;
                 $order->save();
 
                 $attach = '';

biz-ghs/order/classes/OrderClass.php

@@ -71,13 +71,13 @@ class OrderClass extends BaseClass
     const SEND_TYPE_THIRD_SEND = 2;
 
 
-    //未确认
+    //未确认，这里的数值是错的，请参考dict.php的数值
     const SEND_TYPE_UNKNOWN = 1;
-    //自取
+    //自取，这里的数值是错的，请参考dict.php的数值
     const SEND_TYPE_NO = 2;
-    //自己送
+    //自己送，这里的数值是错的，请参考dict.php的数值
     const SEND_TYPE_MYSELF = 3;
-    //快递送
+    //快递送，这里的数值是错的，请参考dict.php的数值
     const SEND_TYPE_THIRD = 4;
 
     public static $sendTypeMap = [
@@ -1743,9 +1743,9 @@ class OrderClass extends BaseClass
     {
 
         if (getenv('YII_ENV') == 'production') {
-            //丽子鲜花，客户线上下单，小票上不显示价格
-            if (isset($orderInfo->shopId) && $orderInfo->shopId == 1527) {
-                if (isset($orderInfo->customShopAdminId) && !empty($orderInfo->customShopAdminId)) {
+            //淮北花语集、丽子鲜花，客户线上下单不显示价格，门店开单显示价格
+            if ($orderInfo->shopId == 1527 || $orderInfo->mainId == 52291) {
+                if (!empty($orderInfo->customShopAdminId)) {
                     $showPrice = 0;
                 }
             }
@@ -1756,7 +1756,7 @@ class OrderClass extends BaseClass
 
             //北京花篮子，线上下单，不显示价格
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 10735) {
-                if (isset($orderInfo->customShopAdminId) && !empty($orderInfo->customShopAdminId)) {
+                if (!empty($orderInfo->customShopAdminId)) {
                     $showPrice = 0;
                 }
             }
@@ -1764,10 +1764,6 @@ class OrderClass extends BaseClass
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 16293) {
                 $showPrice = 0;
             }
-            //淮北花语集小票不带价格
-            if (isset($orderInfo->mainId) && $orderInfo->mainId == 52291) {
-                $showPrice = 0;
-            }
         } else {
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 644) {
                 //$showPrice = 0;

biz-hd/purchase/classes/PurchaseClass.php

@@ -58,9 +58,9 @@ class PurchaseClass extends BaseClass
     //没有欠款
     const DEBT_NO = 2;
 
-    //配送
+    //配送，这里的数值是错的，请参考dict.php的数值
     const GET_TYPE_SEND = 1;
-    //自取
+    //自取，这里的数值是错的，请参考dict.php的数值
     const GET_TYPE_SELF_GET = 2;
 
     const REFUND_NO = 1;