From bdd0784d3ec7718b7264aa401536fc9cf44d4db0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 22 Jul 2024 14:30:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E4=BF=AE=E6=94=B9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83=E6=95=B4=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=BE=85=E8=BF=94=E5=9B=9E=E9=87=91=E9=A2=9D=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=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 | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index a243ae844..f7c77c219 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -71,7 +71,7 @@ class OrderLogic extends BaseLogic
             self::setError('购物车为空');
             return false;
         }
-        try {
+        // try {
             self::$total_price = 0;
             self::$pay_price = 0;
             self::$cost = 0; //成本由采购价替代原成本为门店零售价
@@ -138,15 +138,15 @@ class OrderLogic extends BaseLogic
                 $cart_select[$k]['vip_frozen_price'] = 0;
                 $cart_select[$k]['store_info'] = $find['store_info'];
                 //会员待返回金额
-                if ($user && $off_activity == 0) {
-                    if ($user['user_ship'] == 4) {
-                        //商户
-                        $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'], $cart_select[$k]['store_price'], 2);
-                    } else {
-                        //其他会员
-                        $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'], $cart_select[$k]['vip_price'], 2);
-                    }
-                }
+                // if ($user && $off_activity == 0) {
+                //     if ($user['user_ship'] == 4) {
+                //         //商户
+                //         $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'], $cart_select[$k]['store_price'], 2);
+                //     } else {
+                //         //其他会员
+                //         $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'], $cart_select[$k]['vip_price'], 2);
+                //     }
+                // }
                 //                d($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],$cart_select[$k]['vip_price'] );
                 $cartInfo = $cart_select[$k];
                 $cartInfo['name'] = $find['store_name'];
@@ -163,7 +163,7 @@ class OrderLogic extends BaseLogic
                 self::$cost = bcadd(self::$cost, $cart_select[$k]['purchase'], 2);
                 self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2); //商户价
                 self::$deduction_price = bcadd(self::$deduction_price, $deduction_price, 2); //抵扣金额
-                self::$frozen_money = bcadd(self::$frozen_money, $cart_select[$k]['vip_frozen_price'], 2); //返还金额
+                // self::$frozen_money = bcadd(self::$frozen_money, $cart_select[$k]['vip_frozen_price'], 2); //返还金额
                 //计算生鲜
                 if ($createOrder == 1 && $find['top_cate_id'] == 15201) {
                     self::$fresh_price = bcadd(self::$fresh_price, $cart_select[$k]['pay_price'], 2);
@@ -249,10 +249,10 @@ class OrderLogic extends BaseLogic
                     }
                 }
             }
-        } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
-        }
+        // } catch (\Exception $e) {
+        //     self::setError($e->getMessage());
+        //     return false;
+        // }
         return ['order' => $order, 'cart_list' => $cart_select, 'shopInfo' => $store['near_store']];
     }