xuanchen/pingan_unionpay
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

一点小修改

Browse Source
This commit is contained in:
徐永宾
2020-08-23 23:06:34 +08:00
parent bec648912c
commit 0230bb0144
3 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Admin/Controllers/Coupon/IndexController.php
View File

@@ -2,7 +2,6 @@
namespace App\Admin\Controllers\Coupon; namespace App\Admin\Controllers\Coupon;
use App\Admin\Exporters\CouponExport;
use App\Models\ActivityRule; use App\Models\ActivityRule;
use App\Models\Coupon; use App\Models\Coupon;
use App\Models\User; use App\Models\User;
@@ -185,8 +184,8 @@ class IndexController extends AdminController
$form->decimal('sort', '排序')->default(0)->help('序号越大越靠前'); $form->decimal('sort', '排序')->default(0)->help('序号越大越靠前');
$form->saving(function ($form) { $form->saving(function ($form) {
$sum = (int)$form->pv + (int)$form->bonus + (int)$form->recommend; $sum = (int) $form->pv + (int) $form->bonus + (int) $form->recommend;
if ((int)$sum > $form->price) { if ((int) $sum > $form->price) {
admin_warning('配置错误', 'PV+佣金+推荐人佣金不能超过礼物价值'); admin_warning('配置错误', 'PV+佣金+推荐人佣金不能超过礼物价值');
throw new \Exception('配置错误,PV+佣金+推荐人佣金不能超过礼物价值'); throw new \Exception('配置错误,PV+佣金+推荐人佣金不能超过礼物价值');
} }

2
app/Api/Controllers/UserController.php
View File

@@ -166,7 +166,7 @@ class UserController extends Controller
'redemptionCode' => 'required', 'redemptionCode' => 'required',
'total' => 'required', 'total' => 'required',
'outletId' => 'required', 'outletId' => 'required',
'orderid' => 'nullable|min:10', // 'orderid' => 'nullable|min:100',
], [ ], [
'redemptionCode.required' => '缺少卡券兑换码', 'redemptionCode.required' => '缺少卡券兑换码',
'total.required' => '缺少订单总额', 'total.required' => '缺少订单总额',

2
public/index.php
View File

@@ -8,7 +8,7 @@
*/ */
define('LARAVEL_START', microtime(true)); define('LARAVEL_START', microtime(true));
echo phpinfo();
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Register The Auto Loader | Register The Auto Loader