Merge pull request #985 from garhing/master

余额充值支持在线支付

app/Http/Controllers/Api/YzyController.php

@@ -187,7 +187,9 @@ class YzyController extends Controller
             }
 
             // 把商品的流量加到账号上
+            if ($goods->type <= 2) {
             User::query()->where('id', $order->user_id)->increment('transfer_enable', $goods->traffic * 1048576);
+            }
 
             // 计算账号过期时间
             if ($order->user->expire_time < date('Y-m-d', strtotime("+" . $goods->days . " days"))) {
@@ -209,6 +211,7 @@ class YzyController extends Controller
             }
 
             // 写入用户标签
+            if ($goods->type <= 2) {
             if ($goods->label) {
                 // 用户默认标签
                 $defaultLabels = [];
@@ -234,6 +237,14 @@ class YzyController extends Controller
                     $obj->save();
                 }
             }
+            }
+          
+            // 在线充值
+            if ($goods->type == 3) {
+                User::query()->where('id', $order->user_id)->increment('balance', $goods->price * 100);
+            // 余额变动记录日志
+                $this->addUserBalanceLog($order->user_id,  $order->oid, $order->user->balance, $order->user->balance + $goods->price, +$goods->price, '用户在线充值' );
+            }
 
             // 写入返利日志
             if ($order->user->referral_uid) {

resources/views/shop/addGoods.blade.php

@@ -52,6 +52,10 @@
                                                 <input type="radio" name="type" value="2"> 套餐
                                                 <span></span>
                                             </label>
+                                            <label class="mt-radio">
+                                                <input type="radio" name="type" value="3"> 充值
+                                                <span></span>
+                                            </label>
                                         </div>
                                         <span class="help-block"> 套餐与账号有效期有关，流量包只扣可用流量，不影响有效期 </span>
                                     </div>

resources/views/shop/editGoods.blade.php

@@ -51,6 +51,10 @@
                                                 <input type="radio" name="type" value="2" @if($goods->type == 2) checked @endif disabled> 套餐
                                                 <span></span>
                                             </label>
+                                            <label class="mt-radio">
+                                                <input type="radio" name="type" value="3" @if($goods->type == 3) checked @endif disabled> 充值
+                                                <span></span>
+                                            </label>
                                         </div>
                                     </div>
                                 </div>

resources/views/shop/goodsList.blade.php

@@ -56,7 +56,15 @@
                                         <tr class="odd gradeX">
                                             <td> {{$goods->id}} </td>
                                             <td> {{$goods->name}} </td>
-                                            <td> {{$goods->type == 1 ? '流量包' : '套餐'}} </td>
+                                            <td>
+                                                @if($goods->type == 1)
+                                                    流量包
+                                                @elseif($goods->type == 2)
+                                                    套餐
+                                                @else
+                                                    充值
+                                                @endif
+                                            </td>
                                             <!-- <td> @if($goods->logo) <a href="{{$goods->logo}}" class="fancybox"><img src="{{$goods->logo}}"/></a> @endif </td> -->
                                             <td> {{$goods->traffic_label}} </td>
                                             <td> {{$goods->price}}元 </td>

resources/views/user/index.blade.php

@@ -291,6 +291,21 @@
                                     <div class="col-md-6">
                                         <select class="form-control" name="charge_type" id="charge_type">
                                             <option value="1" selected>{{trans('home.coupon_code')}}</option>
+                                            <option value="2" selected >{{trans('home.online_pay')}}</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="online_pay" class="col-md-4 control-label">充值金额</label>
+                                    <div class="col-md-6">
+                                        <select class="form-control" name="online_pay" id="online_pay">
+                                            @if($goodsList->isEmpty())
+                                                <option value = "0" >尚未开通在线支付充值</option>
+                                            @else
+                                                @foreach($goodsList as $key => $goods)
+                                                    <option value = "{{$goods->id}}" >充值{{$goods->price}}元</option>
+                                                @endforeach
+                                            @endif
                                         </select>
                                     </div>
                                 </div>
@@ -405,7 +420,20 @@
             var _token = '{{csrf_token()}}';
             var charge_type = $("#charge_type").val();
             var charge_coupon = $("#charge_coupon").val();
+            var online_pay = $("#online_pay").val();
+            
+            if (charge_type == '2' && (online_pay == '0')) {
+                $("#charge_msg").show().html("本站尚未开通在线支付充值");
+                window.location.href = '/';
+                return false;
+            }
 
+            if (charge_type == '2') {
+                $("#charge_msg").show().html("正在跳转支付界面");
+                window.location.href = '/buy/' + online_pay;
+                return false;
+            }
+            
             if (charge_type == '1' && (charge_coupon == '' || charge_coupon == undefined)) {
                 $("#charge_msg").show().html("{{trans('home.coupon_not_empty')}}");
                 $("#charge_coupon").focus();