From 445c784d1f76f166f0d39630f89df2b0b258ae0b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 14 Jun 2024 09:48:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=E3=80=81=E8=AE=A2=E5=8D=95=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=92=8C=E7=94=A8=E6=88=B7=E4=BC=98=E6=83=A0=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductLogic.php | 8 ++++---- .../logic/store_product/StoreProductLogic.php | 10 ++++++---- app/api/logic/order/OrderLogic.php | 14 ++++---------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php index 8ff39dd8..ce3508e3 100644 --- a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php +++ b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php @@ -67,9 +67,9 @@ class StoreBranchProductLogic extends BaseLogic } $data['cate_id']=$params['cate_id']; }else{ - if($params['statis']!=$StoreProduct['statis']){ - if($params['statis']==1){ - StoreProductLogic::updateGoodsclass($params['cate_id'],$StoreProduct['store_id']); + if($params['status']!=$StoreProduct['status']){ + if($params['status']==1){ + StoreProductLogic::updateGoodsclass($StoreProduct['cate_id'],$StoreProduct['store_id']); }else{ self::store_product_cate_update($params['id'], $StoreProduct['cate_id'], $StoreProduct['store_id'],0); @@ -92,7 +92,7 @@ class StoreBranchProductLogic extends BaseLogic public static function store_product_cate_update($id,$cate_id,$store_id,$type=1) { $find=Db::name('store_product_cate')->where(['cate_id'=>$cate_id,'store_id'=>$store_id])->find(); - if($find['pid']>0){ + if($find &&$find['pid']>0){ $two=Db::name('store_product_cate')->where(['cate_id'=>$find['pid'],'store_id'=>$store_id])->find(); Db::name('store_product_cate')->where('id',$find['id'])->dec('count',1)->update(); Db::name('store_product_cate')->where('id',$two['id'])->dec('count',1)->update(); diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index d80c5964..3ba94c4f 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -145,7 +145,9 @@ class StoreProductLogic extends BaseLogic */ public static function delete(array $params): bool { - return StoreProduct::destroy($params['id']); + $res = StoreProduct::destroy($params['id']); + StoreBranchProduct::where('product_id', $params['id'])->update(['delete_time'=>time()]); + return $res; } @@ -177,7 +179,7 @@ class StoreProductLogic extends BaseLogic /** * 更新商品分类 */ - public static function updateGoodsclass($cate_id, $store_id=0,$type = 0) + public static function updateGoodsclass($cate_id, $store_id = 0, $type = 0) { $one = StoreCategory::where('id', $cate_id)->find(); if ($one) { @@ -189,10 +191,10 @@ class StoreProductLogic extends BaseLogic self::cate_update($two['id'], $two['pid'], $store_id, 2); self::cate_update($two['pid'], 0, $store_id, 1); } - }else{ + } else { if ($one['pid'] == 0) { self::cate_update($one['id'], 0, $store_id, 1); - }else{ + } else { self::cate_update($one['id'], $one['pid'], $store_id, 2); self::cate_update($one['pid'], 0, $store_id, 1); } diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index e016bff5..895a42e0 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -79,15 +79,9 @@ class OrderLogic extends BaseLogic $cart_select[$k]['price'] = $find['price']; $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额 - if ($user && $user['user_ship'] >= 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); - $onePrice = bcsub($find['vip_price'], $find['cost'], 2); - }else{ - $onePrice = bcsub($find['price'], $find['cost'], 2); - } + $onePrice = bcsub($find['price'], $find['cost'], 2); + //利润 $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润 $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本 @@ -114,7 +108,7 @@ class OrderLogic extends BaseLogic self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2); self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - $pay_price = bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + $pay_price =self::$pay_price;// bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 $vipPrice = 0; //成本价 收益 $order = [ @@ -133,7 +127,7 @@ class OrderLogic extends BaseLogic 'shipping_type' => $params['shipping_type'] ?? 2, //配送方式 1=快递 ，2=门店自提 'activity' => '减免', 'activity_price' => self::$activity_price, - 'activities' => self::$activity_price>0?1:0, + 'activities' =>0, 'deduction_price' => self::$activity_price ];