|
|
@@ -51,13 +51,10 @@ class ServiceOrderLogic extends BaseLogic
|
|
|
if($goods['goods_payment_type'] == GoodsEnum::ISGOODS_PAYMENT_TYPE){
|
|
|
//一口价订单
|
|
|
$order_amount = $goods['service_fee'];
|
|
|
- $pay_status = PayEnum::UNPAID;
|
|
|
$work_pay_status = WorkEnum::UN_PAY_STATUS;
|
|
|
}else{
|
|
|
$order_total = $goods['base_service_fee'];
|
|
|
$order_amount = $goods['service_fee'];
|
|
|
- $pay_status = !empty($order_amount)?PayEnum::UNPAID:PayEnum::ISPAID;
|
|
|
- $work_pay_status = !empty($order_amount)?WorkEnum::UN_PAY_STATUS:WorkEnum::IS_PAY_STATUS;
|
|
|
}
|
|
|
|
|
|
//优惠券验证
|
|
|
@@ -122,7 +119,7 @@ class ServiceOrderLogic extends BaseLogic
|
|
|
'order_terminal' => $params['terminal'],
|
|
|
'payment_type'=>$goods['goods_payment_type']==1?1:0,
|
|
|
'user_id' => $params['user_id'],
|
|
|
- 'pay_status' => $pay_status,
|
|
|
+ 'pay_status' => PayEnum::UNPAID,
|
|
|
'coupon_id'=>!empty($params['coupon_id'])?$params['coupon_id']:0,
|
|
|
'coupon_price'=>!empty($order_coupon_amount)?$order_coupon_amount:0,
|
|
|
'pay_way' => $params['pay_way'],
|
whitefang