From e8dbf9440c78874473123cd0a3b8b11b5e24021e Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 18 Aug 2024 14:04:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BA=86=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=9D=A1=E7=A0=81=E6=94=AF=E4=BB=98=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=80=9A=E7=9F=A5=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductExchangeLists.php | 2 +- .../lists/store_branch_product/StoreBranchProductLists.php | 2 +- app/api/controller/order/OrderController.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php index f4144ab48..28e90e728 100644 --- a/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php +++ b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php @@ -58,7 +58,7 @@ class StoreBranchProductExchangeLists extends BaseAdminDataLists implements List } } return StoreBranchProductExchange::where($this->searchWhere)->where($where) - ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status']) + ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'bar_code','status']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index 017d9f342..8c93d9426 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -81,7 +81,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI $this->searchWhere[] = $where; } return StoreBranchProduct::where($this->searchWhere) - ->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price', 'manufacturer_information']) + ->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price','bar_code', 'manufacturer_information']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index f60a26e63..5f9ed4ed5 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -197,7 +197,7 @@ class OrderController extends BaseApiController Db::name('wechat_micropay')->insert(['order_id' => $order['order_id'], 'create_time' => time(), 'update_time' => time()]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]); try{ - $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单"]]; + $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单|".$order['order_id']]]; $url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b538e44b-940b-445f-afe0-97320942d959'; (new Curl())->postJson($url, json_encode($arr)); }catch(Exception $e){ @@ -315,7 +315,7 @@ class OrderController extends BaseApiController Db::name('wechat_micropay')->insert(['order_id' => $order['order_id'], 'create_time' => time(), 'update_time' => time()]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]); try{ - $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单"]]; + $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单|".$order['order_id']]]; $url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b538e44b-940b-445f-afe0-97320942d959'; (new Curl())->postJson($url, json_encode($arr)); }catch(Exception $e){