Commit 25b9b459 authored by zhangjun's avatar zhangjun

修改

parent 03e470e7
...@@ -1851,23 +1851,23 @@ class User extends MY_Controller ...@@ -1851,23 +1851,23 @@ class User extends MY_Controller
$packageData['package_desc'] = unserialize($packageData['package_desc']); $packageData['package_desc'] = unserialize($packageData['package_desc']);
foreach($packageData['package_desc'] as $item){ foreach($packageData['package_desc'] as $item){
if($packageType == 4){ if($packageType == 4){
$price = floatval($item['price']); $price = $originalPrice = floatval($item['price']);
}else if($packageType == 5){ }else if($packageType == 5){
if($item['property_type'] == $infoType){ if($item['property_type'] == $infoType){
$price = floatval($item['price']); $price = $originalPrice = floatval($item['price']);
//处理折扣 //处理折扣
if(isset($item['discount']) && $item['discount'] >0){ if(isset($item['discount']) && $item['discount'] >0){
$price = $this->pirceDiscount($price,$item['discount']); $price = $originalPrice = $this->pirceDiscount($price,$item['discount']);
} }
} }
}else{ }else{
if($item['property_type'] == $infoType && $item['day'] == $day){ if($item['property_type'] == $infoType && $item['day'] == $day){
$price = floatval($item['price']); $price = $originalPrice = floatval($item['price']);
if(GB_CITY == 'wh' && $packageType == 2){ if(GB_CITY == 'wh' && $packageType == 2){
//处理折扣 //处理折扣
if(isset($item['discount']) && $item['discount'] >0){ if(isset($item['discount']) && $item['discount'] >0){
$price = $this->pirceDiscount($price,$item['discount']); $price = $originalPrice = $this->pirceDiscount($price,$item['discount']);
} }
} }
// 列表套餐8折券使用 20200507 // 列表套餐8折券使用 20200507
...@@ -2023,7 +2023,7 @@ class User extends MY_Controller ...@@ -2023,7 +2023,7 @@ class User extends MY_Controller
// 使用优惠券 // 使用优惠券
if ( GB_CITY == 'nj' ){ if ( GB_CITY == 'nj' ){
if( isset( $use_coupon ) && $use_coupon == 1 ) { if( isset( $use_coupon ) && $use_coupon == 1 ) {
$this->user_model->useCoupon( $orderData['transaction_id'], $this->user_id, $coupon_id, $price, $packageType ); $this->user_model->useCoupon( $orderData['transaction_id'], $this->user_id, $coupon_id, $originalPrice, $packageType );
// 0元支付 // 0元支付
if ( $price <= 0 ) { if ( $price <= 0 ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment