库存成本修改冻结库存逻辑

app/Console/Commands/SyncMjWarehouse.php

@@ -64,7 +64,12 @@ class SyncMjWarehouse extends Command {
             if($cost){
                 $quantity = $cost->is_weigh == 1 ? $sku['quantity']/2 : $sku['quantity']; //对应规格数量
                 //实际库存=库存-冻结
-                $real_quantity = $sku['quantity'] - $sku['fi'];
+                if(isset($sku['fi']) && ($sku['fi'] < 0)){
+                    $real_quantity = $sku['quantity'];
+                } else {
+                    $real_quantity = $sku['quantity'] - $sku['fi'];
+                }
+
                 $real_quantity = $cost->is_weigh == 1 ? $real_quantity/2 : $real_quantity; //对应规格数量
                 $up['quantity'] = $quantity;
                 $up['totalCost'] = isset($sku['totalCost']) ? $sku['totalCost'] : 0;

app/Http/Controllers/Admin/CustomerDepositController.php

@@ -956,11 +956,11 @@ class CustomerDepositController extends Controller
             $page = 1;
         }
         $offset = ($page-1) * $pageSize;
-        $count = CustomerVip::select(DB::raw('sum(`price`) as total_price,count(1) as number'),'team_id','pay_date')
+        $count = CustomerVip::select(DB::raw('sum(`price`) as total_price,count(1) as number'),'team_id','pay_date','payment_type')
             ->where(function($query) use($date,$team_id){
                 if($date) $query->where('pay_date',$date);
                 if($team_id != 0) $query->where('team_id',$team_id);
-            })->where('is_del',0)->groupBy('pay_date','team_id')->get();
+            })->where('is_del',0)->groupBy('pay_date','team_id','payment_type')->get();
         $count = count($count);
         if ($count > 1) {
             // 总页数
@@ -969,17 +969,24 @@ class CustomerDepositController extends Controller
             // 总页数
             $pages = 1;
         }
-        $list = CustomerVip::select(DB::raw('sum(`price`) as total_price,count(1) as number'),'team_id','pay_date')
+        $list = CustomerVip::select(DB::raw('sum(`price`) as total_price,count(1) as number'),'team_id','pay_date','payment_type')
             ->where(function($query) use($date,$team_id){
                 if($date) $query->where('pay_date',$date);
                 if($team_id) $query->where('team_id',$team_id);
-            })->where('is_del',0)->groupBy('pay_date','team_id')->orderBy('pay_date','desc')->offset($offset)->limit($pageSize)->get();
+            })->where('is_del',0)->groupBy('pay_date','team_id','payment_type')->orderBy('pay_date','desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($list),true);
 
         $result = array_map(function($value){
             $item = $value;
             $team = DB::table('teams')->where('id',$item['team_id'])->first();
             $item['team_name'] = $team->name;
+            if($item['payment_type'] == 1){
+                $item['payment'] = '微信支付';
+            } else if($item['payment_type'] == 3){
+                $item['payment'] = '个体户支付';
+            } else {
+                $item['payment'] = '';
+            }
             return $item;
         },$result);
 
@@ -1007,22 +1014,29 @@ class CustomerDepositController extends Controller
     public function membershipReportExport(Request $request){
         $date = $request->input('date');
         $team_id = $request->input('team_id');
-        $list = CustomerVip::select(DB::raw('sum(`price`) as total_price,count(1) as number'),'team_id','pay_date')
+        $list = CustomerVip::select(DB::raw('sum(`price`) as total_price,count(1) as number'),'team_id','pay_date','payment_type')
             ->where(function($query) use($date,$team_id){
                 if($date) $query->where('pay_date',$date);
                 if($team_id) $query->where('team_id',$team_id);
-            })->where('is_del',0)->groupBy('pay_date','team_id')->orderBy('pay_date','desc')->get();
+            })->where('is_del',0)->groupBy('pay_date','team_id','payment_type')->orderBy('pay_date','desc')->get();
         $list = json_decode(json_encode($list),true);
 
         $result = array_map(function($value){
             $item = $value;
             $team = DB::table('teams')->where('id',$item['team_id'])->first();
             $item['team_name'] = $team->name;
+            if($item['payment_type'] == 1){
+                $item['payment'] = '微信支付';
+            } else if($item['payment_type'] == 3){
+                $item['payment'] = '个体户支付';
+            } else {
+                $item['payment'] = '';
+            }
             return $item;
         },$list);
 
-        $indexKey = ['pay_date','team_name','number','total_price'];
-        $title = ['日期', '团队', '新增会员数', '充值金额'];
+        $indexKey = ['pay_date','team_name','number','total_price','payment'];
+        $title = ['日期', '团队', '新增会员数', '充值金额','充值方式'];
         $filename = 'customer_export_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }

resources/views/customer/vipCustomerReport.blade.php

@@ -30,6 +30,7 @@
                     <th width="10%">团队</th>
                     <th width="10%">新增会员数</th>
                     <th width="10%">充值金额</th>
+                    <th width="10%">充值方式</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -40,6 +41,7 @@
                             <td class="text-c">{{$a['team_name']}}</td>
                             <td class="text-c">{{$a['number']}}</td>
                             <td class="text-c">{{$a['total_price']}}</td>
+                            <td class="text-c">{{$a['payment']}}</td>
                         </tr>
                     @endforeach
                 @endif