From a8f1887b4530a187a87688d0503fa77e42c26494 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 23 Sep 2024 15:14:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=AF=BC=E8=88=AA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/store_order/StoreOrderLogic.php | 7 ++++++- app/api/controller/store/StoreController.php | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/admin/logic/store_order/StoreOrderLogic.php b/app/admin/logic/store_order/StoreOrderLogic.php index 02a3e8f97..94910e3b0 100644 --- a/app/admin/logic/store_order/StoreOrderLogic.php +++ b/app/admin/logic/store_order/StoreOrderLogic.php @@ -49,7 +49,12 @@ class StoreOrderLogic extends BaseLogic $v['store_id'] = $params['store_id']; $v['cart_num'] = $v['stock']; if(in_array($params['store_id'],$vendors_store)){ - StoreBranchProduct::where('id', $v['id'])->update(['price' => $v['price'], 'vip_price' => $v['price'], 'cost' => $v['price'], 'purchase' => $v['price']]); + if(isset($v['purchase']) && $v['purchase'] > 0){ + $purchase = $v['purchase']; + }else{ + $purchase=$v['price']; + } + StoreBranchProduct::where('id', $v['id'])->update(['price' => $v['price'], 'vip_price' => $v['price'], 'cost' => $v['price'], 'purchase' => $purchase]); } unset($v['id']); $res = CartLogic::add($v); diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index cbf9528f2..ab251819a 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -194,4 +194,19 @@ class StoreController extends BaseApiController return $this->success('ok',['count'=>$count,'create_log'=>$createLog]); } + + /** + * 小程序导航 + */ + public function menu_list(){ + $menu=[ + ['name'=>'每日配送统计'], + ['name'=>'累计配送统计'], + ['name'=>'每日销量统计'], + ['name'=>'累计销量统计'], + ['name'=>'商品库存'], + ['name'=>'店铺收支'] + ]; + return $this->success('ok',['menu'=>$menu]); + } }