Merge branch 'zjl_new_order_20210926' into development

1a3431cf · 朱继来 · c2f6b903 · 2c00c1f7 · 1a3431cf · 1a3431cf
Commit 1a3431cf authored Oct 11, 2021 by 朱继来
Showing with 316 additions and 242 deletions
app/Console/Commands/JingDiaoOrderAddress.php
app/Console/Commands/JingDiaoUser.php
app/Http/Controllers/AddOrderController.php
app/Http/Controllers/AddressController.php
app/Http/Controllers/ApiController.php
app/Http/Controllers/OrderController.php
app/Http/Controllers/RefundController.php
app/Http/Controllers/RegionController.php
app/Http/Controllers/ReturnController.php
app/Http/Controllers/SpecialController.php
app/Http/Controllers/WebController.php
app/Model/InvoiceCompanyModel.php
app/Model/OrderModel.php
app/Model/OrderReturnItemsModel.php
app/Model/OrderReturnModel.php
app/Model/PaymentDaysModel.php
app/Model/Pcb/PcbOrderModel.php
app/Model/RemovalItemsModel.php
app/Model/ShippingModel.php
app/Model/ShoppingCartModel.php
--- a/app/Console/Commands/JingDiaoOrderAddress.php
+++ b/app/Console/Commands/JingDiaoOrderAddress.php
@@ -8,6 +8,10 @@ use Illuminate\Foundation\Inspiring;
 use DB;
 use Log;
 use Illuminate\Support\Facades\Redis;
+use App\Model\RegionModel;
+use App\Model\OrderModel;
+use App\Model\OrderAddressModel;
 class JingDiaoOrderAddress extends Command
 {
    /**
@@ -38,7 +42,7 @@ class JingDiaoOrderAddress extends Command
    protected function getregion($parent_id = 0){
        $str = "";
        if($parent_id != 1){
-            $region = DB::Connection("order")->table("lie_region")->where(["region_id"=>$parent_id])->first();
+            $region = RegionModel::where(["region_id"=>$parent_id])->first();
            $str = $region->region_name." ".$str;
            if($region && $region->parent_id != 1){
                $str = $this->getregion($region->parent_id)." ".$str;
@@ -80,7 +84,7 @@ class JingDiaoOrderAddress extends Command
 //        }
 //return;
-        DB::Connection("order")->table("lie_order")->where(["is_type"=>1])->orderBy("order_id","desc")->chunk(100,function($orders){
+        OrderModel::where(["is_type"=>1])->orderBy("order_id","desc")->chunk(100,function($orders){
           foreach($orders as $order){
               try{
@@ -103,7 +107,7 @@ class JingDiaoOrderAddress extends Command
                           $str = mb_substr($orderRemark,0,2);
-                           $region = DB::Connection("order")->table("lie_region")->whereRaw("region_name like '{$str}%'")->first();
+                           $region = RegionModel::whereRaw("region_name like '{$str}%'")->first();
                           if(!$region){
@@ -140,7 +144,7 @@ class JingDiaoOrderAddress extends Command
    //生成随机地址
    protected function getRandomAddress(){
        $random = rand(1,367456);
-        $address = DB::Connection("order")->table("lie_order_address")->where(["order_address_id"=>$random])->first();
+        $address = OrderAddressModel::where(["order_address_id"=>$random])->first();
        if($address){
            return $address;
        }else{

--- a/app/Console/Commands/JingDiaoUser.php
+++ b/app/Console/Commands/JingDiaoUser.php
@@ -124,27 +124,27 @@ class JingDiaoUser extends Command
     */
    public function handle(){
        $userids = $this->userids();
-        $users = DB::Connection("order")->table("lie_user_main")->whereIn("user_id",$userids)->where("is_type","=",1)->pluck("user_id");
+        $users = DB::Connection("web")->table("lie_user_main")->whereIn("user_id",$userids)->where("is_type","=",1)->pluck("user_id");
        try{
-            DB::Connection("order")->beginTransaction();
+            DB::Connection("web")->beginTransaction();
            foreach($users as $user_id){
-                DB::Connection("order")->table("lie_user_main")->where(["user_id"=>$user_id])->update([
+                DB::Connection("web")->table("lie_user_main")->where(["user_id"=>$user_id])->update([
                    "is_type"=>0,
                ]);
                continue;
-                $zjf_z = DB::Connection("order")->table("lie_point_log")->where("user_id",$user_id)->where("flow_type",1)->sum("flow_point");
+                $zjf_z = DB::Connection("web")->table("lie_point_log")->where("user_id",$user_id)->where("flow_type",1)->sum("flow_point");
-                $zjf_f = DB::Connection("order")->table("lie_point_log")->where("user_id",$user_id)->where("flow_type",2)->sum("flow_point");
+                $zjf_f = DB::Connection("web")->table("lie_point_log")->where("user_id",$user_id)->where("flow_type",2)->sum("flow_point");
                $jifen = intval($zjf_z - $zjf_f);
                dump(sprintf("userid:%s 的积分为：%s",$user_id,$jifen));
-                $userInfo = DB::Connection("order")->table("lie_user_info")->where(["user_id"=>$user_id])->select("cur_user_point","cur_total_point")->first();
+                $userInfo = DB::Connection("web")->table("lie_user_info")->where(["user_id"=>$user_id])->select("cur_user_point","cur_total_point")->first();
-                $bk = DB::Connection("order")->table("lie_user_info")->where(["user_id"=>$user_id])->update([
+                $bk = DB::Connection("web")->table("lie_user_info")->where(["user_id"=>$user_id])->update([
                    "cur_user_point"=>$jifen,
                    "cur_total_point"=>$jifen,
                ]);
@@ -153,10 +153,10 @@ class JingDiaoUser extends Command
            }
-            DB::Connection("order")->commit();
+            DB::Connection("web")->commit();
        }catch(\Exception $e){
            dump($e->getMessage());
-            DB::Connection("order")->rollBack();
+            DB::Connection("web")->rollBack();
        }
    }
@@ -169,11 +169,11 @@ class JingDiaoUser extends Command
    {
        $userids = $this->userids();
-        $users = DB::Connection("order")->table("lie_user_main")->whereIn("user_id",$userids)->where("is_type","=",1)->pluck("user_id");
+        $users = DB::Connection("web")->table("lie_user_main")->whereIn("user_id",$userids)->where("is_type","=",1)->pluck("user_id");
        try{
-            DB::Connection("order")->beginTransaction();
+            DB::Connection("web")->beginTransaction();
@@ -187,7 +187,7 @@ class JingDiaoUser extends Command
                    ->select("order_amount","order_goods_type","is_type","order_pay_type","integral","status","order_id","create_time")->get();
    //            dump($orders);
                $zong_jifen = 0;
-                $userMobile = DB::Connection("order")->table("lie_user_main")->where("user_id",$user_id)->select("mobile")->first();
+                $userMobile = DB::Connection("web")->table("lie_user_main")->where("user_id",$user_id)->select("mobile")->first();
                foreach($orders as $k=>$order){
                    $jifen = 0;
                    if($order->order_pay_type == 3){
@@ -220,7 +220,7 @@ class JingDiaoUser extends Command
                    ];
    //                dump($jifenData);
-                    $bk = DB::Connection("order")->table("lie_point_log")->insert($jifenData);
+                    $bk = DB::Connection("web")->table("lie_point_log")->insert($jifenData);
                    if(!$bk){
                        throw new \Exception("添加数据失败");
                    }
@@ -228,16 +228,16 @@ class JingDiaoUser extends Command
                    $zong_jifen += $jifen;
                }
                $zong_jifen = intval($zong_jifen);
-                $userInfo = DB::Connection("order")->table("lie_user_info")->where(["user_id"=>$user_id])->select("cur_user_point","cur_total_point")->first();
+                $userInfo = DB::Connection("web")->table("lie_user_info")->where(["user_id"=>$user_id])->select("cur_user_point","cur_total_point")->first();
                if(!$userInfo){
-                    $userInfo = DB::Connection("order")->table("lie_user_info")->insert([
+                    $userInfo = DB::Connection("web")->table("lie_user_info")->insert([
                        "user_id"=>$user_id,
                        "cur_user_point"=>$zong_jifen,
                        "cur_total_point"=>$zong_jifen,
                    ]);
                }
-                DB::Connection("order")->table("lie_user_info")->where(["user_id"=>$user_id])->update([
+                DB::Connection("web")->table("lie_user_info")->where(["user_id"=>$user_id])->update([
                    "cur_user_point"=>$userInfo->cur_user_point,
                    "cur_total_point"=>$userInfo->cur_total_point,
                ]);
@@ -249,11 +249,11 @@ class JingDiaoUser extends Command
            }
-            DB::Connection("order")->commit();
+            DB::Connection("web")->commit();
        }catch(\Exception $e){
            dump($e->getMessage());
-            DB::Connection("order")->rollBack();
+            DB::Connection("web")->rollBack();
        }
@@ -360,7 +360,7 @@ class JingDiaoUser extends Command
        }
-        $count = DB::connection('order')
+        $count = DB::connection('web')
            ->table('lie_user_main')
@@ -384,13 +384,13 @@ class JingDiaoUser extends Command
        $countN=0;
        $userJD = [];
-        DB::Connection("order")->table("lie_user_main")->select("user_id","mobile","is_type")->OrderBy("user_id","desc")->whereRaw(" is_type = 1 and mobile != '' ")
+        DB::Connection("web")->table("lie_user_main")->select("user_id","mobile","is_type")->OrderBy("user_id","desc")->whereRaw(" is_type = 1 and mobile != '' ")
            ->chunk(100, function($users) use(&$countN,&$userJD) {
                foreach ($users as $user) {
                    $user_id = $user->user_id;
                    $logs = null;
                    $orders = null;
-                    $logs = DB::Connection("order")->table("lie_user_login")->where(["user_id"=>$user_id])->count("id");
+                    $logs = DB::Connection("web")->table("lie_user_login")->where(["user_id"=>$user_id])->count("id");
                    $orders = DB::Connection("order")->table("lie_order")->where(["user_id"=>$user_id,"is_type"=>0])->count("order_id");
                    if(!$logs && !$orders){
                        dump($user->user_id);
@@ -417,7 +417,7 @@ class JingDiaoUser extends Command
                        $redis->hset("api_email",$email,$user->user_id);
-                        DB::Connection("order")->table("lie_user_main")->where(["user_id"=>$user->user_id])->update([
+                        DB::Connection("web")->table("lie_user_main")->where(["user_id"=>$user->user_id])->update([
                            "mobile"=>"",
                            "email"=>$email
                        ]);

--- a/app/Http/Controllers/AddOrderController.php
+++ b/app/Http/Controllers/AddOrderController.php
@@ -11,7 +11,17 @@ use App\Http\Page;
 use App\Http\Controllers\PermController;
 use App\Http\Error;
 use App\Model\UserMainModel;
+use App\Model\UserAddressModel;
+use App\Model\TaxInfoModel;
+use App\Model\InvoiceCompanyModel;
+use App\Model\RegionModel;
+use App\Model\ShoppingCartModel;
 use App\Model\OrderModel;
+use App\Model\OrderExtendModel;
+use App\Model\OrderPriceModel;
+use App\Model\ShoppingCartModel;
+use App\Model\PayLogModel;
+use App\Model\OrderActionLogModel;
 use App\Model\CrmModel;
 use App\Model\CmsModel;
 use Excel;
@@ -206,7 +216,7 @@ Class AddOrderController extends Controller
                }
            }     
-            $address = DB::connection('order')->table('lie_user_address')->where('user_id', $user->user_id)->select('address_id', 'consignee')->get(); // 收货地址  
+            $address = UserAddressModel::where('user_id', $user->user_id)->select('address_id', 'consignee')->get(); // 收货地址  
            // $invoice = DB::connection('order')->table('lie_taxinfo')->where('user_id', $user->user_id)->select('tax_id', 'tax_title')->get(); // 发票信息
            $info['user']    = $user;
@@ -237,7 +247,7 @@ Class AddOrderController extends Controller
        if ($request->isMethod('post')) {
            $address_id = $request->input('address_id');
-            $address = DB::connection('order')->table('lie_user_address')->where('address_id', $address_id)->first();
+            $address = UserAddressModel::where('address_id', $address_id)->first();
            $address->province_val = $this->getAddress($address->province);
            $address->city_val     = $this->getAddress($address->city);
@@ -253,7 +263,7 @@ Class AddOrderController extends Controller
        if ($request->isMethod('post')) {
            $tax_id = $request->input('tax_id');
-            $invoice = DB::connection('order')->table('lie_taxinfo')->where('tax_id', $tax_id)->first();
+            $invoice = TaxInfoModel::where('tax_id', $tax_id)->first();
            $invoice->province_val = $invoice->consignee_province ? $this->getAddress($invoice->consignee_province) : '';
            $invoice->city_val     = $invoice->consignee_city ? $this->getAddress($invoice->consignee_city) : '';
@@ -261,7 +271,7 @@ Class AddOrderController extends Controller
            // 发票公司信息
            if (in_array($invoice->inv_type, [3, 4])) {
-                $company_info = DB::connection('order')->table('lie_invoice_company')->where('com_name', $invoice->tax_title)->first();
+                $company_info = InvoiceCompanyModel::where('com_name', $invoice->tax_title)->first();
                if ($company_info) {
                    $invoice->customer_en             = $company_info->customer_en;
@@ -283,7 +293,7 @@ Class AddOrderController extends Controller
            $user_id  = $request->input('user_id');
            $inv_type = $request->input('inv_type');
-            $invoice = DB::connection('order')->table('lie_taxinfo')->where(['user_id'=>$user_id, 'inv_type'=>$inv_type])->select('tax_id', 'tax_title')->get();
+            $invoice = TaxInfoModel::where(['user_id'=>$user_id, 'inv_type'=>$inv_type])->select('tax_id', 'tax_title')->get();
            return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice];
        }
@@ -315,7 +325,7 @@ Class AddOrderController extends Controller
    // 查询省市区
    public function getAddress($id)
    {
-        $addr = DB::connection('order')->table('lie_region')->where('region_id', $id)->select('region_name')->first();
+        $addr = RegionModel::where('region_id', $id)->select('region_name')->first();
        return $addr ? $addr->region_name : '未匹配到ID：'.$id;
    }
@@ -328,11 +338,11 @@ Class AddOrderController extends Controller
        $info['title'] = '新增自营线下订单';
        // 默认内部账号ID
-        $internal = DB::connection('order')->table('lie_user_main')->where('mobile', Config('website.internal-account'))->select('user_id')->first();
+        $internal = UserMainModel::where('mobile', Config('website.internal-account'))->select('user_id')->first();
        $info['internal_uid'] = $internal->user_id;
        // 默认内部账号收货地址
-        $address = DB::connection('order')->table('lie_user_address')->where(['user_id' => $info['internal_uid'], 'is_default' => 1])->first();
+        $address = UserAddressModel::where(['user_id' => $info['internal_uid'], 'is_default' => 1])->first();
        $address->province_val = $this->getAddress($address->province);
        $address->city_val     = $this->getAddress($address->city);
@@ -350,7 +360,7 @@ Class AddOrderController extends Controller
        $intracode = DB::table('lie_intracode')->where('admin_id', $sale_id)->select('user_id')->first();
        if (!empty($intracode)) {
-            $user = DB::connection('order')->table('lie_user_main')->where('user_id', $intracode->user_id)->select('mobile')->first();
+            $user = UserMainModel::where('user_id', $intracode->user_id)->select('mobile')->first();
            $info['mobile'] = $user ? $user->mobile : '';
        } else {
@@ -559,7 +569,7 @@ Class AddOrderController extends Controller
                    $data['buyer_id'] = $CmsModel->getSaleId($buyer); 
                }          
            } else { // 修改交期   
-                $goods_data = DB::connection('order')->table('lie_shopping_cart')->where('cart_id', $cart_id)->value('goods_data');
+                $goods_data = ShoppingCartModel::where('cart_id', $cart_id)->value('goods_data');
                if (!$goods_data) {
                    $goods_data['delivery_time'] = $delivery_time;
@@ -571,7 +581,7 @@ Class AddOrderController extends Controller
                $data['goods_data'] = json_encode($goods_data);
            }
-            $res = DB::connection('order')->table('lie_shopping_cart')->where('cart_id', $cart_id)->update($data);
+            $res = ShoppingCartModel::where('cart_id', $cart_id)->update($data);
            if ($res === false) return ['errcode' => -1, 'errmsg' => '修改失败'];
@@ -783,10 +793,10 @@ Class AddOrderController extends Controller
        $info['type']     = $type;
        $info['is_quiry'] = $request->input('is_quiry', '');
-        $order = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->first();
+        $order = OrderModel::where('order_id', $order_id)->first();
        if ($type != 3) {
-            $user = DB::connection('order')->table('lie_user_main')->where('user_id', $order->user_id)->select('mobile')->first();
+            $user = UserMainModel::where('user_id', $order->user_id)->select('mobile')->first();
            $info['user_info'] = $user;
        }
@@ -813,7 +823,7 @@ Class AddOrderController extends Controller
                $response = json_decode(curlApi($url, $data), true); 
                if ($response['err_code'] == 0) {
-                    $orderInfo = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->first();
+                    $orderInfo = OrderModel::where('order_id', $order_id)->first();
                    DB::beginTransaction();
                    try {
@@ -824,7 +834,7 @@ Class AddOrderController extends Controller
                        $price['price'] = '-'.$orderInfo->order_amount;
                        $price['create_time'] = time();
-                        $priceAdd = DB::connection('order')->table('lie_order_price')->insert($price);
+                        $priceAdd = OrderPriceModel::insert($price);
                        // 添加付款记录
                        $pay['user_id'] = $orderInfo->user_id; 
@@ -838,10 +848,10 @@ Class AddOrderController extends Controller
                        $pay['create_time'] = time();
                        $pay['pay_time'] = time();
-                        $payLog = DB::connection('order')->table('lie_pay_log')->insert($pay);
+                        $payLog = PayLogModel::insert($pay);
                        // 待发货状态
-                        $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['status' => $status, 'pay_time' => time(), 'wms_syn' => 1]);
+                        $update = OrderModel::where('order_id', $order_id)->update(['status' => $status, 'pay_time' => time(), 'wms_syn' => 1]);
                        if ($update && $priceAdd && $payLog) {
                            DB::commit();
@@ -878,7 +888,8 @@ Class AddOrderController extends Controller
            $log['event']         = $event;
            $log['ip']            = get_client_ip();
            $log['create_time']   = time();
-            $actionLog = DB::connection('order')->table('lie_order_action_log')->insert($log);
+            $actionLog = OrderActionLogModel::insert($log);
            if (!$actionLog){
                errorLog(Error::E_ADD_FAILED, '添加操作记录失败');
@@ -1103,7 +1114,7 @@ Class AddOrderController extends Controller
            $data['operator_id'] = $request->user->userId;
            if ($goods_type == 1 && !$add_type) {
-                $temp_save_info = DB::connection('order')->table('lie_order_extend')->where('order_id', $data['order_id'])->value('temp_save_info');
+                $temp_save_info = OrderExtendModel::where('order_id', $data['order_id'])->value('temp_save_info');
                // 获取临时保存信息
                if ($temp_save_info) {

--- a/app/Http/Controllers/AddressController.php
+++ b/app/Http/Controllers/AddressController.php
@@ -5,7 +5,8 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Http\Error;
 use DB;
-use App\Http\Model\UserActionLogModel;
+use App\Model\RegionModel;
+use App\Model\UserAddressModel;
 class AddressController extends Controller 
 {
@@ -58,7 +59,7 @@ class AddressController extends Controller
    // 地址
    public function getRegion($region_id)
    {
-        $region = DB::connection('order')->table('lie_region')->where('region_id', $region_id)->select('region_name')->first();
+        $region = RegionModel::where('region_id', $region_id)->select('region_name')->first();
        return $region ? $region->region_name : '';
    }
@@ -69,7 +70,7 @@ class AddressController extends Controller
        if ($request->isMethod('post')) {
            $address_id = $request->input('address_id');
-            $info = DB::connection('order')->table('lie_user_address')->where('address_id', $address_id)->first();
+            $info = UserAddressModel::where('address_id', $address_id)->first();
            if (empty($info)) return ['errcode' => Error::E_NOT_EXISTS, 'errmsg' => '未找到'];
@@ -160,15 +161,13 @@ class AddressController extends Controller
        }
        if ($map['user_id'] && isset($map['address_type'])) {
-            $addressList = DB::connection('order')->table('lie_user_address')->where($map)->get();
+            $addressList = UserAddressModel::where($map)->get();
        }
        if(!empty($addressList) && is_array($addressList)) {
            $region = array();
            foreach ($addressList as &$val) {
-                $region = DB::connection('order')
+                $region = RegionModel::whereIn('region_id', [$val->province, $val->city, $val->district])
-                        ->table('lie_region')
-                        ->whereIn('region_id', [$val->province, $val->city, $val->district])
                        ->select('region_id', 'region_name')
                        ->get();

--- a/app/Http/Controllers/ApiController.php
+++ b/app/Http/Controllers/ApiController.php
@@ -18,20 +18,23 @@ use App\Model\OrderExtendModel;
 use App\Model\OrderItemsModel;
 use App\Model\OrderItemsTrackModel;
 use App\Model\OrderItemsTrackingModel;
-use App\Model\UserSampleApplyModel;
 use App\Model\OrderActionLogModel;
-use App\Model\UserSampleInviteModel;
-use App\Model\UserGroupModel;
-use App\Model\UserMainModel;
-use App\Model\BrandBlackListModel;
-use App\Model\PayExtendModel;
-use Illuminate\Support\Facades\Redis;
 use App\Model\ShoppingCartModel;
 use App\Model\OrderServiceModel;
 use App\Model\OrderServiceItemsModel;
 use App\Model\OrderServiceLogModel;
 use App\Model\OrderRefundModel;
 use App\Model\OrderRefundLogModel;
+use App\Model\BrandBlackListModel;
+use App\Model\PayExtendModel;
+use App\Model\UserMainModel;
+use App\Model\UserAddressModel;
+use App\Model\TaxInfoModel;
+use App\Model\RegionModel;
+use App\Model\UserGroupModel;
+use App\Model\UserSampleApplyModel;
+use App\Model\UserSampleInviteModel;
+use Illuminate\Support\Facades\Redis;
 use DB;
 use App\Model\Frq\InquiryItemsReportModel;
@@ -524,7 +527,7 @@ class ApiController extends Controller
        if ($account) {
            $field = preg_match('/@/', $account) ? 'email' : 'mobile';
-            $user_id = DB::connection('order')->table('lie_user_main')->where($field, $account)->value('user_id');
+            $user_id = UserMainModel::where($field, $account)->value('user_id');
        }
        // 公司和联系方式都存在
@@ -599,7 +602,7 @@ class ApiController extends Controller
            $where['user_id']  = $user_id;
            $where['inv_type'] = 2;
-            $tax_info = DB::connection('order')->table('lie_taxinfo')->where($where)->select('tax_title', 'tax_id')->get();
+            $tax_info = TaxInfoModel::where($where)->select('tax_title', 'tax_id')->get();
            $this->Export(0, '', $tax_info);
        }
@@ -613,7 +616,7 @@ class ApiController extends Controller
        $map['tax_title'] = $com_info->com_name; 
        $map['user_id']   = $user_id; 
        $map['inv_type']  = $invoice_type; 
-        $invoice = DB::connection('order')->table('lie_taxinfo')->where($map)->first();
+        $invoice = TaxInfoModel::where($map)->first();
        if (!$invoice) $this->Export(-1, '未找到发票信息');
        $tax_info['tax_id']    = isset($invoice) ? $invoice->tax_id : 0;
@@ -644,7 +647,7 @@ class ApiController extends Controller
        $map['user_id'] = $user_id;
        $map['address_type'] = 0;
-        $address = DB::connection('order')->table('lie_user_address')->where($map)->get();
+        $address = UserAddressModel::where($map)->get();
        if (empty($address)) $this->Export(-1, '未获取到用户收货地址');
        foreach ($address as &$v) {
@@ -661,7 +664,7 @@ class ApiController extends Controller
    // 查询省市区
    public function getAddress($id)
    {
-        return DB::connection('order')->table('lie_region')->where('region_id', $id)->value('region_name');
+        return RegionModel::where('region_id', $id)->value('region_name');
    }
    // 导入销售报价物料

--- a/app/Http/Controllers/OrderController.php
+++ b/app/Http/Controllers/OrderController.php
@@ -12,20 +12,29 @@ use App\Http\Controllers\PermController;
 use Illuminate\Support\Facades\Redis;
 use App\Http\Error;
 use Excel;
+use App\Model\UserMainModel;
+use App\Model\UserCompanyModel;
+use App\Model\CmsModel;
+use App\Model\QueuedModel;
 use App\Model\OrderModel;
 use App\Model\OrderExtendModel;
-use App\Model\UserMainModel;
+use App\Model\OrderPriceModel;
+use App\Model\OrderAddressModel;
 use App\Model\OrderActionLogModel;
 use App\Model\OrderReturnModel;
 use App\Model\OrderItemsTrackModel;
 use App\Model\OrderItemsTrackingModel;
-use App\Model\CmsModel;
+use App\Model\PayLogModel;
-use App\Model\QueuedModel;
 use App\Model\ErpPayLogModel;
 use App\Model\PayExtendModel;
 use App\Model\OrderPurPriceModel;
+use App\Model\OrderShippingModel;
+use App\Model\OrderInvoiceModel;
 use App\Model\OrderServiceModel;
 use App\Model\OrderServiceItemsModel;
+use App\Model\RemovalItemsModel;
+use App\Model\OrderReturnItemsModel;
+use App\Model\ShippingModel;
 use App\Model\CrmModel;
 use Session;
 use Hprose\Http\Client;
@@ -33,14 +42,7 @@ use Hprose\Http\Client;
 // 获取订单优惠券金额
 function getCoupon($order_id)
 {
-    $price = DB::connection('order')
+    return OrderPriceModel::where(['order_id' => $order_id, 'price_type' => -4])->value('price');
-            ->table('lie_order_price')
-            ->where(['order_id' => $order_id, 'price_type' => -4])
-            ->first();
-    if (!$price) return null;
-    return $price->price;
 }
 // 获取会员账号
@@ -48,8 +50,7 @@ function getAccountName($user_id)
 {
    if (!$user_id) return false;
-    $userMainModel = new UserMainModel();
+    $user = UserMainModel::where('user_id', $user_id)->select('mobile', 'email')->first();
-    $user = $userMainModel->where('user_id', $user_id)->select('mobile', 'email')->first();
    if (!$user) return false;
@@ -59,13 +60,9 @@ function getAccountName($user_id)
 // 获取支付名称
 function getPayName($order_id) 
 {
-    $payLog = DB::connection('order')
+    $payLog = PayLogModel::where(['order_id' => $order_id])->select('pay_name')->get();
-            ->table('lie_pay_log')
-            ->where(['order_id' => $order_id])
-            ->select('pay_name')
-            ->get();
-    if (!$payLog) return false;
+    if ($payLog->isEmpty()) return false;
    foreach ($payLog as $v) {
        $payName[] = $v->pay_name; 
@@ -76,9 +73,7 @@ function getPayName($order_id)
 function getShipping($order_id, $shipping_type=1) 
 {
-    $shipping = DB::connection('order')
+    $shipping = OrderShippingModel::where(['order_id' => $order_id, 'shipping_type' => $shipping_type])
-                ->table('lie_order_shipping')
-                ->where(['order_id' => $order_id, 'shipping_type' => $shipping_type])
                ->select('shipping_no', 'status')
                ->orderBy('order_shipping_id')
                ->get();
@@ -90,15 +85,7 @@ function getShipping($order_id, $shipping_type=1)
 function getInvoiceStatus($order_id) 
 {
-    $invoice = DB::connection('order')
+   return OrderInvoiceModel::where(['order_id' => $order_id])->value('invoice_status');
-                ->table('lie_order_invoice')
-                ->where(['order_id' => $order_id])
-                ->select('invoice_status')
-                ->first();
-    if (!$invoice) return false;
-    return $invoice->invoice_status;
 }
 // 发票抬头 -> 合同公司
@@ -106,7 +93,7 @@ function getCompanyName($order_id, $user_id)
 {
    if (!$user_id) return false;
-    $tax_title = DB::connection('order')->table('lie_order_invoice')->where('order_id', $order_id)->where('inv_type', '<>', 1)->value('tax_title');
+    $tax_title = OrderInvoiceModel::where('order_id', $order_id)->where('inv_type', '<>', 1)->value('tax_title');
    if ($tax_title) return $tax_title;
    // $contract_com_name = DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->value('contract_com_name');
@@ -114,7 +101,7 @@ function getCompanyName($order_id, $user_id)
    // return false;
-    $com_name = DB::connection('order')->table('lie_user_company')->where('user_id', $user_id)->value('com_name');
+    $com_name = UserCompanyModel::where('user_id', $user_id)->value('com_name');
    if ($com_name) return $com_name;
    return false;
@@ -160,7 +147,7 @@ function isNewClient($order_goods_type, $user_id, $create_time)
    // $order = DB::connection('order')->table('lie_order')->where('order_goods_type', $order_goods_type)->where('user_id', $user_id)->whereBetween('create_time', [$half_year_time, $create_time-1])->get();
-    $user = DB::connection('order')->table('lie_user_main')->where('user_id', $user_id)->first();
+    $user = UserMainModel::where('user_id', $user_id)->first();
    // return empty($order) && empty($user->client_source) ? true : false;
    return $user && $user->is_new == 0 && empty($user->client_source) ? true : false;
@@ -171,9 +158,7 @@ function clientSource($user_id)
 {
    if (!$user_id) return false;
-    $user = DB::connection('order')->table('lie_user_main')->where('user_id', $user_id)->select('client_source')->first();
+    return UserMainModel::where('user_id', $user_id)->value('client_source');
-    return $user ? $user->client_source : '';
 }
 // 获取自营商品型号
@@ -188,7 +173,7 @@ function getGoodsName($goods_id)
 function getOrderSource($order_id, $order_type=1, $order_goods_type=1)
 {
    if ($order_type == 1) {
-        $order_source = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->value('order_source');
+        $order_source = OrderModel::where('order_id', $order_id)->value('order_source');
        if (preg_match('/pf=1/', $order_source)) {
            $source = 'PC端';
@@ -246,11 +231,7 @@ function handleOrderSource($order_source)
 // 获取订单收货人
 function getOrderAddress($order_id)
 {
-    $order = DB::connection('order')->table('lie_order_address')->where('order_id', $order_id)->select('consignee')->first();
+    return OrderAddressModel::where('order_id', $order_id)->value('consignee');
-    if (!$order) return false;
-    return $order->consignee;
 }
 // 获取渠道名称
@@ -310,7 +291,7 @@ function getOrderExtend($order_id, $field="*", $where=array())
        $map = array_merge($map, $where);
    }
-    $extend = DB::connection('order')->table('lie_order_extend')->where($map)->select($field)->first();
+    $extend = OrderExtendModel::where($map)->select($field)->first();
    return $extend;
 }
@@ -803,7 +784,7 @@ Class OrderController extends Controller
    // 详情页自营其他数据
    public function selfOtherData(&$info, $order_id)
    {
-        $shipping = DB::connection('order')->table('lie_shipping')->select('shipping_id', 'shipping_name')->get();
+        $shipping = ShippingModel::select('shipping_id', 'shipping_name')->get();
        $info['shippings'] = [];
@@ -815,7 +796,7 @@ Class OrderController extends Controller
            $info['shippings'] = $shippingInfo;
        }
-        $extend = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id, 'order_type' => 3])->first(); // 自营线下订单
+        $extend = OrderExtendModel::where(['order_id' => $order_id, 'order_type' => 3])->first(); // 自营线下订单
        $info['extend'] = $extend ? $extend : ''; 
    }
@@ -1132,7 +1113,7 @@ Class OrderController extends Controller
            $order_id = $request->input('order_id');
            // 调价失败临时表状态更改
-            $order_temp = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id])->update(['status' => -1]);
+            $order_temp = OrderExtendModel::where(['order_id' => $order_id])->update(['status' => -1]);
            if (!$order_temp) {
                errorLog(Error::E_UPDATE_FAILED, '驳回失败');
@@ -1305,37 +1286,6 @@ Class OrderController extends Controller
        }     
    }
-    // 审核不通过 
-    // public function ajaxCheck(Request $request)
-    // {
-    //     if($request->isMethod('post')){
-    //         $order_id = $request->input('order_id', ''); //订单号
-    //         $sale_id = $request->input('sale_id', null); //对应销售
-    //         $operator_id = $request->user->userId;
-    //         $cancel_reason = $request->input('cancel_reason', '');
-    //         if (!isset($sale_id)) {
-    //             return array('errcode'=>1, 'errmsg'=>'请选择订单业务员！');
-    //         }
-    //         if (!$order_id) {
-    //             return array('errcode'=>1, 'errmsg'=>'订单参数有误！');
-    //         }
-    //         //用于后台订单审核
-    //         $url = Config('website.api_domain').'order/cancel';
-    //         $check['k1']  = time();
-    //         $check['k2']  = md5(md5($check['k1']).'fh6y5t4rr351d2c3bryi');
-    //         $resData = array("cancel_reason"=>$cancel_reason, "order_id"=>$order_id, 'sale_id'=>$sale_id, "pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], 'operator_id'=>$operator_id, 'type' => 3);
-    //         $temp = json_decode(curlApi($url, $resData, "POST"), true);
-    //         return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
-    //     }
-    // }
    // 对账
    public function checkPay(Request $request, $id)
    {
@@ -1371,7 +1321,7 @@ Class OrderController extends Controller
            } else {
                $payLog['is_paid'] = 2;
-                if (DB::connection('order')->table('lie_pay_log')->where(['order_id'=>$order_id, 'pay_type'=>2])->update($payLog)) {
+                if (PayLogModel::where(['order_id'=>$order_id, 'pay_type'=>2])->update($payLog)) {
                    return array('errcode'=>0,'errmsg'=>'操作成功');
                } 
            }
@@ -1518,11 +1468,11 @@ Class OrderController extends Controller
            $map['rec_id']   = $v['rec_id'];
            $map['goods_id'] = $v['goods_id'];
            // 获取出库数量
-            $removal = DB::connection('order')->table('lie_removal_items')->where($map)->select('removal_number')->first();
+            $removal = RemovalItemsModel::where($map)->select('removal_number')->first();
            $v['removal_number'] = $removal ? $removal->removal_number : 0; 
            // 获取已申请退货数量
-            $v['already_return_num'] = DB::connection('order')->table('lie_order_return_items')->where($map)->sum('return_num');
+            $v['already_return_num'] = OrderReturnItemsModel::where($map)->sum('return_num');
        }
        return view('detail', $info);
@@ -1684,7 +1634,7 @@ Class OrderController extends Controller
        $info = $this->orderDetail($request, $id);
        $this->pageHeader($request, $info, '发货', ["title" => '发货', "href" => '#']);
-        $shippings = DB::connection('order')->table('lie_shipping')->where(['enabled'=>1,'is_order'=>1])->get();//获取配送方式
+        $shippings = ShippingModel::where(['enabled'=>1,'is_order'=>1])->get();//获取配送方式
        $ship_type = [];
        foreach ($shippings as $key => $value) {
@@ -1737,7 +1687,7 @@ Class OrderController extends Controller
        }
        //物流信息
-        $shippings = DB::connection('order')->table('lie_shipping')->where(['enabled'=>1,'is_invoice'=>1])->get();
+        $shippings = ShippingModel::where(['enabled'=>1,'is_invoice'=>1])->get();
        $shippingArr = [];
        foreach ($shippings as $key => $value) {
@@ -1779,10 +1729,10 @@ Class OrderController extends Controller
        // }
        // 获取操作记录
-        $actionLog = DB::connection('order')->table('lie_order_action_log')->where('order_id', $id)->orderBy('create_time', 'DESC')->orderBy('log_id', 'DESC')->get();
+        $actionLog = OrderActionLogModel::where('order_id', $id)->orderBy('create_time', 'DESC')->orderBy('log_id', 'DESC')->get();
        // 获取ERP支付记录
-        $erpPayLog = DB::connection('order')->table('lie_erp_pay_log')->where('order_id', $id)->orderBy('create_time', 'DESC')->orderBy('log_id', 'DESC')->get();
+        $erpPayLog = ErpPayLogModel::where('order_id', $id)->orderBy('create_time', 'DESC')->orderBy('log_id', 'DESC')->get();
        $response = [
            // 'user_mobile'              => $mobile,
@@ -1992,9 +1942,7 @@ Class OrderController extends Controller
     */
    public function checkOrderSendSms()
    {
-        $order = DB::connection('order')
+        $order = OrderModel::where('order_goods_type', '=', 1)
-                ->table('lie_order')
-                ->where('order_goods_type', '=', 1)
                ->where('status', '=', 2)
                // ->whereNotIn('user_id', $this->testMobile())
                ->where('is_type', '=', 0)
@@ -2061,9 +2009,9 @@ Class OrderController extends Controller
    {
        $time = strtotime(date('Y-m-d', time())); // 当天0点
-        $order = DB::connection('order')
+        $OrderModel = new OrderModel;
-                ->table('lie_order')
-                ->where('order_goods_type', '=', 1)
+        $order = $OrderModel->where('order_goods_type', '=', 1)
                ->where('order_pay_type', '<>', 3) // 过滤账期订单
                ->where('status', '=', 2)
                // ->whereNotIn('user_id', $this->testMobile())
@@ -2077,10 +2025,7 @@ Class OrderController extends Controller
            foreach ($order as $v) {
                // 到达付款时间后自动取消订单
                if ($v->pay_time <= time()) {
-                    $update = DB::connection('order')
+                    $update = $OrderModel->where('order_id', '=', $v->order_id)->update(['status' => -1, 'pay_time' => 0, 'cancel_time' => time()]);
-                            ->table('lie_order')
-                            ->where('order_id', '=', $v->order_id)
-                            ->update(['status' => -1, 'pay_time' => 0, 'cancel_time' => time()]);
                    if ($update) {
                        // 操作记录
@@ -2109,11 +2054,11 @@ Class OrderController extends Controller
            return ['errcode'=>Error::E_NOT_EXISTS, 'errmsg'=>'参数不存在'];
        } 
-        $order = DB::connection('order')->table('lie_order')->where('order_id', '=', $order_id)->select('pay_time')->first();
+        $order = OrderModel::where('order_id', '=', $order_id)->select('pay_time')->first();
        $delay_time = $order->pay_time + $delay_time * 86400;
-        $update = DB::connection('order')->table('lie_order')->where('order_id', '=', $order_id)->update(['pay_time'=>$delay_time]);
+        $update = OrderModel::where('order_id', '=', $order_id)->update(['pay_time'=>$delay_time]);
        if (!$update) {
            errorLog(Error::E_UPDATE_FAILED, '延长失败');
@@ -2163,7 +2108,7 @@ Class OrderController extends Controller
            $data['contract_link_tel']  = $request->input('contract_link_tel', '');
            DB::connection('order')->transaction(function() use ($request, $order_id, $data) {
-                DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->update($data);
+                OrderExtendModel::where('order_id', $order_id)->update($data);
                $OrderActionLogModel = new OrderActionLogModel();
                $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '编辑合同乙方信息'); // 操作记录       
@@ -2181,8 +2126,8 @@ Class OrderController extends Controller
            $data['upload_contract_url'] = $request->input('url');
            DB::connection('order')->transaction(function() use ($request, $order_id, $data) {
-                DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['erp_syn'=>1]); // 标记ERP同步
+                OrderModel::where('order_id', $order_id)->update(['erp_syn'=>1]); // 标记ERP同步
-                DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->update($data);
+                OrderExtendModel::where('order_id', $order_id)->update($data);
                $OrderActionLogModel = new OrderActionLogModel();
                $OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '回传合同'); // 操作记录       
@@ -2220,17 +2165,13 @@ Class OrderController extends Controller
        $testMobile = $userMainModel->testMobile();
        // 订单数量
-        $halfCount = DB::connection('order')->table('lie_order')
+        $halfCount = OrderModel::whereNotIn('user_id', $testMobile)
-                    // ->where('order_goods_type', 1)
-                    // ->where('order_type', 1)
-                    ->whereNotIn('user_id', $testMobile)
                    ->where('is_type', 0)
                    ->whereBetween('create_time', [$half, $current])
                    ->count();
        echo '半年订单数：'.$halfCount.'<br>';
-        $yearCount = DB::connection('order')->table('lie_order')
+        $yearCount = OrderModel::whereNotIn('user_id', $testMobile)
-                    ->whereNotIn('user_id', $testMobile)
                    ->where('is_type', 0)
                    ->whereBetween('create_time', [$year, $current])
                    ->count();
@@ -2285,7 +2226,7 @@ Class OrderController extends Controller
        // 查找用户订单数，并更新用户表和订单扩展表
        $subQuery = OrderModel::where('is_type', '=', 0)->where('status', '<>', -1)->orderBy('order_id');
-        DB::connection('order')->table('lie_order_extend')->update(['is_new' => 0]); // 是否新订单恢复默认值0
+        OrderExtendModel::update(['is_new' => 0]); // 是否新订单恢复默认值0
        OrderModel::from(DB::raw("({$subQuery->toSql()}) as sub"))
        ->mergeBindings($subQuery->getQuery())
@@ -2304,17 +2245,17 @@ Class OrderController extends Controller
                }
                // 更新用户
-                DB::connection('order')->table('lie_user_main')->where('user_id', $v->user_id)->update($new_user);
+                UserMainModel::where('user_id', $v->user_id)->update($new_user);
-                $extend = DB::connection('order')->table('lie_order_extend')->where('order_id', $v->order_id)->first();
+                $extend = OrderExtendModel::where('order_id', $v->order_id)->first();
                if ($extend) {
                    // 更新订单          
-                    DB::connection('order')->table('lie_order_extend')->where('order_id', $v->order_id)->update($new_order);
+                    OrderExtendModel::where('order_id', $v->order_id)->update($new_order);
                } else {
                    // 创建  
                    $new_order['order_id'] = $v->order_id;   
-                    DB::connection('order')->table('lie_order_extend')->insert($new_order);
+                    OrderExtendModel::insert($new_order);
                }    
            }
        });

--- a/app/Http/Controllers/RefundController.php
+++ b/app/Http/Controllers/RefundController.php
@@ -4,13 +4,14 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Http\Requests;
+use App\Http\Page;
 use App\Http\Controllers\Controller;
+use App\Model\UserMainModel;
 use App\Model\OrderModel;
+use App\Model\PayLogModel;
 use App\Model\OrderRefundModel;
 use App\Model\OrderRefundItemsModel;
 use DB;
-use App\Http\Page;
-use App\Model\UserMainModel;
 // 获取会员账号
 function getAccountName($user_id)
@@ -43,21 +44,15 @@ function getOrderAmount($order_id)
 // 获取支付名称
 function getPayName($order_id) 
 {
-    $payLog = DB::connection('order')
+    $payLog = PayLogModel::where(['order_id' => $order_id])->select('pay_name')->get();
-            ->table('lie_pay_log')
-            ->where(['order_id' => $order_id])
+    if ($payLog->isEmpty()) return false;
-            ->select('pay_name')
-            ->get();
-    if (!empty($payLog)) {
    foreach ($payLog as $v) {
        $payName[] = $v->pay_name; 
    }
    return implode(',', $payName);
-    }
-    return false;
 }
 class RefundController extends Controller
@@ -225,7 +220,7 @@ class RefundController extends Controller
    {
        $refund_id = $request->input('refund_id');
-        $update = DB::connection('order')->table('lie_order_refund')->where('refund_id', $refund_id)->update(['status' => -1]);
+        $update = OrderRefundModel::where('refund_id', $refund_id)->update(['status' => -1]);
        if (!$update) return ['errcode' => 1, 'errmsg' => '取消申请失败'];

--- a/app/Http/Controllers/RegionController.php
+++ b/app/Http/Controllers/RegionController.php
@@ -11,7 +11,7 @@ class RegionController extends Controller
    public function getAll()
    {
        $provinces = array(); $citys = array(); $towns = array();
-        $list = DB::connection('order')->table('lie_region')->orderBy('region_id', 'asc')->get();
+        $list = RegionModel::orderBy('region_id', 'asc')->get();
        foreach (@$list as $val) {
            if (!$val->parent_id) continue;
@@ -45,7 +45,7 @@ class RegionController extends Controller
        if (empty($region_id)){
            return "";
        }
-        $list = DB::connection('order')->table('lie_region')->select("region_name")->where("region_id",$region_id)->get();
+        $list = RegionModel::select("region_name")->where("region_id",$region_id)->get();
        return !$list ? "" :  current(objectToArray($list))['region_name'];
    }

--- a/app/Http/Controllers/ReturnController.php
+++ b/app/Http/Controllers/ReturnController.php
@@ -3,34 +3,30 @@
 namespace App\Http\Controllers;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redis;
 use App\Http\Requests;
+use App\Http\Page;
 use App\Http\Controllers\Controller;
 use App\Model\OrderModel;
 use App\Model\OrderReturnModel;
 use App\Model\OrderReturnItemsModel;
-use DB;
+use App\Model\PayLogModel;
-use App\Http\Page;
 use App\Model\UserMainModel;
-use Illuminate\Support\Facades\Redis;
+use App\Model\ShippingModel;
+use DB;
 // 获取支付名称
 function getPayName($order_id) 
 {
-    $payLog = DB::connection('order')
+    $payLog = PayLogModel::where(['order_id' => $order_id])->select('pay_name')->get();
-            ->table('lie_pay_log')
-            ->where(['order_id' => $order_id])
+    if ($payLog->isEmpty()) return false;
-            ->select('pay_name')
-            ->get();
-    if (!empty($payLog)) {
    foreach ($payLog as $v) {
        $payName[] = $v->pay_name; 
    }
    return implode(',', $payName);
-    }
-    return false;
 }
 // 获取交易员名称
@@ -46,7 +42,7 @@ function getSalesName($sale_id)
 // 获取物流名称
 function getShippingName($shipping_id) 
 {
-    $shipping = DB::connection('order')->table('lie_shipping')->where('shipping_id', $shipping_id)->select('shipping_name')->first();
+    $shipping = ShippingModel::where('shipping_id', $shipping_id)->select('shipping_name')->first();
    return $shipping ? $shipping->shipping_name : '';
 }
@@ -152,7 +148,7 @@ class ReturnController extends Controller
        $show = $page->show();
        // 获取配送方式
-        $shippings = DB::connection('order')->table('lie_shipping')->get(); 
+        $shippings = ShippingModel::get(); 
        $ship_type = [];
        foreach ($shippings as $k => $v) {

--- a/app/Http/Controllers/SpecialController.php
+++ b/app/Http/Controllers/SpecialController.php
@@ -40,14 +40,14 @@ class SpecialController extends Controller
        DB::connection('order')->beginTransaction();
-        $order = DB::connection('order')->table('lie_order_price')->where('order_id', $order_id)->where('price_type', 3)->first();
+        $order = OrderPriceModel::where('order_id', $order_id)->where('price_type', 3)->first();
        if (!$order) {
            echo '运费不存在';die;
        }
        $data['price'] = 0;
-        $update = DB::connection('order')->table('lie_order_price')->where('order_id', $order_id)->where('price_type', 3)->update($data);
+        $update = OrderPriceModel::where('order_id', $order_id)->where('price_type', 3)->update($data);
        if (!$update) {
            DB::connection('order')->rollback();

--- a/app/Http/Controllers/WebController.php
+++ b/app/Http/Controllers/WebController.php
@@ -2,6 +2,8 @@
 namespace App\Http\Controllers;
+use Illuminate\Http\Request;
+use App\Http\Requests;
 use App\Http\Page;
 use App\Map\PcbOrderInvoiceMap;
 use App\Map\PcbOrderMap;
@@ -15,12 +17,9 @@ use App\Model\PaymentDaysModel;
 use App\Model\Pcb\PcbOrderModel;
 use App\Model\Pcb\PcbPublicModel;
 use App\Model\Pcb\PcbPurchaseModel;
-use Illuminate\Http\Request;
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\PermController;
-use DB;
 use App\Model\UserMainModel;
 use App\Model\UserInfoModel;
 use App\Model\UserCompanyModel;
@@ -31,6 +30,8 @@ use App\Model\OrderServiceLogModel;
 use App\Model\OrderExtendModel;
 use App\Model\PayLogModel;
 use App\Model\OrderInvoiceModel;
+use App\Model\ShippingModel;
+use DB;
 class WebController extends Controller
 {
@@ -97,7 +98,7 @@ class WebController extends Controller
        $data['title']='PCB交易列表';
        $data['order_type'] = PcbOrderMap::$order_type;
        $data['status'] = PcbOrderMap::$status;
-        $data['shipping'] = objectToArray(DB::connection("order")->table("lie_shipping")->get());
+        $data['shipping'] = objectToArray(ShippingModel::get());
        //分页
        $response = (new PcbOrderModel())->getList();
        $page = new Page($response[3], 10);
@@ -164,7 +165,7 @@ class WebController extends Controller
        $orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
        $orderBase['finish_time'] = $orderBase['finish_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['finish_time']) : "";
        $orderBase['pay_time'] = $orderBase['pay_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['pay_time']) : "";
-        $userCompany = DB::connection('order')->table("lie_user_company")->where("user_id",$orderBase['user_id'])->first();
+        $userCompany = UserCompanyModel::where("user_id",$orderBase['user_id'])->first();
        $orderBase['company_name'] = $userCompany ? $userCompany->com_name : "" ;
        //拼接收货信息
        $RegionController = new RegionController();
@@ -250,7 +251,7 @@ class WebController extends Controller
        $orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
        $orderBase['finish_time'] = $orderBase['finish_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['finish_time']) : "";
        $orderBase['pay_time'] = $orderBase['pay_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['pay_time']) : "";
-        $userCompany = DB::connection('order')->table("lie_user_company")->where("user_id",$orderBase['user_id'])->first();
+        $userCompany = UserCompanyModel::where("user_id",$orderBase['user_id'])->first();
        $orderBase['company_name'] = $userCompany ? $userCompany->com_name : "" ;
        //拼接采购信息

--- a/app/Model/InvoiceCompanyModel.php
+++ b/app/Model/InvoiceCompanyModel.php
+<?php
+namespace App\Model;
+use Illuminate\Database\Eloquent\Model;
+use Request;
+use Excel;
+use DB;
+class InvoiceCompanyModel extends Model
+{
+    protected $connection = 'web';
+    protected $table      = 'lie_invoice_company';
+    protected $primaryKey = 'id';
+    public $timestamps    = false;
+}
\ No newline at end of file
--- a/app/Model/OrderModel.php
+++ b/app/Model/OrderModel.php
@@ -6,6 +6,8 @@ use Illuminate\Support\Facades\Redis;
 use Request;
 use Excel;
 use DB;
+use App\Model\OrderPriceModel;
+use App\Model\UserMainModel;
 class OrderModel extends Model
 {
@@ -36,7 +38,7 @@ class OrderModel extends Model
                // ->leftJoin('lie_order_shipping as s', function($join) {
                //     $join->on('o.order_id', '=', 's.order_id')->where('s.shipping_type', '=', 1);
                // })
-                ->leftJoin('lie_user_main as u', 'o.user_id', '=', 'u.user_id')
+                // ->leftJoin('lie_user_main as u', 'o.user_id', '=', 'u.user_id')
                // ->leftJoin('lie_user_company as c', 'o.user_id', '=', 'c.user_id')
                ->where(function ($query) use ($map) {
                    // 查询类型
@@ -46,11 +48,16 @@ class OrderModel extends Model
                        } else if($map['order_type'] == 4) { // 会员ID
                            $query->where('o.user_id', '=', $map['order_contain']);
                        } else { // 会员账号 
+                            $user_map = [];
                            if (preg_match('/@/', $map['order_contain'])) {
-                                $query->where('u.email', '=', $map['order_contain']);
+                                $user_map['email'] = $map['order_contain'];
                            } else {
-                                $query->where('u.mobile', '=', $map['order_contain']);
+                                $user_map['mobile'] = $map['order_contain'];
                            }
+                            $user_id = UserMainModel::where($user_map)->value('user_id');
+                            $query->where('o.user_id', '=', $user_id);
                        }
                    }
                })
@@ -235,12 +242,12 @@ class OrderModel extends Model
                        $query->where('i.inv_type', '=', $map['order_invoice_status']);
                    }
                })
-                ->where(function ($query) use ($map) {
+                // ->where(function ($query) use ($map) {
-                    // 是否为新用户
+                //     // 是否为新用户
-                    if ($map['is_new'] != '') {
+                //     if ($map['is_new'] != '') {
-                        $query->where('u.is_new', '=', $map['is_new']);
+                //         $query->where('u.is_new', '=', $map['is_new']);
-                    }
+                //     }
-                })
+                // })
                ->where(function ($query) use ($map) {
                    // 是否新订单
                    if ($map['is_new_order'] != '') {
@@ -261,7 +268,7 @@ class OrderModel extends Model
                })
                ->where('it.status', 1)
                ->where('o.order_goods_type', '=', $map['order_goods_type'])
-                ->select('o.order_id', 'o.order_sn', 'o.order_type', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.sale_type', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'o.advance_pay_time', 'o.pay_time', 'it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.single_pre_price', 'it.brand_name', 'it.supplier_name', 'it.goods_class', 'it.self_supplier_type', 'it.extra_price', 'it.goods_discount_amount', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'i.tax_title', 'i.company_address', 'i.company_phone', 'i.tax_no', 'i.bank_name', 'i.bank_account', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'u.is_new', 'u.is_test', 'oe.erp_sn', 'oe.order_type as extend_order_type', 'oe.send_remark', 'oe.is_new as is_new_order', 'oe.business_type', 'oe.jd_order_id', 'oe.exchange_rate', 'oe.sample_demand_desc')
+                ->select('o.order_id', 'o.order_sn', 'o.user_id', 'o.order_type', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.sale_type', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'o.advance_pay_time', 'o.pay_time', 'it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.single_pre_price', 'it.brand_name', 'it.supplier_name', 'it.goods_class', 'it.self_supplier_type', 'it.extra_price', 'it.goods_discount_amount', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'i.tax_title', 'i.company_address', 'i.company_phone', 'i.tax_no', 'i.bank_name', 'i.bank_account', 'oe.erp_sn', 'oe.order_type as extend_order_type', 'oe.send_remark', 'oe.is_new as is_new_order', 'oe.business_type', 'oe.jd_order_id', 'oe.exchange_rate', 'oe.sample_demand_desc')
                ->groupBy('it.rec_id')
                ->orderBy('o.create_time', 'DESC')
                // ->get()
@@ -272,6 +279,8 @@ class OrderModel extends Model
                    $list['data'] = $this->exportList($list['data']); // 订单数据处理
                }
+                // 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'u.is_new', 'u.is_test',
                return $list;
 // dump($list->getBindings());
 // dump($list->toSql());
@@ -366,6 +375,10 @@ class OrderModel extends Model
                            return strtoupper($item['order_id'].'.'.$item['price_type']);
                        })->toArray();
+        // 获取用户信息
+        $UserMainModel = new UserMainModel();
+        $user_info = $UserMainModel->whereIn('user_id', $all_user_id)->select('mobile', 'email', 'client_source', 'is_new', 'is_test', 'user_id')->get()->keyBy('user_id')->toArray();
        // 获取用户公司名称
        $UserCompanyModel = new UserCompanyModel();
        $company_info = $UserCompanyModel->whereIn('user_id', $all_user_id)->lists('com_name', 'user_id')->toArray();
@@ -379,6 +392,16 @@ class OrderModel extends Model
        $order_shipping = $OrderShippingModel->where('shipping_type', 1)->whereIn('order_id', $all_order_id)->select('order_id', 'status')->get()->keyBy('order_id')->toArray();
        for ($i = 0; $i < count($order); $i++) {
+            $user = isset($user_info[$order[$i]['user_id']]) ? $user_info[$order[$i]['user_id']] : '';
+            if (!$user) {
+                $user['mobile']        = '';
+                $user['email']         = '';
+                $user['client_source'] = '';
+                $user['is_new']        = '';
+                $user['is_test']       = '';
+            }
            $current_com_name       = isset($company_info[$order[$i]['user_id']]) ? $company_info[$order[$i]['user_id']] : ''; // 当前公司
            $current_order_addr     = isset($order_address[$order[$i]['order_id']]) ? $order_address[$order[$i]['order_id']] : ''; // 当前订单收货地址
            $current_order_shipping = isset($order_shipping[$order[$i]['order_id']]) ? $order_shipping[$order[$i]['order_id']] : ''; // 当前订单物流
@@ -387,7 +410,7 @@ class OrderModel extends Model
            $tmp[$i]['order_sn']     = "\t".$order[$i]['order_sn']."\t";
            $tmp[$i]['erp_sn']       = "\t".$order[$i]['erp_sn']."\t";
            $tmp[$i]['jd_order_id']  = "\t".$order[$i]['jd_order_id']."\t";          
-            $tmp[$i]['user_account'] = $order[$i]['mobile'] ? $order[$i]['mobile'] : $order[$i]['email'];
+            $tmp[$i]['user_account'] = isset($user['mobile']) ? $user['mobile'] : $user['email'];
            // $tmp[$i]['is_new']     = $order[$i]['is_new'] == 1 ? '是' : '否'; // 是否为新用户
            $tmp[$i]['consignee']        = isset($current_order_addr['consignee']) ? $current_order_addr['consignee']."\t" : '';
@@ -463,12 +486,12 @@ class OrderModel extends Model
                $tmp[$i]['send_remark']   = '';
            } else {
                $tmp[$i]['adtags']          = $order[$i]['order_source'];
-                $tmp[$i]['client_source']   = $order[$i]['client_source'];
+                $tmp[$i]['client_source']   = $user['client_source'];
                $tmp[$i]['cancel_reason']   = $order[$i]['cancel_reason'];
                $tmp[$i]['send_remark']     = $order[$i]['send_remark'];
            }
-            $tmp[$i]['is_test'] = $order[$i]['is_test'] == 1 ? '是' : '否';
+            $tmp[$i]['is_test'] = $user['is_test'] == 1 ? '是' : '否';
            if ($order[$i]['order_goods_type'] == 2) {
                $tmp[$i]['sale_type']     = $order[$i]['sale_type'] == 1 ? '现卖' : '预售';
@@ -559,9 +582,6 @@ class OrderModel extends Model
        }
        return $result[0]['region_name'].$suffix;
    }
    // 获取自营商品型号
@@ -575,9 +595,9 @@ class OrderModel extends Model
    // 订单金额展示
    public function getOrderPrice($order_id, $type)
    {
-        $price = DB::connection('order')->table('lie_order_price')->where('order_id', '=', $order_id)->where('price_type', '=', $type)->select('price')->first();
+        $price = OrderPriceModel::where('order_id', '=', $order_id)->where('price_type', '=', $type)->value('price');
-        return $price ? $price->price : 0;
+        return $price ? $price : 0;
    }
    // 获取订单来源

--- a/app/Model/OrderReturnItemsModel.php
+++ b/app/Model/OrderReturnItemsModel.php
--- a/app/Model/OrderReturnModel.php
+++ b/app/Model/OrderReturnModel.php
@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Redis;
 use Request;
 use Excel;
 use DB;
+use App\Model\ShippingModel;
 class OrderReturnModel extends Model
 {
@@ -161,9 +162,7 @@ class OrderReturnModel extends Model
    // 获取物流名称
    public function getShippingName($shipping_id) 
    {
-        $shipping = DB::connection('order')->table('lie_shipping')->where('shipping_id', $shipping_id)->select('shipping_name')->first();
+        return ShippingModel::where('shipping_id', $shipping_id)->value('shipping_name');
-        return $shipping ? $shipping->shipping_name : '';
    }
    // 审核

--- a/app/Model/PaymentDaysModel.php
+++ b/app/Model/PaymentDaysModel.php
@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Request;
 use Excel;
 use DB;
+use App\Model\RegionModel;
 class PaymentDaysModel extends Model
 {
@@ -60,7 +61,7 @@ class PaymentDaysModel extends Model
            })
            ->select($Select)->first()->toArray();
        if(!$info) return false;
-        $address=DB::connection('order')->table('lie_region')->whereIn('region_id',[$info['com_area_id'],$info['com_city_id'],$info['com_province_id']])->lists('region_name','region_id');
+        $address=RegionModel::whereIn('region_id',[$info['com_area_id'],$info['com_city_id'],$info['com_province_id']])->lists('region_name','region_id');
        $info['address']=$address;
        return $info;
    }

--- a/app/Model/Pcb/PcbOrderModel.php
+++ b/app/Model/Pcb/PcbOrderModel.php
@@ -4,6 +4,7 @@ namespace App\Model\Pcb;
 use App\Map\PcbOrderMap;
 use App\Model\UserMainModel;
+use App\Model\UserCompanyModel;
 use Illuminate\Database\Eloquent\Model;
 use Request;
 use DB;
@@ -107,7 +108,7 @@ class PcbOrderModel extends Model
            $shipping = $con->table('shipping')->where(['relevance_id' => $v['order_id'],'shipping_type'=>1])->first();
            $v['shipping_no'] = $shipping ? $shipping->shipping_no : "";
            $v['shipping_name'] = $shipping ? $shipping->shipping_name : "";
-            $userCompany = DB::connection('order')->table("lie_user_company")->where("user_id",$v['user_id'])->first();
+            $userCompany = UserCompanyModel::where("user_id",$v['user_id'])->first();
            $v['company_name'] = $userCompany ? $userCompany->com_name : "" ;
        }
        return $data;

--- a/app/Model/RemovalItemsModel.php
+++ b/app/Model/RemovalItemsModel.php
+<?php
+namespace App\Model;
+use Illuminate\Database\Eloquent\Model;
+use Request;
+use Excel;
+use DB;
+class RemovalItemsModel extends Model
+{
+    protected $connection = 'order';
+    protected $table      = 'lie_removal_items';
+    protected $primaryKey = 'removal_items_id';
+    public $timestamps    = false;
+}
\ No newline at end of file
--- a/app/Model/ShippingModel.php
+++ b/app/Model/ShippingModel.php
+<?php
+namespace App\Model;
+use Illuminate\Database\Eloquent\Model;
+use Request;
+use Excel;
+use DB;
+class ShippingModel extends Model
+{
+	protected $connection = 'web';
+	protected $table      = 'lie_shipping';
+	protected $primaryKey = 'shipping_id';
+	public $timestamps    = false;
+}
\ No newline at end of file
--- a/app/Model/ShoppingCartModel.php
+++ b/app/Model/ShoppingCartModel.php
@@ -6,7 +6,7 @@ use Request;
 class ShoppingCartModel extends Model
 {
-	protected $connection = 'order';
+	protected $connection = 'web';
 	protected $table      = 'lie_shopping_cart';
 	protected $primaryKey = 'cart_id';
 	public $timestamps    = false;

--- a/app/Model/TaxInfoModel.php
+++ b/app/Model/TaxInfoModel.php
+<?php
+namespace App\Model;
+use Illuminate\Database\Eloquent\Model;
+use Request;
+use Excel;
+use DB;
+class TaxInfoModel extends Model
+{
+    protected $connection = 'web';
+    protected $table      = 'lie_taxinfo';
+    protected $primaryKey = 'tax_id';
+    public $timestamps    = false;
+}
\ No newline at end of file
--- a/app/Model/UserAddressModel.php
+++ b/app/Model/UserAddressModel.php
+<?php
+namespace App\Model;
+use Illuminate\Database\Eloquent\Model;
+use Request;
+use Excel;
+use DB;
+class UserAddressModel extends Model
+{
+    protected $connection = 'web';
+    protected $table      = 'lie_user_address';
+    protected $primaryKey = 'address_id';
+    public $timestamps    = false;
+}
\ No newline at end of file
--- a/app/Model/UserCompanyModel.php
+++ b/app/Model/UserCompanyModel.php
@@ -9,7 +9,7 @@ use App\Model\RegionModel;
 class UserCompanyModel extends Model
 {
-    protected $connection = 'order';
+    protected $connection = 'web';
    protected $table      = 'lie_user_company';
    protected $primaryKey = 'com_id';
    public $timestamps    = false;

--- a/app/Model/UserMainModel.php
+++ b/app/Model/UserMainModel.php
@@ -8,7 +8,7 @@ use DB;
 class UserMainModel extends Model
 {
-	protected $connection = 'order';
+	protected $connection = 'web';
    protected $table = 'lie_user_main';
    protected $primaryKey = 'user_id';
    public $timestamps = false;

--- a/config/database.php
+++ b/config/database.php
@@ -71,16 +71,29 @@ return [
            'strict'    => false,
        ],
-        'order' => [
+        'web' => [
            'driver'    => 'mysql',
            'host'      => env('DB_HOST', ''),
+            'database'  => env('DB_DATABASE_WEB', ''),
+            'username'  => env('DB_USERNAME_WEB', ''),
+            'password'  => env('DB_PASSWORD_WEB', ''),
+            'port'      => env('DB_PORT', 3306),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'order' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_ORDER', ''),
            'database'  => env('DB_DATABASE_ORDER', ''),
            'username'  => env('DB_USERNAME_ORDER', ''),
            'password'  => env('DB_PASSWORD_ORDER', ''),
            'port'      => env('DB_PORT', 3306),
            'charset'   => 'utf8',
            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
+            'prefix'    => env('DB_PREFIX_ORDER', ''),
            'strict'    => false,
        ],

--- a/resources/views/orderlist/content.blade.php
+++ b/resources/views/orderlist/content.blade.php
@@ -209,7 +209,7 @@
                                    </dd>
                                </dl>
                                @endif
-                                <dl>
+                                <!-- <dl>
                                    <dt>用户标签：</dt>
                                    <dd>
                                        <select id="is_new" name="is_new" class="form-control is_new selectpicker" title="全部">
@@ -219,7 +219,7 @@
                                            <option value="2">老客户</option>
                                        </select>
                                    </dd>
-                                </dl>
+                                </dl> -->
                                @endif
                                <dl>