Commit a5409452 authored by zhangjun's avatar zhangjun

修改

parent 78bac47b
...@@ -1913,7 +1913,7 @@ class User extends MY_Controller ...@@ -1913,7 +1913,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 ) {
$couponRes = $this->user_model->checkCoupon( $this->user_id, $coupon_id, $price, 2 ); $couponRes = $this->user_model->checkCoupon( $this->user_id, $coupon_id, $price, $packageType );
if ( isset( $couponRes['result'] ) && $couponRes['result'] == 1 ) { if ( isset( $couponRes['result'] ) && $couponRes['result'] == 1 ) {
$price = $price - $couponRes['data']['coupon_price'] ; $price = $price - $couponRes['data']['coupon_price'] ;
} }
...@@ -2017,7 +2017,7 @@ class User extends MY_Controller ...@@ -2017,7 +2017,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 ); $this->user_model->useCoupon( $orderData['transaction_id'], $this->user_id, $coupon_id, $price, $packageType );
} }
} }
......
...@@ -6119,9 +6119,10 @@ if($searcharr['infotype']==4){ ...@@ -6119,9 +6119,10 @@ if($searcharr['infotype']==4){
* @param $user_id * @param $user_id
* @param $coupon_id * @param $coupon_id
* @param $price * @param $price
* @param $packageType
*/ */
public function checkCoupon( $user_id, $coupon_id, $price, $business_type = 0) { public function checkCoupon( $user_id, $coupon_id, $price, $packageType) {
$url = GB_CHECK_COUPON_URL . '?uid=' . $user_id .'&coupon_id=' . $coupon_id . '&price=' . $price . '&business_type=' . $business_type; $url = GB_CHECK_COUPON_URL . '?uid=' . $user_id .'&coupon_id=' . $coupon_id . '&price=' . $price . '&package_type=' . $packageType;
$couponRes = curl_get_contents( $url ); $couponRes = curl_get_contents( $url );
$couponRes = !empty( $couponRes ) ? json_decode( $couponRes, 1 ) : array(); $couponRes = !empty( $couponRes ) ? json_decode( $couponRes, 1 ) : array();
return $couponRes; return $couponRes;
...@@ -6129,17 +6130,19 @@ if($searcharr['infotype']==4){ ...@@ -6129,17 +6130,19 @@ if($searcharr['infotype']==4){
/** /**
* 验证优惠券 * 验证优惠券
* @param $order_code
* @param $user_id * @param $user_id
* @param $coupon_id * @param $coupon_id
* @param $price * @param $price
* @param $packageType
*/ */
public function useCoupon( $order_code, $user_id, $coupon_id, $price ) { public function useCoupon( $order_code, $user_id, $coupon_id, $price, $packageType ) {
$params = array( $params = array(
'order_code' => $order_code, 'order_code' => $order_code,
'coupon_id' => $coupon_id, 'coupon_id' => $coupon_id,
'price' => $price, 'price' => $price,
'uid' => $user_id, 'uid' => $user_id,
'business_type' => 2, 'package_type' => $packageType,
); );
$url = GB_USE_COUPON_URL; $url = GB_USE_COUPON_URL;
$couonRes = $this->request_post( $url, $params ); $couonRes = $this->request_post( $url, $params );
......
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