Browse Source

修改常量名

develop
李可松 4 years ago
parent
commit
8fb1bce067
  1. 8
      app/Common/PayType.php
  2. 2
      app/Http/Controllers/Api/OrderController.php
  3. 2
      app/Http/Controllers/Api/WxpayController.php

8
app/Common/PayType.php

@ -16,10 +16,10 @@ class PayType
const OFFLINE = 1; const OFFLINE = 1;
/** @var int 订金支付 */ /** @var int 订金支付 */
const SUBSCRIPTION = 2;
const DEPOSIT_PAY = 2;
/** @var int 定金支付 */ /** @var int 定金支付 */
const DEPOSIT = 3;
const EARNEST_PAY = 3;
/** @var int 尾款/多加支付 */ /** @var int 尾款/多加支付 */
const DOWN_PAYMENT = 4; const DOWN_PAYMENT = 4;
@ -32,8 +32,8 @@ class PayType
return [ return [
self::ONLINE => '在线支付', self::ONLINE => '在线支付',
self::OFFLINE => '线下支付', self::OFFLINE => '线下支付',
self::SUBSCRIPTION => '订金支付',
self::DEPOSIT => '定金支付',
self::DEPOSIT_PAY => '订金支付',
self::EARNEST_PAY => '定金支付',
self::DOWN_PAYMENT => '首款支付', self::DOWN_PAYMENT => '首款支付',
self::BALANCE_PAY => '尾款/多加支付', self::BALANCE_PAY => '尾款/多加支付',
]; ];

2
app/Http/Controllers/Api/OrderController.php

@ -379,7 +379,7 @@ class OrderController extends Controller
private function calc($price, $coupon, $num, $pay_type) private function calc($price, $coupon, $num, $pay_type)
{ {
//根据支付方式计算价格 //根据支付方式计算价格
if (in_array($pay_type, [PayType::SUBSCRIPTION, PayType::DEPOSIT, PayType::DOWN_PAYMENT])) {
if (in_array($pay_type, [PayType::DEPOSIT_PAY, PayType::EARNEST_PAY, PayType::DOWN_PAYMENT])) {
return $this->earnest; return $this->earnest;
} }
//TODO 还要计算尾款支付金额 //TODO 还要计算尾款支付金额

2
app/Http/Controllers/Api/WxpayController.php

@ -66,7 +66,7 @@ class WxpayController
$pay_type = $order->pay_type; $pay_type = $order->pay_type;
$money = $message['total_fee'] / 100; $money = $message['total_fee'] / 100;
//定金支付和首付款支付 //定金支付和首付款支付
if (in_array($pay_type, [PayType::SUBSCRIPTION, PayType::DEPOSIT, PayType::DOWN_PAYMENT])) {
if (in_array($pay_type, [PayType::DEPOSIT_PAY, PayType::EARNEST_PAY, PayType::DOWN_PAYMENT])) {
if ($status == OrderStatus::UNPAID) { if ($status == OrderStatus::UNPAID) {
$order->status = OrderStatus::PAY_EARNEST; $order->status = OrderStatus::PAY_EARNEST;
} else if ($status == OrderStatus::PAY_EARNEST) { } else if ($status == OrderStatus::PAY_EARNEST) {

Loading…
Cancel
Save