From 955e28a4c6994ef29c6a71fa6f939536f08d1ed6 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 12 Jun 2024 15:14:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/product/ProductLists.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index bc82f94b4..f757b8f00 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -30,11 +30,11 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li */ public function setSearch(): array { - $name=$this->request->get('name',''); + $name=$this->request->get('store_name',''); // $where['%pipe_like%'] =['name'=>'store_name|bar_code']; if($name){ if(preg_match('/[\x{4e00}-\x{9fff}]+/u', $name)==1){ - $where['%like%']=['store_name']; + $where['%like%']=['store_name'=>'store_name']; }else{ $where['=']=['bar_code','cate_id']; } From 664d24091cd3d126c6b80d5cff4a7d844c763bff Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 12 Jun 2024 15:22:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?add=E6=A0=B8=E9=94=80=E7=A0=81=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index f41874a8e..6b5d38892 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -23,6 +23,8 @@ use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserShip; +use Picqer\Barcode\BarcodeGeneratorJPG; +use Picqer\Barcode\BarcodeGeneratorPNG; use support\exception\BusinessException; use support\Log; use taoser\exception\ValidateException; @@ -227,7 +229,12 @@ class OrderLogic extends BaseLogic if ($params['shipping_type'] == 2) { $_order['status'] = 1; } - + //生成核销码 + $generator = new BarcodeGeneratorPNG(); + $barcode = $generator->getBarcode($verify_code, $generator::TYPE_CODE_128); + $savePath = 'public/image/barcode/'.time().'.png'; + file_put_contents($savePath, $barcode); + $_order['verify_img'] = $savePath; Db::startTrans(); try { $order = StoreOrder::create($_order); From 14c588718a508fb2f37bcd4fe63ee07233964975 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 12 Jun 2024 15:54:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/order/OrderList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index e779a853d..6db6b45a8 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -52,7 +52,7 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface ->select() ->each(function ($item) { $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id']) - ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select() + ->field('product_id,cart_num,verify_code,verify_img,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select() ->each(function ($v) use ($item) { $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->find(); $v['store_name'] = $find['store_name']; From b5d860a4c0061da8099fa2fa4d118749817cd96e Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 12 Jun 2024 16:05:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 6b5d38892..3e01812db 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -232,9 +232,10 @@ class OrderLogic extends BaseLogic //生成核销码 $generator = new BarcodeGeneratorPNG(); $barcode = $generator->getBarcode($verify_code, $generator::TYPE_CODE_128); - $savePath = 'public/image/barcode/'.time().'.png'; + $findPath = '/image/barcode/'.time().'.png'; + $savePath = 'public'.$findPath; file_put_contents($savePath, $barcode); - $_order['verify_img'] = $savePath; + $_order['verify_img'] = $findPath; Db::startTrans(); try { $order = StoreOrder::create($_order); From bd925bed5bb354ada88a2cd534fddff15136f325 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 12 Jun 2024 16:07:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/order/OrderList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index 6db6b45a8..e779a853d 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -52,7 +52,7 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface ->select() ->each(function ($item) { $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id']) - ->field('product_id,cart_num,verify_code,verify_img,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select() + ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select() ->each(function ($v) use ($item) { $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->find(); $v['store_name'] = $find['store_name'];