Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/UserCompanyBasic.php

@@ -182,7 +182,7 @@ class UserCompanyBasic extends Base
         if ($val->check($param) == false) return json_show(1004, $val->getError());
 
         $platform_id = Db::name('platform')
-            ->where(['is_del' => 0, 'status' => 1, 'id' => $param['platform_id']])
+            ->where(['is_del' => 0, 'id' => $param['platform_id']])
             ->column('id');
 
         if (empty($platform_id)) return json_show(1004, '平台id不正确');

app/command/TempHandleBusinessData.php

@@ -47,11 +47,10 @@ class TempHandleBusinessData extends Command
                 $a = Db::connect('mysql_cxinv')
                     ->table('cfp_supplier_info')
                     ->whereIn('code', array_column($temp, 'code'))
-                    ->column('code', 'code');
+                    ->column('id', 'code');
 
                 $ins_supplier = [];
                 foreach ($temp as $val) {
-
                     if (!isset($a[$val['code']])) {
                         $ins_supplier[] = [
                             'name' => $val['name'],
@@ -79,6 +78,38 @@ class TempHandleBusinessData extends Command
                             'product_category' => $val['product_category'],
                             'license_img' => $val['license_img'],
                         ];
+                    }else{
+                    	$supp_upda=[
+                    		'id' =>$a[$val['code']],
+                            'name' => $val['name'],
+                            'code' => $val['code'],
+                            'source' => $val['source'],
+                            'contector' => $val['contactor'],
+                            'post' => $val['position'],
+                            'type' => $val['type'],
+                            'nature' => $val['supplier_type'],
+                            'corporation' => $val['legaler'],
+                            'registertime' => $val['registertime'],
+                            'capital' => $val['capital'],
+                            'supplier_type' => $val['supplier_type'],
+                            'pay_method' => $val['pay_type'],
+                            'paydays' => $val['pay_day'],
+                            'mobile' => $val['mobile'],
+                            'address' => $val['addr'],
+                            'return_ticket' => $val['ticket_type'],
+                            'delivery' => $val['delivery_way'],
+                            'status' => $val['status'],
+                            'updatetime' => $val['updatetime'],
+                            'registercode' => $val['registercode'],
+                            'level' => $val['level'],
+                            'product_category' => $val['product_category'],
+                            'license_img' => $val['license_img'],
+                            //以下字段填空字符串,需要用户在结算平台补充值
+                            ];
+                    	$else = Db::connect('mysql_cxinv')
+                        ->table('cfp_supplier_info')
+                        ->save($supp_upda);
+                    	if($else ==false) throw new Exception("业务公司{$val['code']}更新失败");
                     }
 
                 }
@@ -149,6 +180,26 @@ class TempHandleBusinessData extends Command
                                 'updatetime' => date('Y-m-d H:i:s'),
                             ]
                         );
+                    }else{
+                    	$upda=[
+                    		'id' => $exists[$item['companyNo']],
+		                    'company_name' => $item['company'],
+                            'company_address' => $item['addr'],
+                            'company_license' => $item['inv_code'],
+                            'bank_name' => $item['inv_bank'],
+                            'bankNo' => $item['inv_bankNo'],
+                            'contector' => $item['inv_legaler'],
+                            'mobile' => $item['mobile'],
+                            'company_img' => $item['license_img'],
+                            'is_del' => $item['is_del'],
+                            'updatetime' => $item['updatetime'],
+		                    'invoice_title' => $item['invoice_title'],
+                            //以下字段填空字符串,需要用户在结算平台补充值
+                            ];
+                    	$else = Db::connect('mysql_cxinv')
+                        ->table('cfp_company_info')
+                        ->save($upda);
+                    	if($else ==false) throw new Exception("业务公司{$item['companyNo']}更新失败");
                     }
                 }