Merge branch 'sh/31'

app/Http/Controllers/Admin/OrderController.php

@@ -164,6 +164,8 @@ class OrderController extends Controller
                 $v['refund_type'] = '付款码支付';
             }elseif($v['refund_type'] == 3){
                 $v['refund_type'] = '个体户支付';
+            }elseif($v['refund_type'] == 4){
+                $v['refund_type'] = '充值卡支付';
             }else{
                 $v['refund_type'] = '';
             }  
@@ -869,7 +871,7 @@ class OrderController extends Controller
         $order = Order::findOrFail($id);
         $order = json_decode(json_encode($order), true);
         // 临时处理，只能用自己充值卡
-        //$order['deposit_phone'] = $order['receiverMobile'];
+        $order['deposit_phone'] = $order['receiverMobile'];
         $order['receiverMobile'] = substr($order['receiverMobile'], 0, 3).'****'.substr($order['receiverMobile'], 7);
         $order['goods'] = '';
         $order_skus = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->whereNull('gift_id')->lists('num','sku_id');
@@ -891,10 +893,10 @@ class OrderController extends Controller
             $order['goods'] = $goods;
         }
 
-        $deposit_phone = '';
+        $deposit_phone = $order['deposit_phone'];
         if($order['payment_type'] == 4){
             $consum = CustomerConsum::select('phone')->where('order_id', $id)->first();
-            $deposit_phone = isset($consum->phone) ? $consum->phone : '';
+            $deposit_phone = isset($consum->phone) ? $consum->phone : $order['deposit_phone'];
         }
 
         //下单当月礼品
@@ -1255,7 +1257,7 @@ class OrderController extends Controller
                         $customerInfo->balance = $customerInfo->balance - $order['receivedAmount'];
                         $customerInfo->save();
                     }elseif($old_order->receivedAmount != $order['receivedAmount']){
-                        $consum = CustomerConsum::where('order_id', $id)->first();                       
+                        $consum = CustomerConsum::where('order_id', $id)->where('type', 0)->first();                       
                         $consum->money = $order['receivedAmount'];
                         $consum->save();
                         //更新余额
@@ -1410,11 +1412,13 @@ class OrderController extends Controller
                 if($order->payment_type == 4){
                     //查询消费记录/卡号
                     $consum = CustomerConsum::where('order_id', $id)->where('is_del', 0)->first();
+                    //查询需要返还消费钱数
+                    $fan_money = CustomerConsum::where('order_id', $id)->where('is_del', 0)->sum('money');
                     //消费记录设为删除
                     CustomerConsum::where('order_id', $id)->update(['is_del'=>1]);
                     //余额返还
                     $cust = CustomerInfo::select('balance')->where('phone', $consum->phone)->first();
-                    $balance = $cust->balance + $order->receivedAmount;
+                    $balance = $cust->balance + $fan_money;
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
 
@@ -1502,11 +1506,13 @@ class OrderController extends Controller
                 if($order->payment_type == 4){
                     //查询消费记录/卡号
                     $consum = CustomerConsum::where('order_id', $id)->where('is_del', 0)->first();
+                    //查询需要返还消费钱数
+                    $fan_money = CustomerConsum::where('order_id', $id)->where('is_del', 0)->sum('money');
                     //消费记录设为删除
                     CustomerConsum::where('order_id', $id)->update(['is_del'=>1]);
                     //余额返还
                     $cust = CustomerInfo::select('balance')->where('phone', $consum->phone)->first();
-                    $balance = $cust->balance + $order->receivedAmount;
+                    $balance = $cust->balance + $fan_money;
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
 
@@ -1878,14 +1884,36 @@ class OrderController extends Controller
             }else{
                 $data['is_refund'] = 1;
                 if(!$order->refund_type) $data['refund_type'] = 1;
+                if(!$order->refund_time) $data['refund_time'] = date('Y-m-d');
+                if($order->refund_type == 4 && $refund_price != $order->refund_price){
+                    // 充值退补
+                    $res = $this->depositRefund($id, $refund_price);
+                    if(!$res){
+                        return 0;
+                    }
+                }
             }
             $data['refund_price'] = $refund_price;
         }
         if(isset($refund_type)){
             if(empty($refund_type)){
                 $refund_type = null;                
+            }elseif($refund_type == 4){
+                //判断是否是充值卡支付方式
+                if($order->payment_type != 4){
+                    return 0;
+                }
+                if($order->refund_price != 0 && $order->refund_type != 4){
+                    $res = $this->depositRefund($id, $order->refund_price);
+                    if(!$res){
+                        return 0;
+                    }
+                }
+            }elseif($refund_type != 4 && $order->refund_type == 4){
+                return 0;
             }
             $data['refund_type'] = (int)$refund_type;
+            if(!$order->refund_time) $data['refund_time'] = date('Y-m-d');
         }
         if($id>0 && !empty($data)){
             $res = Order::where('id', $id)->update($data);
@@ -1894,6 +1922,45 @@ class OrderController extends Controller
         return 1;
     }
 
+    /**
+     * 充值卡退补
+     */
+    public function depositRefund($order_id, $refund_price){
+        //查消费记录
+        $order_consum = DB::table('customer_consum')->where('is_del', 0)->where('order_id', $order_id)->where('type', 0)->first();
+        if(empty($order_consum)){
+            return false;
+        }
+        //查看是否已有退补记录
+        $order_refund = DB::table('customer_consum')->where('is_del', 0)->where('order_id', $order_id)->where('type', 1)->first();
+        $balance = CustomerInfo::where('phone', $order_consum->phone)->pluck('balance');
+        if(empty($order_refund)){
+            if($refund_price>0){
+                //补钱,判断充值卡余额           
+                if($balance - $refund_price < 0){
+                    return false;
+                }
+            }
+            $consum = array();
+            $consum['phone'] = $order_consum->phone;
+            $consum['order_id'] = $order_id;
+            $consum['money'] = $refund_price;
+            $consum['type'] = 1;
+            DB::table('customer_consum')->insert($consum);
+            $balance = $balance - $refund_price;
+        }elseif($order_refund->money != $refund_price){
+            //已有退款，更变le 退款钱数
+            if($balance - $refund_price + $order_refund->money <0 ){
+                return false;
+            }
+            DB::table('customer_consum')->where('id', $order_refund->id)->update(['money'=>$refund_price]);
+            $balance = $balance - $refund_price + $order_refund->money;
+        }
+   
+        CustomerInfo::where('phone', $order_consum->phone)->update(['balance' => $balance]);
+        return true;
+    }
+
     public function warehouse_export(Request $request){
         
         $self_role = session('role_name');        

resources/views/deposit/consumList.blade.php

@@ -14,8 +14,9 @@
                 <tr class="text-c">
                     {{--<th width="25"><input type="checkbox" name="" value=""></th>--}}
                     <th width="10%">账号</th>                   
-                    <th width="10%">消费金额</th>
+                    <th width="10%">消费(或退补)金额</th>
                     <th width="10%">订单ID</th>
+                    <th width="10%">类型</th>
                     <th width="10%">时间</th>
                 </tr>
                 </thead>
@@ -27,6 +28,7 @@
                         <td class="text-c">{{$a['phone']}}</td>
                         <td class="text-c">{{$a['money']}}</td>
                         <td class="text-c">{{$a['order_id']}}</td>
+                        <td class="text-c">@if($a['type'] == 1) 退补 @else 消费 @endif</td>
                         <td class="text-c">{{$a['create_time']}}</td>
                         
                     </tr>

resources/views/order/orderedit.blade.php

@@ -311,9 +311,8 @@
             <div class="row cl"  style="display: none" id='deposit_div'>
                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'> </font>充值卡号：</label>
-                <div class="formControls col-xs-6 col-sm-6">
-                    <input id='deposit_phone_i' type="text" class="input-text" value="{{old('deposit_phone')}}" placeholder="*默认收货人手机号" disabled name="deposit_phone_i">
-                    <input id='deposit_phone' type="hidden" class="input-text" value="{{old('deposit_phone')}}" placeholder="" name="deposit_phone">
+                <div class="formControls col-xs-6 col-sm-6">                  
+                    <input id='deposit_phone' type="text" class="input-text" value="{{old('deposit_phone')}}" onkeyup="getBalance()" placeholder="" name="deposit_phone">
                     <font color='red' id='vip_pay'></font>
                 </div>
             </div>

resources/views/order/orderlist.blade.php

@@ -179,6 +179,7 @@
                                     <option value='1'>微信支付</option>
                                     <!--option value='2'>付款码支付</option-->
                                     <option value='3'>个体户支付</option>
+                                    <option value='4'>充值卡支付</option>
                                 </select>
                                 <span class="sort_icon" hidden  onClick='change_refund_type_click("{{$a['id']}}","{{$a['cost']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
                             </td>
@@ -718,8 +719,11 @@
             $.ajax({
                 url: '/admin/order/editLogisticsId?id='+id+'&refund_price='+refund_price,
                 type: 'get',
-                dateType: 'json',
                 success:function(msg){
+                    if(msg == 0){
+                        alert('操作有误');
+                        return false;
+                    }
                     $("#refund_price_1"+id).html(refund_price);
                     if(!refund_type){
                         $("#refund_type_1"+id).html('微信支付');
@@ -741,8 +745,11 @@
             $.ajax({
                 url: '/admin/order/editLogisticsId?id='+id+'&refund_type='+refund_type,
                 type: 'get',
-                dateType: 'json',
                 success:function(msg){
+                    if(msg == 0){
+                        alert('操作有误');
+                        return false;
+                    }
                     if(refund_type==1){
                         refund_type = '微信支付';
                     }
@@ -752,6 +759,9 @@
                     if(refund_type==3){
                         refund_type = '个体户支付';
                     }
+                    if(refund_type==4){
+                        refund_type = '充值卡支付';
+                    }
                     if(refund_type==0){
                         refund_type = '';
                     }

resources/views/order/predictorderlist.blade.php

@@ -160,6 +160,7 @@
                                     <option value='1'>微信支付</option>
                                     <!--option value='2'>付款码支付</option-->
                                     <option value='3'>个体户支付</option>
+                                    <option value='4'>充值卡支付</option>
                                 </select>
                                 <span class="sort_icon" hidden  onClick='change_refund_type_click("{{$a['id']}}","{{$a['cost']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
                             </td>

resources/views/statistics/teamFinanceTotal.blade.php

@@ -45,6 +45,9 @@
                     <th width="4%">个体户退补单数</th>
                     <th width="4%">个体户退补差价</th>
                     <th width="5%">个体户实际金额</th>
+                    <th width="4%">充值卡退补单数</th>
+                    <th width="4%">充值卡退补差价</th>
+                    <th width="5%">充值卡实际金额</th>
                     <th width="4%">发货单数</th>
                     <th width="5%">货品成本</th>
                     <th width="5%">物流成本</th>
@@ -75,6 +78,9 @@
                             <td>{{$a['gth_refund_count']}}</td>
                             <td>{{$a['gth_refund_price']}}</td>
                             <td>{{$a['gth_true_amount']}}</td>
+                            <td>{{$a['czk_refund_count']}}</td>
+                            <td>{{$a['czk_refund_price']}}</td>
+                            <td>{{$a['czk_true_amount']}}</td>
                             <td>{{$a['send_count']}}</td>
                             <td>{{$a['cost']}}</td>
                             <td>{{$a['freight_cost']}}</td>