ad

app/admin/controller/OrderPay.php

@@ -768,7 +768,9 @@ class OrderPay extends BaseController{
             return app_show(1004, $e->getMessage());
         }
     }
-
+	/**
+	 * @return \think\response\Json|void
+	 */
     public function importTradeByArr()
     {
         $trade =isset($this->post['data']) &&!empty($this->post['data'])?  $this->post['data']:[];
@@ -792,30 +794,30 @@ class OrderPay extends BaseController{
               //  return ['code' => 1003, "msg" => '对方户名不能为空'];
                 return error_show( 1003, '第'.($key+1).'行对方户名不能为空！');
             }
-            if ($key == 0) {
-                if ($value[0] != '收款方公司编号') {
-                  //  return ['code' => 1003, "msg" => '模板第一列为必须为交易时间！'];
-                    return error_show( 1003, '模板第一列为必须为收款方公司编号！');
-                }
-                if ($value[4] != '收入金额') {
-                   // return ['code' => 1003, "msg" => '模板第二列为必须为收入金额！'];
-                    return error_show( 1003, '模板第五列为必须为收入金额！');
-                }
-
-                if ($value[6] != '交易行名') {
-                    //return ['code' => 1003, "msg" => '模板第五列为必须为交易行名！'];
-                    return error_show( 1003, '模板第七列为必须为交易行名！');
-                }
-                if ($value[8] != '对方账号') {
-                   // return ['code' => 1003, "msg" => '模板第七列为必须为对方账号！'];
-                    return error_show( 1003, '模板第九列为必须为对方账号！');
-                }
-                if ($value[9] != '对方户名') {
-                  //  return ['code' => 1003, "msg" => '模板第八列为必须为对方户名！'];
-                    return error_show( 1003, '模板第十列为必须为对方户名！');
-                }
-                continue;
-            }
+//            if ($key == 0) {
+//                if ($value[0] != '收款方公司编号') {
+//                  //  return ['code' => 1003, "msg" => '模板第一列为必须为交易时间！'];
+//                    return error_show( 1003, '模板第一列为必须为收款方公司编号！');
+//                }
+//                if ($value[4] != '收入金额') {
+//                   // return ['code' => 1003, "msg" => '模板第二列为必须为收入金额！'];
+//                    return error_show( 1003, '模板第五列为必须为收入金额！');
+//                }
+//
+//                if ($value[6] != '交易行名') {
+//                    //return ['code' => 1003, "msg" => '模板第五列为必须为交易行名！'];
+//                    return error_show( 1003, '模板第七列为必须为交易行名！');
+//                }
+//                if ($value[8] != '对方账号') {
+//                   // return ['code' => 1003, "msg" => '模板第七列为必须为对方账号！'];
+//                    return error_show( 1003, '模板第九列为必须为对方账号！');
+//                }
+//                if ($value[9] != '对方户名') {
+//                  //  return ['code' => 1003, "msg" => '模板第八列为必须为对方户名！'];
+//                    return error_show( 1003, '模板第十列为必须为对方户名！');
+//                }
+//                continue;
+//            }
             $company =Db::name("company_info")->where(["companyNo"=>$value[0]])->findOrEmpty();
             if(empty($company)){
                 return error_show( 1003, "业务公司编号不存在{$value[0]}");

app/admin/route/app.php

@@ -110,7 +110,7 @@ Route::rule("tradeQuery","admin/OrderPay/tradeQuery");
 Route::rule("orderpayreturn","admin/OrderPay/ReturnPay");
 Route::rule("orderreturnlist","admin/OrderPay/returnList");
 Route::rule("orderreturnstatus","admin/OrderPay/returnStatus");
-Route::rule("importTrade","admin/OrderPay/importTrade");
+Route::rule("importTrade","admin/OrderPay/importTradeByArr");
 
 Route::rule("index","admin/index/index");
 Route::rule("report","admin/Report/index");