h5页面添加订单

app/Error.php

@@ -13,7 +13,9 @@ class Error
     public static $errCodes = [
 
         0 => "成功",
-        1001 => '未分配销售'
+        1001 => '未分配销售',
+
+        2001 => '参数有误',
         
     ];
     /**

app/Http/Controllers/Api/OrderController.php

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Log;
+use App\Admin;
 use App\Order;
 use App\Oplog;
 use App\RedisModel;
@@ -76,7 +77,7 @@ class OrderController extends Controller {
                     
                 }
             }
-            $v['goods'] = $goods;
+            $v['skus'] = $goods;
             
             #加粉时间
             $fanTime = DB::table('customers')->select('fanTime')->where('phone', $v['receiverMobile'])->first();
@@ -101,52 +102,60 @@ class OrderController extends Controller {
      */
     public function orderstore(Request $request)
     {       
-        $this->validate($request, [
-            'customerName'           => 'required|between:1,6', 
-            'receiverName'           => 'required|between:1,6', 
-            'receiverMobile'           => 'required|regex:/^1[3456789]\d{9}$/',  
-            'fanTime'           => 'required|date', 
-            'receiverState'           => 'required|between:1,5', 
-            'receiverCity'           => 'required|between:1,10', 
-            'receiverAddress'           => 'required', 
-            'delivery_date'           => 'required|date', 
-            'receivedAmount'           => 'required|numeric|min:1',    
-            'skus'                => 'required'
-        ], [                  
-            'customerName.required'           => '买家姓名不能为空',                   
-            'customerName.between'           => '买家姓名不能超过6个字符',                   
-            'receiverName.required'           => '收货人不能为空', 
-            'receiverName.between'           => '收货人不能超过6个字符',                  
-            'receiverMobile.required'           => '收货人手机号不能为空',                   
-            'receiverMobile.regex'           => '收货人手机号格式有误',                   
-            'fanTime.required'           => '加粉时间不能为空',              
-            'receiverState.required'           => '省不能为空',   
-            'receiverState.between'           => '省填写有误',   
-            'receiverCity.required'           => '市不能为空',   
-            'receiverCity.between'           => '市填写有误',   
-            'receiverAddress.required'           => '详细地址不能为空',             
-            'delivery_date.required'           => '预发货时间不能为空',     
-            'receivedAmount.required'           => '付款金额不能为空',                   
-            'receivedAmount.numeric'           => '付款金额必须为数字',                                     
-        ]);
+        $admin_id = (int)$request->input('admin_id'); 
+        if(empty($admin_id)){
+            return self::returnValue(['msg'=>'登录过期'], 2001); 
+        }
+        $phone = $request->input('receiverMobile'); 
+        if(!preg_match('/^1\d{10}$/', $phone)){
+            return self::returnValue(['msg'=>'手机号格式有误'], 2001); 
+        }
+        $customerName = $request->input('customerName');
+        if(empty($customerName)){
+            return self::returnValue(['msg'=>'买家姓名不能为空'], 2001); 
+        } 
+        $receiverName = $request->input('receiverName'); 
+        if(empty($receiverName)){
+            return self::returnValue(['msg'=>'收货人姓名不能为空'], 2001); 
+        } 
+        $receiverState = $request->input('receiverState'); 
+        if(empty($receiverState)){
+            return self::returnValue(['msg'=>'省份不能为空'], 2001); 
+        } 
+        $receiverCity = $request->input('receiverCity'); 
+        if(empty($receiverCity)){
+            return self::returnValue(['msg'=>'市不能为空'], 2001); 
+        }
+        $receiverAddress = $request->input('receiverAddress'); 
+        if(empty($receiverAddress)){
+            return self::returnValue(['msg'=>'详细地址不能为空'], 2001); 
+        }
+        $delivery_date = $request->input('delivery_date'); 
+        if(empty($delivery_date)){
+            return self::returnValue(['msg'=>'预发货时间不能为空'], 2001); 
+        }
+        $receivedAmount = $request->input('receivedAmount'); 
+        if(empty($receivedAmount)){
+            return self::returnValue(['msg'=>'实付金额不能为空'], 2001); 
+        }
+        $skus = $request->input('skus'); 
+        if(empty($skus)){
+            return self::returnValue(['msg'=>'必须添加商品'], 2001);
+        }
+        $payment_type = (int)$request->input('payment_type'); 
+        if(empty($payment_type)){
+            return self::returnValue(['msg'=>'必选支付方式'], 2001);
+        }
 
-        //redis防重复数据
-        $phone = $request->input('receiverMobile');       
+        /*     
         $redisKey = 'seafood.order_phone_add.'.$phone;
         $res = RedisModel::setnx($redisKey, 1);
         if( $res == 0 ){
             $msg = '操作过于频繁，请一分钟后继续操作';
-            return redirect('/admin/order/index')->with('info', $msg);
+            return self::returnValue(['msg'=>$msg], 2001);
         }
         $res = RedisModel::expire( $redisKey, 60 );
-        
-        $skus = $request->input('skus');
-        $warehouse = (int)$request->input('warehouse');
-        if($warehouse == 3 && empty($skus)){
-            $msg = 'C仓必须添加卖家云商品';
-            return redirect('/admin/order/index')->with('info', $msg);
-        }
-    
+        */
         //数据库-新增数据
         $order = array();
         $order['eshopCode'] = config('constants.ESHOP_CODE'); //默认
@@ -187,6 +196,7 @@ class OrderController extends Controller {
         //商品信息
         $skus = $request->input('skus');
         $gnum = $request->input('gnum');
+        $order_goods = array();
         if(!empty($skus)){
             foreach($skus as $k=>$sku_id){
                 $sku_info = GoodsSkus::where('id', $sku_id)->first();
@@ -199,30 +209,19 @@ class OrderController extends Controller {
                 #商品名称
                 $params['goodsName'] = $goods_info->name;
                 $params['propertiesName'] = $sku_info->propsName;
-                //$params['goodsName'] = '海钓黄翅鱼';//$goods->code; 
                 $params['price'] = $sku_info->price;
                 
                 $params['quantity'] = $gnum[$k];
                 $params['discountFee'] = 0;
                 $params['adjustFee'] = 0;
                 $params['refundStatus'] = '正常';
-                $order['skuList'][] = $params;
+                $order_goods[] = $params;
             }
         }
 
-        //卖家云添加订单 ->改为审核通过再同步卖家云
-        //$mj_add = Order::mjOrderAdd($order);
-
         //本系统订单额外参数
-        $order['goods_note'] = trim($request->input('goods_note'));
-        if($request->input('cost')) $order['cost'] = trim($request->input('cost'));  //成本
-        $order['logistics_id'] = trim($request->input('logistics_id')); //物流单号
-        $order['is_refund'] = (int)$request->input('is_refund'); //是否退过单
-        if($request->input('refund_price')) $order['refund_price'] = trim($request->input('refund_price')); //应该退补差价
-        //$order['is_fugou'] = (int)$request->input('is_fugou'); //是否复购
-        $order['warehouse'] = (int)$request->input('warehouse'); //仓库
+        $order['warehouse'] = 3; //仓库
         $order['delivery_date'] = !empty($request->input('delivery_date')) ? $request->input('delivery_date') : date('Y-m-d'); //发货日期
-        $order['order_status'] = (int)$request->input('order_status');
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
        
         //充值卡验证余额
@@ -231,10 +230,12 @@ class OrderController extends Controller {
             $customerInfo = CustomerInfo::where('phone', $deposit_phone)->first();
             $balance = isset($customerInfo->balance) ? $customerInfo->balance : 0;
             if($balance < $order['receivedAmount']){
-                //余额不足
-                return redirect('/admin/order/index')->with('info', '充值卡余额不足');
+                $msg = '余额不足';
+                return self::returnValue(['msg'=>$msg], 2003);
             }
         }
+
+        $admin_id = (int)$request->input('admin_id');
         DB::beginTransaction();
         try{      
 
@@ -247,7 +248,7 @@ class OrderController extends Controller {
             $customers['receiverStreet'] = $order['receiverStreet'];
             $customers['receiverAddress'] = $order['receiverAddress'];
 
-            $if_e = DB::table('customers')->select('id')->where('phone', $order['receiverMobile'])->first();
+            $if_e = DB::table('customers')->select('id', 'fanTime')->where('phone', $order['receiverMobile'])->first();
             if(isset($if_e->id)){               
                 $customers['is_fugou'] = 1;
                 $order['is_fugou'] = 1;
@@ -256,29 +257,18 @@ class OrderController extends Controller {
                 $customers['phone'] = $order['receiverMobile'];                
                 $customers['is_fugou'] = 0;
                 $customers['fanTime'] = $request->input('fanTime');
-                $customers['admin_id'] = session('admin_id');
+                $customers['admin_id'] = $admin_id;
                 $in_c = DB::table('customers')->insert($customers);
             }
-
-            if(!empty($skus)){
-                $order_goods = $order['skuList'];
-                unset($order['skuList']);
-            }
-           
-            //$order['orderCode'] = $mj_add['order']['code']; 
-            $admin_id = (int)$request->input('admin_id');   
-            if($admin_id>0){
-                $admin_info = DB::table('admin')->select('realname', 'team_id')->where('id', $admin_id)->first();
-                $order['admin_id'] = $admin_id;
-                $order['admin_name'] = $admin_info->realname;
-                $order['team_id'] = $admin_info->team_id;
-            }else{
-                $order['admin_id'] = session('admin_id');
-                $order['admin_name'] = session('real_name');
-                $order['team_id'] = session('team_id');
-            }
+               
+            $admin_info = DB::table('admin')->select('realname', 'team_id')->where('id', $admin_id)->first();
+            $order['admin_id'] = $admin_id;
+            $order['admin_name'] = $admin_info->realname;
+            $order['team_id'] = $admin_info->team_id;
+            
             //新加is_able 9.4之前粉丝不参与销售复购统计
             $fanTime = $request->input('fanTime');
+            if(!$fanTime && isset($if_e->id)) $fanTime = $if_e->fanTime;
             if($fanTime < '2019-09-04'){
                 $order['is_able'] = 0;
             }
@@ -309,8 +299,8 @@ class OrderController extends Controller {
                     $customerInfo->save();
                 }
                 #记录操作日志
-                $self_id = session('admin_id');
-                $self_name = session('real_name');
+                $self_id = $admin_id;
+                $self_name = $admin_info->realname;
                 if($order['status'] == 0){
                     $status_text = '仅录入';
                 }else{
@@ -321,9 +311,6 @@ class OrderController extends Controller {
                 $tables = 'order';
                 $data_id = $res;
                 Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
-
-                #如果提交审核，发短信
-                //if( $order['status'] == 1 ) $this->sendRemind($self_id, $res, 1);
             }
             
             DB::commit();
@@ -331,8 +318,197 @@ class OrderController extends Controller {
             DB::rollback();
         }   
 
-        return redirect('/admin/order/index')->with('info', '添加成功'); 
+        return self::returnValue(['msg'=>'添加成功']);
         
     }
 
+    /**
+     * 根据手机号获取默认地址信息
+     *
+     */
+    public function getAddress(Request $request){
+        $phone = $request->input('phone');
+        if(!preg_match('/^1\d{10}$/', $phone)){
+            return self::returnValue([],2001);
+        }
+
+        $result = DB::table('customers')->select('receiverState', 'receiverCity', 'receiverAddress', 'fanTime')->where('phone', $phone)->first();
+        $result = json_decode(json_encode($result), true);
+        return self::returnValue(['data'=>$result]);
+    }
+
+    //获余额
+    public function getBalance(Request $request){
+        $phone = $request->input('phone');
+        if(!preg_match('/^1\d{10}$/', $phone)){
+            return self::returnValue([],2001);
+        }
+        $result = CustomerInfo::where('phone', $phone)->pluck('balance');
+        if(empty($result)) $result = 0;
+        return self::returnValue(['balance'=>$result]);
+    }
+
+     /**
+     * 分组管理-进行编辑操作
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function orderupdate(Request $request)
+    {   
+        $admin_id = (int)$request->input('admin_id'); 
+        if(empty($admin_id)){
+            return self::returnValue(['msg'=>'登录过期'], 2001); 
+        }
+        $id = (int)$request->input('id'); 
+        if(empty($id)){
+            return self::returnValue(['msg'=>'订单id有误'], 2001); 
+        }
+        $phone = $request->input('receiverMobile'); 
+        if(!preg_match('/^1\d{10}$/', $phone)){
+            return self::returnValue(['msg'=>'手机号格式有误'], 2001); 
+        }
+        $customerName = $request->input('customerName');
+        if(empty($customerName)){
+            return self::returnValue(['msg'=>'买家姓名不能为空'], 2001); 
+        } 
+        $receiverName = $request->input('receiverName'); 
+        if(empty($receiverName)){
+            return self::returnValue(['msg'=>'收货人姓名不能为空'], 2001); 
+        } 
+        $receiverState = $request->input('receiverState'); 
+        if(empty($receiverState)){
+            return self::returnValue(['msg'=>'省份不能为空'], 2001); 
+        } 
+        $receiverCity = $request->input('receiverCity'); 
+        if(empty($receiverCity)){
+            return self::returnValue(['msg'=>'市不能为空'], 2001); 
+        }
+        $receiverAddress = $request->input('receiverAddress'); 
+        if(empty($receiverAddress)){
+            return self::returnValue(['msg'=>'详细地址不能为空'], 2001); 
+        }
+        $delivery_date = $request->input('delivery_date'); 
+        if(empty($delivery_date)){
+            return self::returnValue(['msg'=>'预发货时间不能为空'], 2001); 
+        }
+        $receivedAmount = $request->input('receivedAmount'); 
+        if(empty($receivedAmount)){
+            return self::returnValue(['msg'=>'实付金额不能为空'], 2001); 
+        }
+        $skus = $request->input('skus'); 
+        if(empty($skus)){
+            return self::returnValue(['msg'=>'必须添加商品'], 2001);
+        }
+        $payment_type = (int)$request->input('payment_type'); 
+        if(empty($payment_type)){
+            return self::returnValue(['msg'=>'必选支付方式'], 2001);
+        }
+      
+        //更新数据
+        $order = array();
+        $order['customerName'] = trim($request->input('customerName')); //买家名称
+        $order['receiverName'] = trim($request->input('receiverName')); //收件人
+        if(preg_match('/^1\d{10}$/', $phone)) $order['receiverMobile'] = $phone; //收件人手机
+        $order['receiverState'] = trim($request->input('receiverState')); //省份
+        $order['receiverCity'] = trim($request->input('receiverCity')); //市
+        
+        $order['receiverState'] = str_replace(['省', '市'], '', $order['receiverState']);
+        $order['receiverCity'] = str_replace('市', '', $order['receiverCity']);
+
+        $order['receiverAddress'] = trim($request->input('receiverAddress')); //详细地址
+        $order['receivedAmount'] = trim($request->input('receivedAmount')); //付款金额        
+        $order['buyerMemo'] = trim($request->input('buyerMemo', '')); // 买家备注
+        $order['sellerMemo'] = trim($request->input('sellerMemo', '')); // 卖家备注
+        $order['delivery_date'] = !empty($request->input('delivery_date')) ? $request->input('delivery_date') : date('Y-m-d'); //发货日期
+        $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
+
+        $order['status'] = (int)$request->input('status');
+        $order['should_amount'] = $request->input('should_amount');
+        if(!$order['should_amount']) $order['should_amount'] = null;
+        
+        $id = (int)$request->input('id');
+        //获取订单原信息
+        $old_order = DB::table('order')->where('id', $id)->first();
+        // ++++++充值卡验证余额逻辑 +++++++ //
+        if($order['payment_type'] == 4){
+            $deposit_phone = $phone;//$request->input('deposit_phone');
+            if($old_order->payment_type != 4){                            
+                $customerInfo = CustomerInfo::where('phone', $deposit_phone)->first();
+                $balance = isset($customerInfo->balance) ? $customerInfo->balance : 0 ;
+                if($balance < $order['receivedAmount']){
+                    //余额不足
+                    return self::returnValue(['msg'=>'充值卡余额不足'], 2001); 
+                }               
+            }elseif($old_order->receivedAmount != $order['receivedAmount']){              
+                $customerInfo = CustomerInfo::where('phone', $deposit_phone)->first();
+                $balance = $customerInfo->balance;
+                if( $balance < $order['receivedAmount']-$old_order->receivedAmount ){
+                    //余额不足
+                    return self::returnValue(['msg'=>'充值卡余额不足'], 2001);             
+                }
+            }
+        }
+
+        $today_date = date('Y-m-d');
+        DB::beginTransaction();
+        try{
+            $res = DB::table('order')->where('id', $id)->update($order); 
+            //商品信息
+            $skus = $request->input('skus');
+            $gnum = $request->input('gnum');
+            if(empty($skus)) $skus = [];
+            //先删除
+            $del_re = DB::table('order_goods_skus')->where('order_id', $id)->whereNotIn('sku_id', $skus)->update(['is_del'=>1]);
+            if(!empty($skus)){            
+                //再同步
+                foreach($skus as $k=>$sku_id){
+                    $sku_info = GoodsSkus::select('goodsCode', 'price', 'propsName','is_weigh')->where('id', $sku_id)->first();
+                    $sync_re = OrderGoodsSkus::updateOrCreate(['order_id'=>$id, 'sku_id'=>$sku_id, 'goods_id'=>$sku_info->goodsCode], ['num'=>$gnum[$k], 'is_del'=>0, 'price'=>$sku_info->price]);
+                }
+
+            }
+  
+            if($res){        
+                #新加逻辑，若付款方式为充值卡/消费记录
+                if($order['payment_type'] == 4 ){
+                    if($old_order->payment_type != 4 ){
+                        $consum = new CustomerConsum();
+                        $consum->phone = $deposit_phone;
+                        $consum->order_id = $id;
+                        $consum->money = $order['receivedAmount'];
+                        $consum->save();
+                        //更新余额                   
+                        $customerInfo->balance = $customerInfo->balance - $order['receivedAmount'];
+                        $customerInfo->save();
+                    }elseif($old_order->receivedAmount != $order['receivedAmount']){
+                        $consum = CustomerConsum::where('order_id', $id)->first();                       
+                        $consum->money = $order['receivedAmount'];
+                        $consum->save();
+                        //更新余额
+                        $add_amount = $order['receivedAmount'] - $old_order->receivedAmount; //新增消费额，有可能为负数
+                        $customerInfo->balance = $customerInfo->balance - $add_amount;
+                        $customerInfo->save();
+                    }
+                }
+
+                #记录操作日志
+                $self_id = (int)$request->input('admin_id');
+                $self_name = Admin::where('id', $self_id)->pluck('realname');            
+                $context = "修改订单";
+                $type = 0; 
+                $tables = 'order';
+                $data_id = $id;
+                Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
+
+            }  
+
+            DB::commit();
+        }catch (Exception $e){
+            DB::rollback();
+            Log::errorLog($request,['error'=>$e->getMessage()],"order/update",0,'');
+            return self::returnValue(['msg'=>$e->getMessage()], 2001); 
+        }     
+
+        return self::returnValue(['msg' => '更新成功']);         
+    }
 }

app/Http/routes.php

@@ -308,6 +308,10 @@ Route::group(['prefix' => 'api'], function() {
     Route::get('/template/addLongLog', 'Api\TemplateController@addLongLog');
     Route::get('/dayGrandTotal', 'Api\TemplateController@dayGrandTotal');
 
-    Route::get('order/orderList', 'Api\OrderController@orderList');
+    Route::get('/order/orderList', 'Api\OrderController@orderList');
+    Route::post('/order/orderstore', 'Api\OrderController@orderstore');
+    Route::post('/order/orderupdate', 'Api\OrderController@orderupdate');
+    Route::get('/order/getAddress', 'Api\OrderController@getAddress');
+    Route::get('/order/getBalance', 'Api\OrderController@getBalance');
 
 });