Merge branch 'master' into zhongqi-delivery

app-ghs/controllers/ConsoleController.php

@@ -167,7 +167,7 @@ class ConsoleController extends BaseController
             }
         }
 
-        $notice[] = ['title' => '不要将小石联系电话给零售花店，给了我们直接拒绝服务，并将此花店列入黑名单。', 'action' => '', 'page' => ''];
+        //$notice[] = ['title' => '不要将小石联系电话给零售花店，给了我们直接拒绝服务，并将此花店列入黑名单。', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '快速设置：客户下单自动计算跑腿费', 'action' => '查看', 'page' => '/admin/book/detail?id=auto_calc_pt_fee'];
         //$notice[] = ['title' => '订单上如何一键呼叫跑腿', 'action' => '查看', 'page' => '/admin/book/detail?id=one_call_pt'];
 

app-ghs/controllers/TestController.php

@@ -428,6 +428,7 @@ class TestController extends BaseController
             //['name' => '晋江花多多鲜花', 'merchantNo' => '8223970599200EW', 'wx' => [825459643, 825460214], 'zfb' => '2088080677754761'],
             //['name' => '昆明源花汇鲜花', 'merchantNo' => '8227310599200VZ', 'wx' => [826321533, 826321247], 'zfb' => '2088080751421086'],
             //['name' => '厦门厦茗绿植批发', 'merchantNo' => '8223930599200GK', 'wx' => [826594015, 826593264], 'zfb' => '2088080774924483'],
+            ['name' => '珠海淘花里', 'merchantNo' => '82258505992007T', 'wx' => [831476540, 831477416], 'zfb' => '2088180135238924'],
             ['name' => '惠州美天鲜花水口店', 'merchantNo' => '8225950599200CY', 'wx' => [827536311, 827535872], 'zfb' => '2088080848565460'],
             ['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],

biz-ghs/order/classes/OrderClass.php

@@ -2942,10 +2942,10 @@ XL;
             if (empty($shortName)) {
                 util::fail('客户短名没有设置');
             }
-            $p->times = 2;
+            $p->times = 1;
             $content = '<TEXT x="420" y="130" font="12" w="4" h="4" r="90">' . $shortName . '</TEXT>';
             $content .= '<TEXT x="395" y="10" font="12" w="2" h="2" r="90">地址</TEXT>';
-            $content .= '<TEXT x="290" y="130" font="12" w="4" h="4" r="90">' . $shortMobile . '</TEXT>';
+            $content .= '<TEXT x="290" y="130" font="12" w="3" h="3" r="90">' . $customMobile . '</TEXT>';
             $content .= '<TEXT x="265" y="10" font="12" w="2" h="2" r="90">代码</TEXT>';
             $content .= '<TEXT x="170" y="130" font="12" w="4" h="4" r="90">' . $shortRemark . '</TEXT>';
             $content .= '<TEXT x="150" y="10" font="12" w="2" h="2" r="90">物流</TEXT>';