订单

app-ghs/controllers/OrderController.php

@@ -39,6 +39,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? '';
+        $all = $get['all'] ?? 0;
         $order = OrderClass::getById($id, true);
         if (empty($order)) {
             util::fail('没有找到订单');
@@ -52,7 +53,7 @@ class OrderController extends BaseController
         $name = $customName . '_' . $date . '_' . $orderSn;
         $shop = $this->shop;
         $staff = $this->shopAdmin;
-        $respond = OrderClass::createImgOrder($order, $shop, $staff);
+        $respond = OrderClass::createImgOrder($order, $shop, $staff, $all);
         $imgUrl = $respond['imgFile'] ?? '';
         $file = fopen($imgUrl, "rb");
         Header("Content-type:  application/octet-stream ");
@@ -66,19 +67,6 @@ class OrderController extends BaseController
         fclose($file);
     }
 
-    //下载客户当天图片版订单 ssh 20240321
-    public function actionAllDown()
-    {
-        $get = Yii::$app->request->get();
-        $id = $get['id'] ?? '';
-        $order = OrderClass::getById($id, true);
-        if (empty($order)) {
-            util::fail('没有找到订单');
-        }
-        if ($order->mainId != $this->mainId) {
-            util::fail('不是你的订单');
-        }
-    }
 
     //确认送达
     public function actionConfirmReach()

biz-ghs/order/classes/OrderClass.php

@@ -1893,8 +1893,21 @@ class OrderClass extends BaseClass
         Yii::$app->redis->executeCommand('LPUSH', [$newOrderKey, $id]);
     }
 
-    public static function createImgOrder($order, $shop, $staff)
+    public static function createImgOrder($order, $shop, $staff, $all)
     {
+        $sameTimeIds = $order->sameTimeIds;
+        $sameIds = [];
+        if (!empty($sameTimeIds)) {
+            $sameIds = explode(',', $sameTimeIds);
+        }
+        $sameNum = count($sameIds);
+        if ($all == 1 && $sameNum>1) {
+            print_r($sameIds);
+            die;
+        }else{
+
+        }
+
         $staffName = $staff->name ?? '';
         $shopName = $shop->shopName ?? '';
         $sjName = $shop->merchantName ?? '';