Merge branch 'master' into dev

app-ghs/controllers/TestController.php

@@ -456,7 +456,9 @@ class TestController extends BaseController
             //['name' => '广州翰林花卉', 'merchantNo' => '8225810599201LR', 'wx' => [850644821, 850644094], 'zfb' => '2088280085826650'],
             //['name' => '昆明宅小鲜', 'merchantNo' => '8223910599200PL', 'wx' => [852957278, 852958031], 'zfb' => '2088280271476229'],
             //['name' => '昆明小向花卉批发', 'merchantNo' => '8227310599200Z2', 'wx' => [857900016, 857899180], 'zfb' => '2088280559651366'],
-            ['name' => '昆明小玖花卉批发', 'merchantNo' => '8227310599200Z3', 'wx' => [858815386, 858815193], 'zfb' => '2088280613495934'],
+            //['name' => '昆明小玖花卉批发', 'merchantNo' => '8227310599200Z3', 'wx' => [858815386, 858815193], 'zfb' => '2088280613495934'],
+            //['name' => '广州勇记鲜花', 'merchantNo' => '8225810599201NY', 'wx' => [865933677, 865933966], 'zfb' => '2088380356697908'],
+            ['name' => '永城花语鲜花批发', 'merchantNo' => '82250605992008U', 'wx' => [866677786, 866678419], 'zfb' => '2088380428301720'],
             //['name' => '厦门都市鲜花批发', 'merchantNo' => '8223930599200HZ', 'wx' => [854245016, 854244735], 'zfb' => '2088280333454097'],
             //['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],

app-hd/controllers/PurchaseController.php

@@ -639,7 +639,7 @@ class PurchaseController extends BaseController
                     if ($ghsShopId == 77703) {
                         //天天鲜花思明店，暂时关闭送货上门
                         if($respond->sendType == 0){
-                            util::fail('节日暂停送货上门，请选到店自取');
+                            //util::fail('节日暂停送货上门，请选到店自取');
                         }
                     }
 

biz-ghs/order/classes/OrderClass.php

@@ -1482,8 +1482,9 @@ class OrderClass extends BaseClass
     {
         //58mm的机器,一行打印16个汉字,32个字母
         $productPrice = $current['price'] ?? '';
+        $unitPrice = $current['unitPrice'] ?? '';
         $name = $current['name'] ?? '';
-        if (floatval($productPrice) == 0.01) {
+        if (floatval($unitPrice) == 0.01) {
             $name = $name . '(送)';
         }
         $productNum = $current['num'] ?? '';
@@ -1505,7 +1506,11 @@ class OrderClass extends BaseClass
             $content .= '(买' . $itemNum . $unitName . ' 退' . $refundNum . $unitName . ')<BR>';
         }
         if ($showPrice == 1) {
-            $content .= $productNum . ' = ' . $productPrice . '元<BR>';
+            if (floatval($unitPrice) == 0.01) {
+                $content .= $productNum . ' = ' . $productPrice . '元（赠送价）<BR>';
+            }else{
+                $content .= $productNum . ' = ' . $productPrice . '元<BR>';
+            }
         }
         $content .= '--------------------------------<BR>';
         return $content;
@@ -2120,6 +2125,7 @@ class OrderClass extends BaseClass
                         'num' => floatval($bigNum) . $xhUnitName . ' * ' . floatval($bigUnitPrice) . '元',
                         'count' => floatval($bigNum) . $xhUnitName,
                         'price' => floatval($bigTotalPrice),
+                        'unitPrice'=>floatval($bigUnitPrice),
                         'refundNum' => $refundNum,
                         'unitName' => $xhUnitName,
                         'itemNum' => $bigNum,
@@ -2133,6 +2139,7 @@ class OrderClass extends BaseClass
                         'num' => floatval($smallNum) . '支 * ' . floatval($smallUnitPrice) . '元',
                         'count' => floatval($smallNum) . '支',
                         'price' => floatval($smallTotalPrice),
+                        'unitPrice'=>floatval($smallUnitPrice),
                         'refundNum' => $refundNum,
                         'unitName' => '支',
                         'itemNum' => $smallNum,
@@ -2145,6 +2152,7 @@ class OrderClass extends BaseClass
                         'num' => floatval($giveNum) . $xhUnitName . ' * 0元',
                         'count' => floatval($giveNum) . $xhUnitName,
                         'price' => 0,
+                        'unitPrice'=>0,
                         'unitName' => $xhUnitName,
                         'itemNum' => $giveNum,
                         'remark' => $remark,

common/components/book.php

@@ -100,7 +100,7 @@ class book
             ['style' => 'info', 'value' => '根据你自身门店情况，选择以下套餐。下面列出的套餐，已经过全国200家鲜花批发店和11万家花店磨合使用，非常成熟好用，请放心购买使用，以下套餐已含第一年年费。',],
             ['style' => 'miniTitle', 'value' => '软件的研发成本巨大，不管是年费、费率和套餐，都已经底价，已无商谈的空间，请理解。付费后不支持退货。',],
             ['style' => 'miniTitle', 'value' => '以下硬件请通过我们来购买，公司统一跟厂家采购，售后各方面比较有保障。自行采购的，使用和售后有问题的，需自行解决。',],
-            ['style' => 'info', 'value' => '小票机和标签机，使用的是飞鹅4G带切刀版本，比较好维护，里面带电话卡的，第二年开始，每年要充60块话费。请不要贪便宜使用wifi版，公司将拒绝提供技术支持，因为很容易出问题，维护成本很高。',],
+            ['style' => 'info', 'value' => '小票机和标签机，使用的是飞鹅4G带切刀版本，比较好维护，里面带流量卡的，第二年开始，每年要充60块话费。请不要贪便宜使用wifi版，公司将拒绝提供技术支持，因为很容易出问题，维护成本很高。',],
             ['style' => 'info', 'value' => '提供上门培训服务，培训时间3天，需报销差旅住宿费用，公司地址在福建厦门。',],
             ['style' => 'smallTitle', 'value' => '仓库版',],
             ['style' => 'info', 'value' => '整套软件功能（一年）',],