Browse Source

fixed 账号余额不足时,任可以购买套餐的问题

兔姬桑 4 năm trước cách đây
mục cha
commit
cf166fb2ea

+ 4 - 4
app/Http/Controllers/Admin/ShopController.php

@@ -99,8 +99,8 @@ class ShopController extends Controller {
 			$obj->limit_num = $request->input('limit_num');
 			$obj->color = $request->input('color');
 			$obj->sort = $request->input('sort');
-			$obj->is_hot = $request->input('is_hot', 0);
-			$obj->status = $request->input('status', 0);
+			$obj->is_hot = $request->input('is_hot')? 1 : 0;
+			$obj->status = $request->input('status')? 1 : 0;
 			$obj->save();
 
 			DB::commit();
@@ -158,8 +158,8 @@ class ShopController extends Controller {
 				'limit_num'   => $request->input('limit_num'),
 				'color'       => $request->input('color'),
 				'sort'        => $request->input('sort'),
-				'is_hot'      => $request->input('is_hot', 0),
-				'status'      => $request->input('status', 0)
+				'is_hot'      => $request->input('is_hot')? 1 : 0,
+				'status'      => $request->input('status')? 1 : 0
 			];
 
 			Goods::whereId($id)->update($data);

+ 1 - 1
app/Http/Controllers/Api/WebApi/BaseController.php

@@ -134,7 +134,7 @@ class BaseController {
 		//节点未设置任何审计规则
 		if($nodeRule){
 			$ruleGroup = RuleGroup::find($nodeRule->rule_group_id);
-			if($ruleGroup){
+			if($ruleGroup && $ruleGroup->rules){
 				foreach($ruleGroup->rules as $ruleId){
 					$rule = Rule::find($ruleId);
 					if($rule){

+ 2 - 3
app/Http/Controllers/PaymentController.php

@@ -101,6 +101,7 @@ class PaymentController extends Controller {
 			if(!$goods || !$goods->status){
 				return Response::json(['status' => 'fail', 'message' => '订单创建失败:商品已下架']);
 			}
+			$amount = $goods->price;
 
 			// 是否有生效的套餐
 			$activePlan = Order::userActivePlan()->doesntExist();
@@ -121,7 +122,7 @@ class PaymentController extends Controller {
 				if(Order::uid()->whereStatus(0)->exists()){
 					return Response::json(['status' => 'fail', 'message' => '订单创建失败:尚有未支付的订单,请先去支付']);
 				}
-			}elseif(self::$method === 'credit' && Auth::getUser()->credit < $amount){ // 验证账号余额是否充足
+			}elseif(Auth::getUser()->credit < $amount){ // 验证账号余额是否充足
 				return Response::json(['status' => 'fail', 'message' => '您的余额不足,请先充值']);
 			}
 
@@ -146,8 +147,6 @@ class PaymentController extends Controller {
 				// 计算实际应支付总价
 				$amount = $coupon->type == 2? $goods->price * $coupon->value / 100 : $goods->price - $coupon->value;
 				$amount = $amount > 0? round($amount, 2) : 0; // 四舍五入保留2位小数,避免无法正常创建订单
-			}else{
-				$amount = $goods->price;
 			}
 
 			// 价格异常判断