|
|
@@ -154,7 +154,7 @@ class OrderController extends O2oBaseController{
|
|
|
if(isset($user_coupon->coupon)){
|
|
|
$order->coupon_type = $user_coupon->coupon;
|
|
|
}
|
|
|
- if($order->final_price == 0){
|
|
|
+ if($order->pay_price == 0){
|
|
|
$order->status = 1;
|
|
|
}else{
|
|
|
$order->status = 0;
|
|
|
@@ -250,7 +250,6 @@ class OrderController extends O2oBaseController{
|
|
|
}
|
|
|
$str = isset($str)&&$str?$str:'上门';
|
|
|
$amount = ceil($order->pay_price*1000)/10;
|
|
|
- var_dump($amount);exit;
|
|
|
$result = Service::factory('PayService')->Pay($pay_channel,$amount,(string)$order->_id,$str,$str,$user_obj->wx_pub_openid);
|
|
|
if($result === false){
|
|
|
CommonFn::requestAjax(false,'支付遇到点问题了，请稍候再试');
|
Charlie