充值卡退补

app/Http/Controllers/Admin/OrderController.php

@@ -1257,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();
                         //更新余额
@@ -1412,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]);
                 }
 
@@ -1504,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]);
                 }
 
@@ -1880,6 +1884,7 @@ 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);
@@ -1904,8 +1909,11 @@ class OrderController extends Controller
                         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);
@@ -1927,9 +1935,9 @@ class OrderController extends Controller
         $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($refund_price>0){
                 //补钱,判断充值卡余额           
-                if($balance + $refund_price < 0){
+                if($balance - $refund_price < 0){
                     return false;
                 }
             }
@@ -1939,14 +1947,14 @@ class OrderController extends Controller
             $consum['money'] = $refund_price;
             $consum['type'] = 1;
             DB::table('customer_consum')->insert($consum);
-            $balance = $balance + $refund_price;
+            $balance = $balance - $refund_price;
         }elseif($order_refund->money != $refund_price){
             //已有退款，更变le 退款钱数
-            if($balance + $refund_price - $order_refund->money <0 ){
+            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;
+            $balance = $balance - $refund_price + $order_refund->money;
         }
    
         CustomerInfo::where('phone', $order_consum->phone)->update(['balance' => $balance]);

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/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>