暂存

app/Http/Controllers/Admin/GoodsController.php

@@ -11,6 +11,7 @@ use App\Http\Controllers\Controller;
 use App\Logs;
 use App\Goods;
 use App\GoodsSkus;
+use App\Order;
 use App\Oplog;
 use App\Services\OssServices as oss;
 use Illuminate\Http\Request;
@@ -96,7 +97,7 @@ class GoodsController extends Controller
         $goods = array();       
         $goods['name'] = trim($request->input('name')); 
         $goods['description'] = trim($request->input('description'));  //非必填
-        $goods['eshopCode'] = '99|34881'; 
+        $goods['eshopCode'] = '100|zjsc001'; 
         $goods['productCode'] = trim($request->input('productCode'));  
         /*$goods['propsName'] = $request->input('propsName');  
         $goods['price'] = $request->input('price');  
@@ -124,9 +125,10 @@ class GoodsController extends Controller
             if(!empty($sku)){
                 foreach($sku as $key=>$item){
                     $sku_data = explode('@@', $item);
-                    $sku_insert_data = $mjArr['skuList'][$key] = ['propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
+                    $sku_insert_data = $mjArr['skuList'][$key] = ['skuProductCode'=>'DCY-001', 'propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
                     $sku_insert_data['goodsCode'] = $res;
-                    $sku_insert_data['eshopCode'] = '99|34881';
+                    $sku_insert_data['eshopCode'] = '100|zjsc001';
+
                     $sku_ids = DB::table('goods_skus')->insertGetId($sku_insert_data);
 
                     $mjArr['skuList'][$key]['outerCode'] = $sku_ids;
@@ -134,9 +136,9 @@ class GoodsController extends Controller
             }
 
             //对接卖家云
-            //$mj = Order::mjGoodsAdd($mjArr);
+            $mj = Order::mjGoodsAdd($mjArr);
             /* 同步卖家云商品code等信息 */
-
+var_dump($mj);exit;
             /* end */
             #记录操作日志
             $self_id = session('admin_id');
@@ -229,7 +231,7 @@ class GoodsController extends Controller
             $mjSkuArr = array();
             foreach($sku as $key=>$item){
                 $sku_data = explode('@@', $item);
-                $sku_insert_data = $mjSkuArr['skus'][$key] = ['goodsCode'=>$id,'eshopCode'=>'99|34881','propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
+                $sku_insert_data = $mjSkuArr['skus'][$key] = ['goodsCode'=>$id,'eshopCode'=>'100|zjsc001','propsName'=>$sku_data[0], 'price'=>$sku_data[1], 'createTime'=>date('Y-m-d H:i:s'), 'modifyTime'=>date('Y-m-d H:i:s')];
 
                 $sku_ids = DB::table('goods_skus')->insertGetId($sku_insert_data);
 
@@ -274,5 +276,17 @@ class GoodsController extends Controller
         exit('0');
     }
 
+    /**
+     * 搜索商品
+     */
+    public function searchSkus(Request $request){
+        $name = trim($request->input('name'));
+        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
+        $result = json_decode(json_encode($result), true);
+
+        if(empty($result)) exit('0');
+        exit(json_encode($result));
+    }
+
 }
 

app/Http/Controllers/Admin/OrderController.php

@@ -12,6 +12,8 @@ use App\Logs;
 use App\Order;
 use App\Oplog;
 use App\RedisModel;
+use App\Goods;
+use App\GoodsSkus;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -429,8 +431,9 @@ class OrderController extends Controller
             'delivery_date'           => 'required|date', 
             'createTime'           => 'required|date', 
             'receivedAmount'           => 'required|numeric|min:1', 
-            'goods_note'           => 'required|min:1',  
+            //'goods_note'           => 'required|min:1',  
             'warehouse'           => 'required|integer|min:1',  
+            'skus'                => 'required'
         ], [                  
             'customerName.required'           => '买家姓名不能为空',                   
             'customerName.between'           => '买家姓名不能超过6个字符',                   
@@ -455,6 +458,7 @@ class OrderController extends Controller
 
         //redis防重复数据
         $phone = $request->input('receiverMobile');
+        /*
         $redisKey = 'seafood.order_phone_add.'.$phone;
         $res = RedisModel::setnx($redisKey, 1);
         if( $res == 0 ){
@@ -462,12 +466,12 @@ class OrderController extends Controller
             return redirect('/admin/order/index')->with('info', $msg);
         }
         $res = RedisModel::expire( $redisKey, 60 );
-
+*/
         //数据库-新增数据
         $order = array();
-        $order['eshopCode'] = '99|34881'; //默认
+        $order['eshopCode'] = '100|zjsc001'; //默认
         $order['outerCode'] = Order::createOuterCode();//随机生成
-        $order['status'] = (int)$request->input('status');
+        $order['status'] = (int)$request->input('status');                                   
         $order['customerName'] = trim($request->input('customerName')); //买家名称
         $order['shippingType'] = '卖家包邮';
         $order['expressCompanyCode'] = '10084';
@@ -481,8 +485,8 @@ class OrderController extends Controller
         $order['receiverState'] = str_replace(['省', '市'], '', $order['receiverState']);
         $order['receiverCity'] = str_replace('市', '', $order['receiverCity']);
 
-        $order['receiverDistrict'] = $request->input('receiverDistrict'); //区
-        $order['receiverStreet'] = $request->input('receiverStreet'); //街道
+        $order['receiverDistrict'] = trim($request->input('receiverDistrict')); //区
+        $order['receiverStreet'] = trim($request->input('receiverStreet')); //街道
         $order['receiverAddress'] = trim($request->input('receiverAddress')); //详细地址
         $order['buyerPostageFee'] = 0; //买家邮费
         $order['discountFee'] = 0; //订单优惠
@@ -490,7 +494,7 @@ class OrderController extends Controller
         $order['serviceFee'] = 0; //服务费
         $order['paymentMethod'] = '在线付款';
         $order['paymentType'] = '网银';
-        $order['paymentAccount'] = '18322223333'; // 付款账号，暂时默认写死
+        $order['paymentAccount'] = '18322225555'; // 付款账号，暂时默认写死
         $order['paymentTime'] = date('Y-m-d H:i:s'); // 付款时间
         $order['receivedAmount'] = trim($request->input('receivedAmount')); //付款金额        
         $order['buyerMemo'] = trim($request->input('buyerMemo', '')); // 买家备注
@@ -498,51 +502,45 @@ class OrderController extends Controller
         $order['createTime'] = !empty($request->input('createTime')) ? $request->input('createTime') : date('Y-m-d H:i:s'); // 订单创建时间
         $order['modifyTime'] = date('Y-m-d H:i:s'); // 订单修改时间
 
-        $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['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'); //支付方式
-
         //商品信息
-        /*
-        $g_info = trim($request->input('g_info'),';');
-        //var_dump($g_info);
-        $g_info = explode(';' , $g_info);
-        $goods_info = array();
-        foreach($g_info as $k=>$info){
-            $info = explode(':', $info);
-            $goods_info[$k]['id'] = $info[0];
-            $goods_info[$k]['num'] = $info[1];
-        }
-        foreach($goods_info as $k=>$v){
-            $goods = DB::table('goods_sku_list')->where('id', $v['id'])->first();
+        $skus = $request->input('skus');
+        $gnum = $request->input('gnum');
+        foreach($skus as $k=>$sku_id){
+            $sku_info = GoodsSkus::where('id', $sku_id)->first();
+            $goods_info = Goods::where('id', $sku_info->goodsCode)->first();
             $params = array();
             $params['outerCode'] = $order['outerCode']+$k+1; //外部平台中子订单编码
             $params['outerParentCode'] = $order['outerCode']; //外部平台中订单编码
-            $params['goodsCode'] = $goods->code;// strstr($goods->code,'-',true); 
-            $params['skuCode'] = $goods->code; 
+            $params['goodsCode'] = $sku_info->goodsCode;// strstr($goods->code,'-',true); 
+            $params['skuCode'] = $sku_id; 
             #商品名称
-            $params['goodsName'] = DB::table('goods_category')->where('goods_id', $goods->goods_id)->pluck('goods_name');
+            $params['goodsName'] = $goods_info->name;
+            $params['propertiesName'] = $sku_info->propsName;
             //$params['goodsName'] = '海钓黄翅鱼';//$goods->code; 
-            $params['price'] = $goods->price;
-            $params['quantity'] = $v['num'];
+            $params['price'] = $sku_info->price;
+            $params['quantity'] = $gnum[$k];
             $params['discountFee'] = 0;
             $params['adjustFee'] = 0;
             $params['refundStatus'] = '正常';
             $order['skuList'][] = $params;
         }
-        */
 
         //卖家云添加订单
-        //$mj_add = Order::mjOrderAdd($order);
+        $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['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'); //支付方式
 
-        if(true){
+        if(!empty($mj_add)){
             #更新客户表
             $customer = array();
             $customers['name'] = $order['receiverName'];
@@ -564,10 +562,10 @@ class OrderController extends Controller
                 $in_c = DB::table('customers')->insert($customers);
             }
 
-            //$order_goods = $order['skuList'];
-            //unset($order['skuList']);
-            //DB::table('order_goods')->insert($order_goods);
-            //$order['orderCode'] = $mj_add['order']['code']; 
+            $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();
@@ -581,6 +579,16 @@ class OrderController extends Controller
             }
             $res = DB::table('order')->insertGetId($order);
             if($res){
+                //订单商品插入
+                $order_skus = array();
+                foreach($order_goods as $k=>$sku){
+                    $order_skus[$k]['sku_id'] = $sku['skuCode'];
+                    $order_skus[$k]['order_id'] = $res;
+                    $order_skus[$k]['goods_id'] = $sku['goodsCode'];
+                    $order_skus[$k]['num'] = $sku['quantity'];
+                    $order_skus[$k]['price'] = $sku['price'];
+                }
+                $order_skus_insert = DB::table('order_goods_skus')->insert($order_skus);
                 #记录操作日志
                 $self_id = session('admin_id');
                 $self_name = session('real_name');

app/Http/routes.php

@@ -158,6 +158,7 @@ Route::group(['prefix' => 'admin'], function(){
         Route::get('goods/edit/{id}', 'Admin\GoodsController@edit');
         Route::post('goods/update',   'Admin\GoodsController@update');
         Route::get('goods/delete/{id}',   'Admin\GoodsController@delete');
+        Route::get('goods/searchSkus',   'Admin\GoodsController@searchSkus');
     });
     
 });

app/Order.php

@@ -26,6 +26,14 @@ class Order extends Model
      */
    	public static function mjOrderAdd($orderList){
    		$orderList["method"] = "maijiayun.order.add";
+      //status格式
+      $staus_arr = array(
+        0 => '待付款',
+        1 => '已付款待审核',
+        2 => '已审核待发货',
+        3 => '已发货',
+      );
+      $orderList['status'] = $staus_arr[$orderList['status']];
    		$result = self::mjApi($orderList);
    		return $result;
    	}

resources/views/order/ordercreate.blade.php

@@ -135,24 +135,10 @@
             </div>
             @endif
 
-            <!--div class="row cl">
+            <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">选择商品：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <span class="select-box">
-                        <select  size="1" name="category" id='category'>
-                            <option value="0" @if(old('category')=='') selected @endif>商品分类</option>
-                            @foreach($categorylist as $v)
-                                <option value="{{$v}}" @if(old('category')==$v) selected @endif>{{$v}}</option>
-                            @endforeach
-                        </select>
-
-                        <select id='goods' size="1" name="goods">
-                            <option value="0" @if(old('goods')=='') selected @endif>-- 选择商品 --</option>
-                        </select>
-
-                        &nbsp;&nbsp;商品数量：<input type="text" value="" placeholder="" name="num">
-                        &nbsp;&nbsp;<button type='button' onclick='add_goods()'> 确认</button>
-                    </span>
+                    <input type='text' name='goods_name'  value=''/> 
                 </div>               
             </div><br>
 
@@ -162,7 +148,7 @@
                 <div  id='goods_o' class="formControls col-xs-6 col-sm-6">
                      <input id='g_info' type='hidden' name='g_info' value=''/>
                 </div>
-            </div><br-->
+            </div><br>
 
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
@@ -346,14 +332,10 @@
             location.href='/admin/order/index';
         }
 
-        function add_goods(){
+        function add_goods(goods_id,sku_id,name,props_name,price){
             var id = $('#goods').val();
-            var goods_name = $("#goods option:selected").text();
-            var num = $("input[name=num]").val();
-            var str = "<p>"+goods_name+ " 数量："+num+";<\/p>";
-            var g_info_val = $("#g_info").val();
-            g_info_val += id+':'+num+';';
-            $("#g_info").val(g_info_val);
+            var str = "<p>"+name+' '+props_name+' ￥'+price+"&nbsp; <input type='hidden' name='skus[]' value="+sku_id+" \/>数量:<input style='width:4%;' type=\'text\' name=\'gnum[]\' value=1 \/><\/p>";  
+
             $("#goods_o").append(str);
             return false;
         }
@@ -413,6 +395,24 @@
             }
         }
 
+        function getGoods(){
+            var name = $('input[name=goods_name]').val();
+            if(!name){
+                return false;
+            }
+            $.ajax({
+                    'url': '/admin/goods/searchSkus?name='+name,
+                    'type': 'get',
+                    'dateType': 'json',
+                    success:function(data){
+                        if(data != '0'){
+                            data = eval("("+data+")");
+
+                        }
+                    }
+                })
+        }
+
         function to_verify(){
 	        $(".btn").attr("disabled",true);
             $("input[name=status]").val('1');
@@ -430,6 +430,37 @@
             return true;
         }
 
+    $('input[name=goods_name]').on('keyup', function(){
+        var name = $('input[name=goods_name]').val();
+            if(!name){
+                return false;
+            }
+            $.ajax({
+                'url': '/admin/goods/searchSkus?name='+name,
+                'type': 'get',
+                'dateType': 'json',
+                success:function(data){
+                    if(data != '0'){
+                        data = eval("("+data+")");
+                        var str = '';
+                        for (var i = 0, l = data.length; i < l; i++) {
+                            var item = data[i];
+                            str += '<p onclick=\'add_goods('+item.goods_id+','+item.sku_id+',"'+item.name+'","'+item.propsName+'",'+item.price+');\'>'+ item.name+' '+item.propsName+' ￥'+item.price +'<\/p>';
+                        }
+                       
+                        layer.open({
+                          type: 1,
+                          area: ['600px', '360px'],
+                          shadeClose: true, //点击遮罩关闭
+                          content: str
+                        });
+                    }
+                }
+            })
+            
+        
+      });
+
 
     </script>
     </body>