ad

app/admin/controller/Channel.php

@@ -0,0 +1,134 @@
+<?php
+
+
+namespace app\admin\controller;
+
+
+use think\App;
+use think\facade\Validate;
+use think\facade\Db;
+class Channel extends Base{
+	public function __construct(App $app) {parent::__construct($app);}
+
+	public function add(){
+		$param =$this->request->only(["channel_name"=>"","companyNo"=>""],"post","trim");
+		$valid =Validate::rule(["channel_name|渠道名称"=>"require|max:255|min:4","companyNo|业务公司"=>"require|max:255"]);
+		if($valid->check($param)==false) return error_show(1006,$valid->getError());
+		$ist=Db::name("channel")->where("channel_name",$param['channel_name'])->findOrEmpty();
+		if(!empty($ist)) return error_show(1006,"渠道名称已存在");
+		$company = \app\admin\common\User::getIns()->handle("getCodeAndName",["code"=>$param['companyNo']]);
+		if(!isset($company['code'])|| $company['code']!=0) return error_show(1004,"未找到业务公司信息");
+		$comp = $company['data']??[];
+		$data=[
+			"channel_name"=>$param["channel_name"],
+			"companyName"=>$comp[$param['companyNo']]??"",
+			"companyNo"=>$param['companyNo'],
+			"apply_id"=>$this->uid,
+			"apply_name"=>$this->uname,
+			];
+		$int= Db::name("channel")->insert($data);
+		if($int==false) return error_show(1004,"渠道新建失败");
+		return app_show(0,"渠道新建成功");
+	}
+
+	public function edit(){
+		$param =$this->request->only(["channel_name"=>"","companyNo"=>"","id"=>""],"post","trim");
+		$valid =Validate::rule([
+			"channel_name|渠道名称"=>"require|max:255|min:4",
+			"id|渠道ID"=>"require|number|gt:0",
+			"companyNo|业务公司"=>"require|max:255"
+			]);
+		if($valid->check($param)==false) return error_show(1006,$valid->getError());
+		$ist=Db::name("channel")->where([["channel_name","=",$param['channel_name']],["id","<>",$param['id']]])->findOrEmpty();
+		if(!empty($ist)) return error_show(1006,"渠道名称已存在");
+		$company = \app\admin\common\User::getIns()->handle("getCodeAndName",["code"=>$param['companyNo']]);
+		if(!isset($company['code'])|| $company['code']!=0) return error_show(1004,"未找到业务公司信息");
+		$comp = $company['data']??[];
+		$data=[
+			"channel_name"=>$param["channel_name"],
+			"companyName"=>$comp[$param['companyNo']]??"",
+			"companyNo"=>$param['companyNo'],
+			"updatetime"=>date("Y-m-d H:i:s")
+			];
+		$int= Db::name("channel")->where($ist)->update($data);
+		if($int==false) return error_show(1004,"渠道编辑失败");
+		return app_show(0,"渠道编辑成功");
+	}
+
+	public function list(){
+		$param =$this->request->only(["channel_name"=>"","companyNo"=>"","companyName"=>"","page"=>1,"size"=>10],
+		"post","trim");
+		$where=[["is_del","=",0]];
+		if($param['channel_name']!=='')$where[]=["channel_name","like","%{$param['channel_name']}%"];
+		if($param['companyName']!=='')$where[]=["companyName","like","%{$param['companyName']}%"];
+		if($param['companyNo']!=='')$where[]=["companyNo","like","%{$param['companyNo']}%"];
+		$count=Db::name("channel")->where($where)->count();
+		$total=ceil($count/$param['size']);
+		$page= $total>$param['page'] ? $param['page'] : $total;
+		$list =Db::name("channel")->where($where)->page(intval($page),intval($param['size']))->order("id desc")->select()->toArray();
+		return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
+	}
+
+	public function query(){
+		$param =$this->request->only(["channel_name"=>"","companyNo"=>"","companyName"=>""],"post","trim");
+		$where=[["is_del","=",0]];
+		if($param['channel_name']!=='')$where[]=["channel_name","like","%{$param['channel_name']}%"];
+		if($param['companyName']!=='')$where[]=["companyName","like","%{$param['companyName']}%"];
+		if($param['companyNo']!=='')$where[]=["companyNo","=",$param['companyNo']];
+		$list =Db::name("channel")->where($where)->field("*,LENGTH(channel_name) as weight")->order("weight desc")
+		->select()->toArray();
+		return app_show(0,"获取成功",$list);
+	}
+
+	public function delete(){
+		$param =$this->request->only(["id"=>""],"post","trim");
+		$list =Db::name("channel")->where(["id"=>$param['id']])->findOrEmpty();
+		if(empty($list))return error_show(1004,"未找到渠道信息");
+		if($list["is_del"]==1)return error_show(1004,"渠道已删除");
+		$int=Db::name("channel")->where(["id"=>$param['id']])->update(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+		if($int==false) return error_show(1004,"渠道删除失败");
+		Db::name("platform_channel")->where(["channel_id"=>$param['id']])->update(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+		return app_show(0,"渠道删除成功");
+	}
+
+	public function channelCatList(){
+		$param =$this->request->only(["channel_id"=>"0","cat_id"=>'',"cat_name"=>"","page"=>1,"size"=>15],"post","trim");
+		$where=[["is_del","=",0]];
+		if($param['channel_id']!=='') $where[]=["channel_id","=",$param['channel_id']];
+		if($param['cat_id']!=='') $where[]=["cat_id","=",$param['cat_id']];
+		if($param['cat_name']!=='') $where[]=["cat_name","=",$param['cat_name']];
+		$list =Db::name("channel_cat")->alias("a")
+		->rightJoin("cat b","a.cat_id=b.cid")
+		->field("b.id as cat_id,b.cat_name,ifnull(a.channel_id,{$param['channel_id']}) channel_id,ifnull(a.rate,0) rate,ifnull(a.is_del,0) is_del")
+		->having($where)
+		->select();
+		return app_show(0,"获取成功",$list);
+	}
+
+	public function channleCatSave(){
+		$param =$this->request->only(["channel_id"=>"","cat_id"=>'',"rate"=>""],"post","trim");
+		$valid =Validate::rule([
+			"channel_id|渠道"=>"require|number|gt:0",
+			"cat_id|分类"=>"require|number|gt:0",
+			"rate|费率"=>"require|float|egt:0",
+			]);
+		if($valid->check($param)==false) return error_show(1004,$valid->getError());
+		$catifno = Db::name("channel_cat")->where(["channel_id"=>$param['channel_id'],"cat_id"=>$param['cat_id'],"is_del"=>0])->findOrEmpty();
+		if(empty($catifno)){
+			$catifno=[
+				"channel_id"=>$param["channel_id"],
+				"cat_id"=>$param["cat_id"],
+				"rate"=>$param["rate"],
+				"apply_id"=>$this->uid,
+				"apply_name"=>$this->uname,
+			];
+		}else{
+			$catifno['rate'] = $param['rate'];
+			$catifno['updatetime'] = date("Y-m-d H:i:s");
+		}
+		$up =Db::name("channel_cat")->save($catifno);
+		if($up==false) return error_show(1004,"渠道分类费率编辑失败");
+		return app_show(0,"渠道分类费率编辑成功");
+	}
+
+}

app/admin/controller/Platform.php

@@ -20,7 +20,6 @@ class Platform extends Base
             'is_select_pay_rate' => 0,
             'desc' => '',
             'status' => 0,
-            'pay_title' => '',
             'pay_list' => []
         ], 'post', 'trim');
 
@@ -31,41 +30,11 @@ class Platform extends Base
             'is_select_pay_rate|是否开启支付渠道' => 'require|number|in:0,1',
             'desc|描述' => 'max:255',
             'status|状态' => 'number|in:0,1',
-            'pay_title|渠道名称' => 'requireIf:is_select_pay_rate,1|max:255',
             'pay_list|渠道配置' => 'requireIf:is_select_pay_rate,1|array|max:100'
         ]);
         if ($val->check($param) == false) return json_show(1004, $val->getError());
-
-//        $platform_code = makeNo("PT");
-//        $platform_name = isset($this->post['platform_name']) && $this->post['platform_name'] !=="" ? trim($this->post['platform_name']):"";
-//        if($platform_name==""){
-//            return error_show(1003,"参数platform_name不能为空");
-//
-//        }
-//        $is_exit= Db::name("platform")->where(["platform_name"=>$platform_name])->find();
-//        if($is_exit){
-//            return error_show(1003,"平台名称已存在");
-//        }
-//        $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !=="" ? intval($this->post['platform_type']):"";
-//        if($platform_type===""){
-//            return error_show(1002,"参数platform_type不能为空");
-//        }
-//        $use_type = isset($this->post['use_type']) && $this->post['use_type'] !=="" ? intval($this->post['use_type']):"";
-//        if($use_type===""){
-//            return error_show(1002,"参数use_type不能为空");
-//        }
-//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-//        if($token==''){
-//            return error_show(105,"参数token不能为空");
-//        }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(1002,"创建人数据不存在");
-//        }
         $action_id = $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $action_name = $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-//        $desc=isset($this->post['desc']) && $this->post['desc'] !=="" ? trim($this->post['desc']):"";
-//        $status= isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']):"0";
 
         Db::startTrans();
 
@@ -104,63 +73,20 @@ class Platform extends Base
             $this->addPlat($platform_id);
 
             if ($param['is_select_pay_rate'] == 1) {
-
-                $userCommon = \app\admin\common\User::getIns();
-
-//                if (!isset($company_names['code']) || $company_names['code'] != 0) throw new Exception($company_names['message']);
-
-                $weight = 0;
-                $insert_da = [[
-                    'platform_id' => $platform_id,
-                    'companyNo' => 'GYS',
-                    'companyName' => '供应商',
-                    'supplierName' => '',
-	                'supplierNo' => '',
-                    'rate' => 0,
-                    'is_cgd' => 0,
-                    'is_qrd' => 1,
-                    'weight' => $weight++,
-                    'status' => 1,
-                    'is_del' => 0,
-                    "addtime" => $date,
-                    "updatetime" => $date
-                ]];
+            	$weight=0;
                 foreach ($param['pay_list'] as $pay) {
-                	$company_names = $userCommon->handle('hqInfo', ['code' =>$pay['companyNo']]);
                     $insert_da[] = [
                         'platform_id' => $platform_id,
-                        'companyNo' => $pay['companyNo'],
-                        'companyName' => $company_names['data']['name'] ?? '',
-                        'supplierName' => $company_names['data']['relation_name'] ?? '',
-                        'supplierNo' => $company_names['data']['relation_code'] ?? '',
-                        'rate' => $pay['rate'],
-                        'is_cgd' => 1,
-                        'is_qrd' => 1,
+                        'channel_id' => $pay['channel_id'],
+                        'apply_id' => $this->uid,
+                        'apply_name' => $this->uname,
                         'weight' => $weight++,
-                        'status' => 1,
                         'is_del' => 0,
                         "addtime" => $date,
                         "updatetime" => $date
                     ];
                 }
-
-                $insert_da[] = [
-                    'platform_id' => $platform_id,
-                    'companyNo' => 'KH',
-                    'companyName' => '客户',
-                    'supplierName' => '',
-	                'supplierNo' => '',
-                    'rate' => 0,
-                    'is_cgd' => 0,
-                    'is_qrd' => 0,
-                    'weight' => $weight++,
-                    'status' => 1,
-                    'is_del' => 0,
-                    "addtime" => $date,
-                    "updatetime" => $date
-                ];
-
-                if ($insert_da) Db::name('platform_pay_rate')->insertAll($insert_da);
+                if ($insert_da) Db::name('platform_channel')->insertAll($insert_da);
             }
 //                return error_show(0,"新建成功");
 //            }else{
@@ -280,51 +206,11 @@ class Platform extends Base
             'is_select_pay_rate|是否开启支付渠道' => 'require|number|in:0,1',
             'desc|描述' => 'max:255',
             'status|状态' => 'number|in:0,1',
-            'pay_title|渠道名称' => 'requireIf:is_select_pay_rate,1|max:255',
             'pay_list|渠道配置' => 'requireIf:is_select_pay_rate,1|array|max:100'
         ]);
 
         if ($val->check($param) == false) return json_show(1004, $val->getError());
 
-//        $id = isset($this->post['id']) && $this->post['id'] !== "" ? intval($this->post['id']) : "";
-//        if ($id == "") {
-//            return error_show(1002, "参数id不能为空");
-//        }
-//        $info = Db::name("platform")->where(['id' => $id, "is_del" => 0])->find();
-//        if ($info == "") {
-//            return error_show(1002, "未找到数据");
-//        }
-//        $platform_code = makeNo("PT");
-//        $platform_name = isset($this->post['platform_name']) && $this->post['platform_name'] !== "" ? trim($this->post['platform_name']) : "";
-//        if ($platform_name == "") {
-//            return error_show(1002, "参数platform_name不能为空");
-//        }
-//        $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !== "" ? intval($this->post['platform_type']) :"";
-//        if($platform_type===""){
-//            return error_show(1002,"参数platform_type不能为空");
-//        }
-//          $use_type = isset($this->post['use_type']) && $this->post['use_type'] !=="" ? intval($this->post['use_type']):"";
-//        if($use_type===""){
-//            return error_show(1002,"参数use_type不能为空");
-//        }
-//        $token = isset($this->post['token']) && $this->post['token'] != '' ? trim($this->post['token']) : "";
-//        if ($token == '') {
-//            return error_show(1005, "参数token不能为空");
-//        }
-//        $is_exit= Db::name("platform")->where([["platform_name","=",$platform_name],["id","<>",$id]])->find();
-//        if($is_exit){
-//            return error_show(1003,"平台名称已存在");
-//        }
-//        $user = GetUserInfo($token);
-//        if (empty($user) || $user['code'] != 0) {
-//            return error_show(102, "创建人数据不存在");
-//        }
-//        $action_id = isset($user["data"]['id']) ? $user["data"]['id'] : "";
-//        $action_name = isset($user["data"]['nickname']) ? $user["data"]['nickname'] : "";
-//        $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";
-//        $desc = isset($this->post['desc']) && $this->post['desc'] !== "" ? trim($this->post['desc']) : "";
-
-
         Db::startTrans();
 
         try {
@@ -343,21 +229,15 @@ class Platform extends Base
 
             $date = date('Y-m-d H:i:s');
 
-            $platform_code = makeNo("PT");
+//            $platform_code = makeNo("PT");
 
             $data = [
-                "platform_code" => $platform_code,
                 "platform_name" => $param['platform_name'],
                 "platform_type" => $param['platform_type'],
                 "use_type" => $param['use_type'],
                 "desc" => $param['desc'],
-//                "createrid" => $action_id,
-//                "creater" => $action_name,
                 'is_select_pay_rate' => $param['is_select_pay_rate'],
-                'pay_title' => $param['pay_title'],
                 "status" => $param['status'],
-//                "is_del" => 0,
-//                "addtime" => $date,
                 "updatetime" => $date
             ];
             Db::name("platform")->where(['is_del' => 0, 'id' => $param['id']])->update($data);
@@ -369,67 +249,22 @@ class Platform extends Base
             ChangeLog::logAdd(8, $info['platform_code'], $jsp, $json, ['id' => $this->uid, 'nickname' => $this->uname]);
 
             if ($param['is_select_pay_rate'] == 1) {
-
-                $userCommon = \app\admin\common\User::getIns();
-                $company_names = $userCommon->handle('getCodeAndName', ['code' => array_column($param['pay_list'], 'companyNo')]);
-
-                Db::name('platform_pay_rate')
-                    ->where(['is_del' => 0, 'platform_id' => $param['id']])
-                    ->update(['is_del' => 1, 'updatetime' => $date]);
-
                 $weight = 0;
-
-                $insert_da = [[
-                    'platform_id' => $param['id'],
-                    'companyNo' => 'GYS',
-                    'companyName' => '供应商',
-                    'supplierName' => '',
-	                'supplierNo' => '',
-                    'rate' => 0,
-                    'is_cgd' => 0,
-                    'is_qrd' => 1,
-                    'weight' => $weight++,
-                    'status' => 1,
-                    'is_del' => 0,
-                    "addtime" => $date,
-                    "updatetime" => $date
-                ]];
                 foreach ($param['pay_list'] as $pay) {
-                	$company_names = $userCommon->handle('hqInfo', ['code' =>$pay['companyNo']]);
-                    $insert_da[] = [
-                        'platform_id' => $param['id'],
-                        'companyNo' => $pay['companyNo'],
-                        'companyName' => $company_names['data']['name'] ?? '',
-                        'supplierName' => $company_names['data']['relation_name'] ?? '',
-                        'supplierNo' => $company_names['data']['relation_code'] ?? '',
-                        'rate' => $pay['rate'],
-                        'is_cgd' => 1,
-                        'is_qrd' => 1,
+                 $insert_da = [
+                 	    "id"=>$pay["id"]??null,
+                        'platform_id' => $info['id'],
+                        'channel_id' => $pay['channel_id'],
+                        'apply_id' => $this->uid,
+                        'apply_name' => $this->uname,
                         'weight' => $weight++,
-                        'status' => 1,
-                        'is_del' => 0,
+                        'is_del' => $pay['is_del']??0,
                         "addtime" => $date,
                         "updatetime" => $date
                     ];
+                 $up =Db::name("platform_channel")->save($insert_da);
+                 if($up==false) throw new \Exception("平台渠道信息更新失败");
                 }
-
-                $insert_da[] = [
-                    'platform_id' => $param['id'],
-                    'companyNo' => 'KH',
-                    'companyName' => '客户',
-                    'supplierName' => '',
-	                'supplierNo' => '',
-                    'rate' => 0,
-                    'is_cgd' => 0,
-                    'is_qrd' => 0,
-                    'weight' => $weight++,
-                    'status' => 1,
-                    'is_del' => 0,
-                    "addtime" => $date,
-                    "updatetime" => $date
-                ];
-
-                if ($insert_da) Db::name('platform_pay_rate')->insertAll($insert_da);
             }
 
             Db::commit();
@@ -479,9 +314,10 @@ class Platform extends Base
             ->find();
         if (empty($info)) return error_show(1004, '未找到数据');
         else {
-            $info['pay_list'] = Db::name('platform_pay_rate')
-                ->field('id,companyNo,companyName,rate,status')
-                ->where(['platform_id' => $info['id'], 'is_del' => 0])
+            $info['pay_list'] = Db::name('platform_channel')->alias("a")
+            ->leftJoin("channel b","a.channel_id=b.id")
+                ->field('a.id,b.companyNo,b.companyName,b.channel_name,a.is_del')
+                ->where(['a.platform_id' => $info['id'], 'a.is_del' => 0,"b.is_del"=>0])
                 ->order(['weight' => 'desc'])
                 ->select()
                 ->toArray();
@@ -525,12 +361,12 @@ class Platform extends Base
 
             if ($rs == 0) throw new Exception('该平台不存在');
 
-            Db::name('platform_pay_rate')
-                ->where(['is_del' => 0, 'platform_id' => $id])
-                ->update([
-                    'is_del' => 1,
-                    'updatetime' => date("Y-m-d H:i:s"),
-                ]);
+//            Db::name('platform_pay_rate')
+//                ->where(['is_del' => 0, 'platform_id' => $id])
+//                ->update([
+//                    'is_del' => 1,
+//                    'updatetime' => date("Y-m-d H:i:s"),
+//                ]);
 
             Db::commit();
 
@@ -586,13 +422,13 @@ class Platform extends Base
 
             if ($rs == 0) throw new Exception('该平台不存在或重复操作');
 
-            Db::name('platform_pay_rate')
-                ->where(['is_del' => 0, 'platform_id' => $param['id']])
-                ->where('status', '<>', $param['status'])
-                ->update([
-                    'status' => $param['status'],
-                    'updatetime' => date("Y-m-d H:i:s"),
-                ]);
+//            Db::name('platform_pay_rate')
+//                ->where(['is_del' => 0, 'platform_id' => $param['id']])
+//                ->where('status', '<>', $param['status'])
+//                ->update([
+//                    'status' => $param['status'],
+//                    'updatetime' => date("Y-m-d H:i:s"),
+//                ]);
 
             Db::commit();
 

app/admin/route/app.php

@@ -816,10 +816,18 @@ route::rule('child_out_get_list', 'admin/OrderOutChild/getList');//根据发货
 
 
 route::rule('order_cancel', 'admin/Sale/orderCancel');//订单取消
-
 route::rule('interorderinfo', 'admin/InterOrder/index');//录单订单详情
 route::rule('interorderadd', 'admin/InterOrder/create');//录单订单批量导入数据
 route::rule('interorderdel', 'admin/InterOrder/delete');//录单订单未转订单取消
 route::rule('interorderlist', 'admin/InterOrder/read');//录单订单未转订单取消
 route::rule('zxcopy', 'admin/Consult/zxcopy');//咨询单复制
 route::rule('zxcopyedit', 'admin/Consult/zxCopyEdit');//咨询单复制单编辑咨询
+
+route::rule('channeladd', 'admin/Channel/add');//渠道新建
+route::rule('channeledit', 'admin/Channel/edit');//渠道新建
+route::rule('channellist', 'admin/Channel/list');//渠道新建
+route::rule('channelquery', 'admin/Channel/query');//渠道新建
+route::rule('channeldel', 'admin/Channel/delete');//渠道新建
+route::rule('channelcatlist', 'admin/Channel/channelCatList');//渠道新建
+route::rule('channelcatsave', 'admin/Channel/channleCatSave');//渠道新建
+//route::rule('channeladd', 'admin/Channel/add');//渠道新建

app/command/InterMakeOrder.php

@@ -8,7 +8,9 @@ use think\console\Command;
 use think\console\Input;
 use think\console\input\Argument;
 use think\console\input\Option;
-use think\console\Output;use think\facade\Db;
+use think\console\Output;
+use think\facade\Db;
+use think\facade\Cache;
 
 class InterMakeOrder extends Command
 {
@@ -22,11 +24,18 @@ class InterMakeOrder extends Command
     protected function execute(Input $input, Output $output)
     {
     	$date=date("Y-m-d H:i:s");
+	    $rs = Cache::store('redis')->get('intermakeorder');
+
+	    if ($rs) return true;
+	    Cache::store('redis')->set("intermakeorder", 1, 5);
         Db::startTrans();
-        $interinfo =Db::name("inter_order")->where(["status"=>1,"is_del"=>1])->lock(True)->findOrEmpty();
-        try{
-			$this->makeOrder($interinfo);
-			$dip=Db::name("inter_order")->where($interinfo )->update(["status"=>2,"remark"=>'转单完成',"updatetime"=>date("Y-m-d H:i:s")]);
+        $interinfo =Db::name("inter_order")->where(["status"=>1,"is_del"=>0])->lock(True)->findOrEmpty();
+	    if(empty($interinfo)){ Db::rollback();return'';}
+		try{
+
+			$result=$this->makeOrder($interinfo);
+			$dip=Db::name("inter_order")->where($interinfo )->update(["orderCode"=>$result["orderCode"],
+			"cgdCode"=>$result["cgdCode"],"status"=>2,"remark"=>'转单完成',"updatetime"=>date("Y-m-d H:i:s")]);
 			if($dip==false) throw new \Exception("录单更新失败");
 			Db::commit();
 			$output->writeln("[$date] 录单{$interinfo['interNo']} 转单成功");
@@ -38,8 +47,12 @@ class InterMakeOrder extends Command
 		
 
     }
-
-    private function makeOrder($param):void{
+	/**
+	* @param $param
+	 * @return array
+	* @throws \Exception
+	 */
+    private function makeOrder($param):array{
     	$qrdcode = makeNo("QR");
         $cgddcode = makeNo("CG");
         $goodCode = makeNo("SKU");
@@ -145,7 +158,7 @@ class InterMakeOrder extends Command
             "moq" => 1,
             "customized" => 0,
             "platform_id" => $param['platform_id'],
-            "tax" => $param['tax'],
+            "tax" => $param['good_tax'],
             "supplierNo" => $param['supplierNo'],
             "supplierName" =>$param['supplierName'],
             "is_auth" => 1,
@@ -193,5 +206,6 @@ class InterMakeOrder extends Command
             if ($qrd == false) throw new \Exception("商品信息录入生成失败");
             $qrd = Db::name("order_addr")->insert($orderAddr);
             if ($qrd == false) throw new \Exception("销售单地址生成失败");
+            return ["orderCode"=>$qrdcode,"cgdCode"=>$cgddcode];
     }
 }

app/command/SplitSale.php

@@ -56,7 +56,7 @@ class SplitSale extends Command
 
 //                $cgd_insert_tmp_data=[];
 
-                $userCommon = new User();
+                $userCommon = new \User();
 
                 foreach ($data as $sale) {
 
@@ -198,7 +198,7 @@ class SplitSale extends Command
 //                    $cgd_insert_tmp_data = array_merge($cgd_insert_tmp_data, $this->cgd_insert);
 
                     //批量新增改为单次新增
-                    if ($this->cgd_insert) Db::name('cgd_caixiao')->insertAll($this->cgd_insert);
+                    if($this->cgd_insert) Db::name('cgd_caixiao')->insertAll($this->cgd_insert);
                     $this->cgd_insert = [];
                     $this->cgd_key = 0;
                 }