diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index 422e96207..81be9bb87 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -117,19 +117,19 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L public function extend() { $off_activity = Config::where('name', 'off_activity')->value('value'); - if($off_activity==1){ - $data=[ - 'off_activity' => $off_activity, - 'price' => 'cost', - 'op_price' => 'price', - ]; - }else{ +// if($off_activity==1){ +// $data=[ +// 'off_activity' => $off_activity, +// 'price' => 'cost', +// 'op_price' => 'price', +// ]; +// }else{ $data=[ 'off_activity' => $off_activity, 'price' => 'price', 'op_price' => 'price', ]; - } +// } return $data; } } diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index aeec1b149..9f11d63fb 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -91,11 +91,11 @@ class OrderLogic extends BaseLogic } unset($cart_select[$k]['id']); $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 - if ($off_activity == 1) { - $price = $find['cost']; - } else { +// if ($off_activity == 1) { +// $price = $find['cost']; +// } else { $price = $find['price']; - } +// } $cart_select[$k]['price'] = $price; $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['vip'] = 0;