From 8ac8d073f62e42e5d6405b8e6ddf5a03052a9ee5 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 13:52:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=93=B6?= =?UTF-8?q?=E5=8F=B0=E9=87=87=E8=B4=AD=E6=AC=BE=E6=94=AF=E4=BB=98=E5=90=8E?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=A0=B8=E9=94=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 12 +++++++++++- .../controller/store_order/StoreOrderController.php | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 9b9a76d7b..a7aa59456 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\api\logic\order\OrderLogic; use app\common\enum\OrderEnum; use app\common\enum\PayEnum; use app\common\enum\user\UserShipEnum; @@ -124,6 +125,15 @@ class PayNotifyLogic extends BaseLogic self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); } + if($extra && $extra['store_id']){ + $params = [ + 'verify_code'=>$order['verify_code'], + 'store_id'=>$extra['store_id'], + 'staff_id'=>$extra['staff_id'] + ]; + OrderLogic::writeOff($params); + } + // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); @@ -252,10 +262,10 @@ class PayNotifyLogic extends BaseLogic $order->paid = 1; $order->pay_time = time(); $order->status = 2; - self::afterPay($order); if (!$order->save()) { throw new \Exception('订单保存出错'); } + self::afterPay($order); $cashFlowLogic = new CashFlowLogic(); $cashFlowLogic->insert($order['store_id'], $order['pay_price']); // Redis::send('push-platform-print', ['id' => $order['id']]); diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 70d8173e4..e69c4f048 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -146,7 +146,10 @@ class StoreOrderController extends BaseAdminController switch ($pay_type) { case PayEnum::PURCHASE_FUNDS: //采购款支付 - PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $uid]); + PayNotifyLogic::handle('purchase_funds', $order['order_id'], [ + 'uid' => $uid,'store_id'=>$this->request->adminInfo['store_id'], + 'staff_id'=>$this->request->adminInfo['admin_id'] + ]); return $this->success('采购款支付成功', ['id' => $order['id']]); case PayEnum::CASH_PAY: From 14d0f838fd80fa403462caf0e8caa54ce9dc8735 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 14:19:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=BA=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A71=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 3 ++- app/common/logic/store_order/StoreOrderLogic.php | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index e95c756ae..dcfa9efab 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -84,12 +84,13 @@ class OrderLogic extends BaseLogic $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - + $cart_select[$k]['vip'] = 0; if ($user && $user['user_ship'] == 1) { //更新 会员为1的时候原价减去会员价 $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + $cart_select[$k]['vip'] =1; } if ($user && $user['user_ship'] == 4) { //更新 为4商户的时候减去商户价格 diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 972e4ebeb..b5e6bf98c 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -61,12 +61,13 @@ class StoreOrderLogic extends BaseLogic $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - + $cart_select[$k]['vip'] = 0; if ($user && $user['user_ship'] == 1) { //更新 会员为1的时候原价减去会员价 $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2); $cart_select[$k]['deduction_price'] =$deduction_price_count; self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2); + $cart_select[$k]['vip'] =1; } if ($user && $user['user_ship'] == 4) { @@ -223,6 +224,12 @@ class StoreOrderLogic extends BaseLogic $order['refund_type_name'] = OrderEnum::refundType($order['refund_type']) ?? ''; $order['pay_type_name'] =PayEnum::getPaySceneDesc($order['pay_type']) ?? ''; + $detail =StoreOrderCartInfo::where('oid',$order['id'])->find()->toArray(); + $vip =0; + if(isset($detail['cart_info']['vip']) && $detail['cart_info']['vip'] == 1){ + $vip = 1; + } + $order['vip'] = $vip; return $order->toArray(); } From 149d818157726294f193945759381b200e3a67a7 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 16:21:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E7=9A=84=E8=B4=A6=E5=8D=95=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store_finance_flow/StoreFinanceFlowLists.php | 1 + .../controller/finance/StoreBillController.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index 3dedf3c5a..fd996b83b 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -33,6 +33,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt return [ '=' => ['store_id', 'user_id', 'create_time', 'staff_id'], 'between_time'=>'create_time', + '%pipe_like%' => ['keyword'=>'order_sn'], ]; } diff --git a/app/store/controller/finance/StoreBillController.php b/app/store/controller/finance/StoreBillController.php index 50c7fb34c..cbd7bc6be 100644 --- a/app/store/controller/finance/StoreBillController.php +++ b/app/store/controller/finance/StoreBillController.php @@ -2,7 +2,10 @@ namespace app\store\controller\finance; +use app\admin\lists\store_finance_flow\StoreFinanceFlowDayLists; use app\admin\lists\store_finance_flow\StoreFinanceFlowLists; +use app\admin\lists\store_finance_flow\StoreFinanceFlowMonthLists; +use app\admin\lists\store_finance_flow\StoreFinanceFlowWeekLists; use app\common\controller\Definitions; use app\common\lists\StoreBillLists; use app\store\controller\BaseAdminController; @@ -27,7 +30,15 @@ class StoreBillController extends BaseAdminController // ] public function lists() { - return $this->dataLists(new StoreBillLists()); + $type = $this->request->get('type'); + if($type == 1){ + return $this->dataLists(new StoreFinanceFlowDayLists()); + }else if($type == 2){ + return $this->dataLists(new StoreFinanceFlowWeekLists()); + }else{ + return $this->dataLists(new StoreFinanceFlowMonthLists()); + } +// return $this->dataLists(new StoreBillLists()); } // #[ From 7981e126f370b09ffe56443740a436aeb07067e2 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 16:58:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=93=B6?= =?UTF-8?q?=E6=9C=BA=E5=88=86=E7=B1=BB=E9=80=BB=E8=BE=91=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lists/store_branch_product/StoreBranchProductLists.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index cce4193a4..c5b70125e 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -57,6 +57,11 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI $where[]=['cate_id','in',array_merge($arr,$arr2)]; } } + if(empty($where) && $class_all){ + //2或者1 + $where[]=['cate_id','=',$class_all]; + } + return StoreBranchProduct::where($this->searchWhere)->where($where) ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status']) ->when(!empty($this->adminInfo['store_id']), function ($query) { From 69ed8b332d24b81966b0f362b93f783fc1e39c82 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 19 Jun 2024 17:05:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E5=BE=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/store_product/StoreProductLogic.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index cfd50ef30..6aee0d22b 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -154,7 +154,8 @@ class StoreProductLogic extends BaseLogic ]; StoreProduct::where('id', $params['id'])->update($data); - $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') + + /*$old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id') ->select(); // 获取分类ID foreach ($old_cate as $vv) { @@ -169,13 +170,13 @@ class StoreProductLogic extends BaseLogic //新增对应的分类 self::updateGoodsclass($params['cate_id'], $value['store_id']); } - } + }*/ //修改 StoreBranchProduct::where('product_id', $params['id'])->update([ 'price' => $params['price'], 'vip_price' => $params['vip_price'], - 'cost' => $params['cost'], 'cate_id' => $params['cate_id'], + 'cost' => $params['cost'], 'batch'=>$params['batch'],'store_name'=>$params['store_name'] ]);