diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 8c1aea2c4..3c1ebd395 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -137,9 +137,9 @@ class OrderLogic extends BaseLogic $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 } - if($pay_price < 500){ - throw new Exception('金额低于500'); - } +// if($pay_price < 500){ +// throw new Exception('金额低于500'); +// } //成本价 收益 $order = [ diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index 3cb9a5ec9..05f2af497 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -111,7 +111,8 @@ class StoreOrderLogic extends BaseLogic self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } - if ($user && $user['user_ship'] == 1) { + $pay_type = isset($params['pay_type'])?$params['pay_type']:0; + if ($user && $user['user_ship'] == 1 && $pay_type !=17) { $pay_price = self::$pay_price; $activity_string = ''; }else{ @@ -119,9 +120,9 @@ class StoreOrderLogic extends BaseLogic $activity_string = '减免'; } - if($pay_price < 500){ - throw new \think\Exception('金额低于500'); - } +// if($pay_price < 500){ +// throw new \think\Exception('金额低于500'); +// } $vipPrice = 0; //成本价 收益 diff --git a/app/store/lists/store_order/StoreOrderLists.php b/app/store/lists/store_order/StoreOrderLists.php index 3a3e8dcf3..bfb821a4e 100644 --- a/app/store/lists/store_order/StoreOrderLists.php +++ b/app/store/lists/store_order/StoreOrderLists.php @@ -55,7 +55,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface $this->searchWhere[] = ['pay_type','in',[7,3,18]]; } return StoreOrder::where($this->searchWhere) - ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid']) + ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid','total_num']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) use ($store_id) { @@ -77,7 +77,6 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface } else { $item['product_info'] = []; } - return $item; }) ->toArray();