From 236b78e60d689b6c121f456c502970086a4128fc Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Fri, 17 Mar 2023 15:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E9=87=87=E8=B4=AD=E6=89=80=E6=9C=89=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/server/StoreProduct.php    | 2 ++
 app/controller/api/store/order/StoreOrder.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/server/StoreProduct.php b/app/controller/api/server/StoreProduct.php
index d39a5ffd..5a1e9ef2 100644
--- a/app/controller/api/server/StoreProduct.php
+++ b/app/controller/api/server/StoreProduct.php
@@ -79,6 +79,8 @@ class StoreProduct extends BaseController
         $data['status'] = $merchant->is_audit ? 0 : 1;
         $data['mer_status'] = ($merchant['is_del'] || !$merchant['mer_state'] || !$merchant['status']) ? 0 : 1;
         $data['rate'] = 3;
+        // $data['cate_id'] = 1;
+        // $data['mer_cate_id'] = 1;
         $this->repository->create($data, 0, 1);
         return app('json')->success('添加成功');
     }
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 01d9c641..99129aca 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -155,7 +155,7 @@ class StoreOrder extends BaseController
         $source = $this->request->param('source');
         $source = !isset($source)?2:$source; // 默认来源为2 普通商品订单
         $where['uid'] = $this->request->uid();
-        $where['paid'] = 1;
+        // $where['paid'] = 1;
         $where['source'] = $source;
 
         return app('json')->success($this->repository->getList($where, $page, $limit, $source));