发货

app-ghs/controllers/OrderController.php

@@ -722,13 +722,18 @@ class OrderController extends BaseController
     //订单列表 ssh 2021.1.20
     public function actionList()
     {
+        $get = Yii::$app->request->get();
+        $export = $get['export'] ?? 0;
+        $onlySend = $get['onlySend'] ?? 0;
+
         $staff = $this->shopAdmin;
         if (isset($staff->identity) && $staff->identity == 2) {
-            util::success(['list' => []]);
+            //如果用于确认发货时要显出订单
+            if($onlySend == 0){
+                util::success(['list' => []]);
+            }
         }
 
-        $get = Yii::$app->request->get();
-        $export = $get['export'] ?? 0;
         $where['mainId'] = $this->mainId;
         $status = $get['status'] ?? 0;
         if (!empty($status)) {
@@ -2403,7 +2408,7 @@ class OrderController extends BaseController
             'totalFreight' => $totalFreight,
             'totalTkPrice' => $totalTkPrice,
             //增加项
-            'totalOnlyTkPrice'=>$totalOnlyTkPrice,
+            'totalOnlyTkPrice' => $totalOnlyTkPrice,
         ]);
     }
 

app-ghs/controllers/TestController.php

@@ -649,16 +649,6 @@ class TestController extends BaseController
         $response = $laResource->query($queryParams, 1);
         echo "<pre>";
         print_r($response);
-
-        $data = $response['resp_data']??[];
-
-        $payWay = 1;
-        $orderSn = $data['out_trade_no'] ?? '';
-        $total_amount = $data['total_amount'] ?? 0;
-        $totalFee = $total_amount / 100;
-        $attach = '';
-        $transactionId = $data['trade_no'] ?? 0;
-        PurchaseClearClass::thirdPay($payWay, $orderSn, $totalFee, $attach, $transactionId);
     }
 
     //零售订单查询 ssh 20231031