Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into wuye-m

app/api/logic/GoodsLogic.php

@@ -43,6 +43,9 @@ class GoodsLogic extends BaseLogic
                 if($value['goods_payment_type'] == '2'){
                     $coupon = ($value['service_total']-$value['service_fee'])>0?'立减'.$value['service_total']-$value['service_fee']:'';
                 }
+                if($value['goods_payment_type'] == '3'){
+                    $coupon = '首付'.$value['service_fee'];
+                }
                 $data[] = [
                     'id'=>$value['id'],
                     'goods_image'=>$value['goods_image'],

app/api/logic/ServiceOrderLogic.php

@@ -80,7 +80,11 @@ class ServiceOrderLogic extends BaseLogic
                 //一口价订单
                 $order_total = $goods['service_fee'];
                 $order_amount = $goods['service_fee'];
-            }else{
+            }else if ($goods['goods_payment_type'] == GoodsEnum::DEP_GOODS_PAYMENT_TYPE){
+                $order_total = $goods['base_service_fee'];
+                $order_amount = $goods['service_fee'];
+            }
+            else{
                 $order_total = $goods['base_service_fee'];
                 $order_amount = $goods['service_fee'];
             }

app/common/enum/GoodsEnum.php

@@ -9,6 +9,8 @@ class GoodsEnum
 
     //服务支付类别
     //预支付
-    const UNGOODS_PAYMENT_TYPE = 1;
-    const ISGOODS_PAYMENT_TYPE = 2;
+    const UNGOODS_PAYMENT_TYPE = 1;//预支付服务
+    const ISGOODS_PAYMENT_TYPE = 2;//一口价服务
+
+    const DEP_GOODS_PAYMENT_TYPE = 3;//一口价服务预支付
 }