From 1b742cb74d42cd39ebe836b819d02e765afaaeac Mon Sep 17 00:00:00 2001
From: zyh <zyyhdxg@qq.com>
Date: Wed, 23 Oct 2024 13:44:25 +0800
Subject: [PATCH 1/3] 12

---
 app/store/controller/Goods.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/store/controller/Goods.php b/app/store/controller/Goods.php
index f4e248fa..39cad0d0 100644
--- a/app/store/controller/Goods.php
+++ b/app/store/controller/Goods.php
@@ -683,8 +683,14 @@ class Goods extends Controller
         if(empty($detail)){
             return $this->renderError('暂无线报商品');
         }
+        $model = new GoodsModel();
+        $List = GoodsModel::whereIn("goods_id",$detail['goods_id'])->select();
+        $goodsList = null;
+        foreach ($List as $key => $value) {
 
-        $goodsList = GoodsModel::whereIn("goods_id",$detail['goods_id'])->select();
+            $goodsList[] = $model->getDetail( $value["goods_id"]);
+           
+        }
         return $this->renderSuccess(compact('goodsList'));
     }
 

From e18dba0d29651d3d8a859a4f4bbae79d3ff0d827 Mon Sep 17 00:00:00 2001
From: zyh <zyyhdxg@qq.com>
Date: Thu, 24 Oct 2024 15:22:44 +0800
Subject: [PATCH 2/3] 123

---
 app/store/service/order/Delivery.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/store/service/order/Delivery.php b/app/store/service/order/Delivery.php
index 66f2a93e..860f368e 100644
--- a/app/store/service/order/Delivery.php
+++ b/app/store/service/order/Delivery.php
@@ -50,11 +50,11 @@ class Delivery extends BaseService
      */
     public function delivery(int $orderId, array $param): bool
     {
-        if(empty($param['expressId'])) {
+        if(empty($param['expressId'] && $param['delivery']!=20)) {
             $this->error = '物流公司不能为空';
             return false;
         }
-        if (empty($param['expressNo'])) {
+        if (empty($param['expressNo'] && $param['delivery']!=20)) {
             $this->error = '物流单号不能为空';
             return false;
         }

From ee34bbec89d1b75a2bad85325190dec71aadd1b5 Mon Sep 17 00:00:00 2001
From: zyh <zyyhdxg@qq.com>
Date: Thu, 24 Oct 2024 17:09:38 +0800
Subject: [PATCH 3/3] 123

---
 app/store/service/order/Delivery.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/store/service/order/Delivery.php b/app/store/service/order/Delivery.php
index 860f368e..e9da5a43 100644
--- a/app/store/service/order/Delivery.php
+++ b/app/store/service/order/Delivery.php
@@ -50,11 +50,12 @@ class Delivery extends BaseService
      */
     public function delivery(int $orderId, array $param): bool
     {
-        if(empty($param['expressId'] && $param['delivery']!=20)) {
+
+        if($param['deliveryMethod'] == self::DELIVERY_METHOD_MANUAL && empty($param['expressId'])) {
             $this->error = '物流公司不能为空';
             return false;
         }
-        if (empty($param['expressNo'] && $param['delivery']!=20)) {
+        if ($param['deliveryMethod'] == self::DELIVERY_METHOD_MANUAL && empty($param['expressNo'])) {
             $this->error = '物流单号不能为空';
             return false;
         }