Merge branch 'master' into zhongqi-delivery

app-ghs/controllers/ConsoleController.php

@@ -165,7 +165,8 @@ class ConsoleController extends BaseController
             }
         }
 
-        //$notice[] = ['title' => '不要将小石联系电话给零售花店，给了我们直接拒绝服务，并将此花店列入黑名单。', 'action' => '', 'page' => ''];
+        //$notice[] = ['title' => '新功能：支持绑定多家跑腿和设置免费配送', 'action' => '', 'page' => '/admin/book/detail?id=bd_pt_set'];
+        //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
         //$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

@@ -445,8 +445,10 @@ class TestController extends BaseController
             //['name' => '珠海淘花里', 'merchantNo' => '82258505992007T', 'wx' => [831476540, 831477416], 'zfb' => '2088180135238924'],
             //['name' => '龙岩花掌柜', 'merchantNo' => '82240505992005D', 'wx' => [832139093, 832139074], 'zfb' => '2088180163717015'],
             //['name' => '南康花好月圆鲜花', 'merchantNo' => '82242805992006Q', 'wx' => [833569101, 833568059], 'zfb' => '2088180225875325'],
-            ['name' => '广州淘花里鲜花番禺店', 'merchantNo' => '8225810599201KK', 'wx' => [839549272, 839549522], 'zfb' => '2088180471191493'],
-            ['name' => '惠州美天鲜花水口店', 'merchantNo' => '8225950599200CY', 'wx' => [827536311, 827535872], 'zfb' => '2088080848565460'],
+            //['name' => '广州淘花里鲜花番禺店', 'merchantNo' => '8225810599201KK', 'wx' => [839549272, 839549522], 'zfb' => '2088180471191493'],
+            //['name' => '惠州美天鲜花水口店', 'merchantNo' => '8225950599200CY', 'wx' => [827536311, 827535872], 'zfb' => '2088080848565460'],
+            //['name' => '宿州万花城鲜花', 'merchantNo' => '82237405992003F', 'wx' => [840725899, 840726149], 'zfb' => '2088180514587023'],
+            //['name' => '蚌埠云采鲜花批发', 'merchantNo' => '82236305992003R', 'wx' => [840974082, 840973879], 'zfb' => '2088180525938209'],
             ['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],
             //['name' => '东莞惠雅鲜花（南城店）', 'merchantNo' => '8226020599200JK', 'wx' => [802315656, 802315755], 'zfb' => '2088870583889365'],

app-hd/controllers/OrderController.php

@@ -222,11 +222,12 @@ class OrderController extends BaseController
     //确认取货
     public function actionFetch()
     {
-        //解决重复提交
-        util::checkRepeatCommit($this->adminId, 5);
-
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
+
+        //解决重复提交
+        util::checkRepeatCommit($id . '_' . $this->adminId, 5);
+
         $order = OrderClass::getById($id, true);
         if (empty($order)) {
             util::fail('没有找到订单');

app-hd/controllers/WorkController.php

@@ -11,6 +11,7 @@ use bizHd\work\classes\WorkItemClass;
 use common\components\dict;
 use common\components\imgUtil;
 use common\components\mtUtil;
+use common\components\noticeUtil;
 use common\components\orderSn;
 use common\components\util;
 use Shishaoqi\MeituanFlashPurchase\Application;
@@ -288,7 +289,7 @@ class WorkController extends BaseController
 
             //美团的暂时不打小票
             if ($work->fromType != 4) {
-                WorkClass::print($work, $this->shop, false);
+                WorkClass::print($work, $this->shop, true);
             }
 
             $msg = '已完成';

app-pt/views/main/app.php

@@ -236,8 +236,8 @@
             }
             // 这里可以根据appType跳转到对应的下载链接
             const downloadUrls = {
-                'xiaohuabao': 'https://api.shop.hzghd.com/1263.apk', // 销花宝APP下载链接
-                'huazhanggui': 'https://api.shop.hzghd.com/215.apk', // 花掌柜APP下载链接
+                'xiaohuabao': 'https://api.shop.hzghd.com/1266.apk', // 销花宝APP下载链接
+                'huazhanggui': 'https://api.shop.hzghd.com/217.apk', // 花掌柜APP下载链接
                 'huazhanggui_cashier': 'https://api.shop.hzghd.com/186.apk', // 花掌柜收银下载链接
                 'xiaohuabao_cashier': 'https://api.shop.hzghd.com/148.apk' // 销花宝收银下载链接
             };

common/components/book.php

@@ -30,8 +30,8 @@ class book
             ['title' => '零售开单，拆散登记', 'id' => 'skOrder'],
             ['title' => '用标签机，打标签和价码', 'id' => 'label'],
             ['title' => '大客户价的管理', 'id' => 'super_member'],
-            ['title' => '客户下单自动计算跑腿费', 'id' => 'auto_calc_pt_fee'],
-            ['title' => '订单上一键呼叫腿费', 'id' => 'one_call_pt'],
+            ['title' => '绑定多家跑腿和免配送设置', 'id' => 'bd_pt_set', 'style' => 'red'],
+            ['title' => '前台后台使用跑腿', 'id' => 'use_pt', 'style' => 'red'],
         ]],
         ['class' => '采购', 'icon' => '/book/stock.png', 'list' => [
             ['title' => '采购入库和改价格（重要）', 'id' => 'cg', 'style' => 'red'],
@@ -227,12 +227,11 @@ class book
         'label' => [
             ['style' => 'video', 'value' => 'jc/44labelPrint.mp4'],
         ],
-        'one_call_pt' => [
-            ['style' => 'video', 'value' => 'jc/one_call_pt.mp4'],
-            ['style' => 'miniTitle', 'value' => '充值的钱没有用完，可以申请退款。',],
+        'use_pt' => [
+            ['style' => 'video', 'value' => 'jc/use_pt.mp4'],
         ],
-        'auto_calc_pt_fee' => [
-            ['style' => 'video', 'value' => 'jc/auto_calc_pt_fee.mp4'],
+        'bd_pt_set' => [
+            ['style' => 'video', 'value' => 'jc/bd_pt_set.mp4'],
         ],
         'super_member' => [
             ['style' => 'video', 'value' => 'jc/super_member.mp4'],

console/controllers/ItemController.php

@@ -36,6 +36,88 @@ class ItemController extends Controller
 
     public $sjId, $shopId, $sj;
 
+    //复制迁移花材 ssh 20251210
+    public function actionMigrate()
+    {
+        if (getenv('YII_ENV') == 'production') {
+            $newMainId = 79781;
+            $oldMainId = 44624;
+        } else {
+            $newMainId = 762;
+            $oldMainId = 644;
+            util::stop('测试环境未开通');
+        }
+        $list = ItemClass::getAllByCondition(['mainId' => $newMainId], null, '*');
+        if (!empty($list)) {
+            echo '已经有花材了';
+            exit();
+        }
+        $classList = ItemClassClass::getAllByCondition(['mainId' => $oldMainId], null, '*', null, true);
+        if (empty($classList)) {
+            echo '没有找到老店的分类';
+            exit();
+        }
+        $connection = Yii::$app->db;
+        $transaction = $connection->beginTransaction();
+        try {
+            foreach ($classList as $class) {
+                $oldId = $class->id ?? 0;
+                $cover = $class->cover ?? '';
+                $name = $class->name ?? '';
+                $inTurn = $class->inTurn ?? 0;
+                $isDefault = $class->isDefault ?? 0;
+                $newClass = [
+                    'mainId' => $newMainId,
+                    'cover' => $cover,
+                    'name' => $name,
+                    'inTurn' => $inTurn,
+                    'isDefault' => $isDefault,
+                ];
+                $newRespond = ItemClassClass::add($newClass, true);
+                $newClassId = $newRespond->id ?? 0;
+                $oldItemList = ItemClass::getAllByCondition(['classId' => $oldId, 'delStatus' => 0], null, '*');
+                foreach ($oldItemList as $oldItem) {
+                    $oldItemId = $oldItem['id'];
+                    unset($oldItem['id']);
+                    $oldItem['classId'] = $newClassId;
+                    $oldItem['stock'] = 0;
+                    $oldItem['status'] = 2;
+                    $oldItem['mainId'] = $newMainId;
+                    $oldItem['sjId'] = 0;
+                    $oldItem['shopId'] = 0;
+                    $new = ItemClass::add($oldItem, true);
+
+                    if (isset($oldItem['variety']) && $oldItem['variety'] == 1) {
+                        $xjList = XjClass::getAllByCondition(['itemId' => $oldItemId], null, '*');
+                        if (!empty($xjList)) {
+                            foreach ($xjList as $oneXj) {
+                                unset($oneXj['id']);
+                                unset($oneXj['sjId']);
+                                unset($oneXj['shopId']);
+                                unset($oneXj['mainId']);
+                                unset($oneXj['itemId']);
+                                unset($oneXj['ptItemId']);
+                                unset($oneXj['addTime']);
+                                unset($oneXj['updateTime']);
+                                $oneXj['mainId'] = $newMainId;
+                                $oneXj['itemId'] = $new->id ?? 0;
+                                $oneXj['ptItemId'] = $new->itemId ?? 0;
+                                XjClass::add($oneXj);
+                            }
+                        }
+                    }
+
+                }
+            }
+            $transaction->commit();
+        } catch (\Exception $e) {
+            $transaction->rollBack();
+            $msg = $e->getMessage();
+            echo "报错了：" . $msg;
+        }
+    }
+
+
     public function actionCQ()
     {
         $itemList = ItemClass::getAllByCondition(['mainId' => 14128], null, '*', null, true);
@@ -256,87 +338,6 @@ class ItemController extends Controller
         }
     }
 
-    //复制迁移花材 ssh 20251119
-    public function actionMigrate()
-    {
-        if (getenv('YII_ENV') == 'production') {
-            $newMainId = 44624;
-            $oldMainId = 16948;
-        } else {
-            //$newMainId = 762;
-            //$oldMainId = 644;
-            util::stop('测试环境未开通');
-        }
-        $list = ItemClass::getAllByCondition(['mainId' => $newMainId], null, '*');
-        if (!empty($list)) {
-            echo '已经有花材了';
-            exit();
-        }
-        $classList = ItemClassClass::getAllByCondition(['mainId' => $oldMainId], null, '*', null, true);
-        if (empty($classList)) {
-            echo '没有找到天天鲜花的分类';
-            exit();
-        }
-        $connection = Yii::$app->db;
-        $transaction = $connection->beginTransaction();
-        try {
-            foreach ($classList as $class) {
-                $oldId = $class->id ?? 0;
-                $cover = $class->cover ?? '';
-                $name = $class->name ?? '';
-                $inTurn = $class->inTurn ?? 0;
-                $isDefault = $class->isDefault ?? 0;
-                $newClass = [
-                    'mainId' => $newMainId,
-                    'cover' => $cover,
-                    'name' => $name,
-                    'inTurn' => $inTurn,
-                    'isDefault' => $isDefault,
-                ];
-                $newRespond = ItemClassClass::add($newClass, true);
-                $newClassId = $newRespond->id ?? 0;
-                $oldItemList = ItemClass::getAllByCondition(['classId' => $oldId, 'delStatus' => 0], null, '*');
-                foreach ($oldItemList as $oldItem) {
-                    $oldItemId = $oldItem['id'];
-                    unset($oldItem['id']);
-                    $oldItem['classId'] = $newClassId;
-                    $oldItem['stock'] = 0;
-                    $oldItem['status'] = 2;
-                    $oldItem['mainId'] = $newMainId;
-                    $oldItem['sjId'] = 0;
-                    $oldItem['shopId'] = 0;
-                    $new = ItemClass::add($oldItem, true);
-
-                    if (isset($oldItem['variety']) && $oldItem['variety'] == 1) {
-                        $xjList = XjClass::getAllByCondition(['itemId' => $oldItemId], null, '*');
-                        if (!empty($xjList)) {
-                            foreach ($xjList as $oneXj) {
-                                unset($oneXj['id']);
-                                unset($oneXj['sjId']);
-                                unset($oneXj['shopId']);
-                                unset($oneXj['mainId']);
-                                unset($oneXj['itemId']);
-                                unset($oneXj['ptItemId']);
-                                unset($oneXj['addTime']);
-                                unset($oneXj['updateTime']);
-                                $oneXj['mainId'] = $newMainId;
-                                $oneXj['itemId'] = $new->id ?? 0;
-                                $oneXj['ptItemId'] = $new->itemId ?? 0;
-                                XjClass::add($oneXj);
-                            }
-                        }
-                    }
-
-                }
-            }
-            $transaction->commit();
-        } catch (\Exception $e) {
-            $transaction->rollBack();
-            $msg = $e->getMessage();
-            echo "报错了：" . $msg;
-        }
-    }
-
     //花材反向更新 ./yii item/reverse-update
     public function actionReverseUpdate()
     {

console/controllers/TestController.php

@@ -25,6 +25,7 @@ use bizHd\purchase\classes\PurchaseClass;
 use bizHd\purchase\models\Purchase;
 use common\components\stringUtil;
 use common\components\util;
+use mysql_xdevapi\ExecutionStatus;
 use Yii;
 use yii\console\Controller;
 
@@ -34,6 +35,21 @@ class TestController extends Controller
     public function actionSendStatus()
     {
 
+        ini_set('memory_limit', '2045M');
+        set_time_limit(0);
+        $query = new \yii\db\Query();
+        $query->select(['id', 'sendStatus']);
+        $query->from(Purchase::tableName());
+        $totalCount = 0;
+        foreach ($query->batch(3000) as $batch) {
+            $ids = array_column($batch, 'id');
+            PurchaseClass::updateByIds($ids, ['sendStatus' => -4]);
+            $totalCount += count($ids);
+            echo "已处理 " . $totalCount . " 条记录\n";
+        }
+        echo "全部完成！共处理 " . $totalCount . " 条记录\n";
+        util::stop('');
+
         ini_set('memory_limit', '2045M');
         set_time_limit(0);
         $query = new \yii\db\Query();
@@ -45,7 +61,7 @@ class TestController extends Controller
             \bizGhs\order\classes\OrderClass::updateByIds($ids, ['sendStatus' => -4]);
             $totalCount += count($ids);
             echo "已处理 " . $totalCount . " 条记录\n";
-            }
+        }
         echo "全部完成！共处理 " . $totalCount . " 条记录\n";
     }