ad

app/admin/controller/OrderPay.php

@@ -20,7 +20,6 @@ class OrderPay extends BaseController{
         }
        Db::startTrans();
         try{
-            $logNo=makeNo("TRC");
             $trade =Db::name("trade")->where(["tradNo"=>$tradNo,"is_del"=>0])->lock(true)->findOrEmpty();
             if(empty($trade)){
                 Db::rollback();
@@ -33,6 +32,7 @@ class OrderPay extends BaseController{
             }
             $assoc=[];
             foreach ($orderArr as $value){
+            	$logNo=makeNo("TRC");
                 if(!isset($value['sequenceNo'])||$value['sequenceNo']==""){
                     Db::rollback();
                    return error_show(1004,"销售单编号不能为空");
@@ -78,7 +78,24 @@ class OrderPay extends BaseController{
                     "updatetime"=>date("Y-m-d H:i:s")
                 ];
                 $assoc[]=$temp;
-                 $report=ReportCode::where(["qrdNo"=>$value['sequenceNo']])->find();
+                $create = [
+                    "logNo"=>$logNo,
+                    "tradNo"=>$tradNo,
+                    "companyNo"=>$trade['companyNo'],
+                    "apply_id"=>$this->uid,
+                    "apply_name"=>$this->uname,
+                    "trade_time"=>$trade['trade_time'],
+                    "total_fee"=>$value['trad_fee'],
+                    "status"=>1,
+                    "addtime"=>date("Y-m-d H:i:s"),
+                    "updatetime"=>date("Y-m-d H:i:s")
+                ];
+                $tradchild =Db::name("trade_pool")->insert($create);
+                if($tradchild ==false){
+                    Db::rollback();
+                    return error_show(1004,"资金认领失败");
+                }
+                  $report=ReportCode::where(["qrdNo"=>$value['sequenceNo']])->find();
                  if($report)$report->setField("logNo",$logNo);
                  if($report)$report->setField("tradNo",$tradNo);
             }
@@ -95,23 +112,8 @@ class OrderPay extends BaseController{
             ];
             $tradup=Db::name("trade")->where($trade)->update($update);
             if($tradup){
-                $create = [
-                    "logNo"=>$logNo,
-                    "tradNo"=>$tradNo,
-                    "companyNo"=>$trade['companyNo'],
-                    "apply_id"=>$this->uid,
-                    "apply_name"=>$this->uname,
-                    "trade_time"=>$trade['trade_time'],
-                    "total_fee"=>$total_fee,
-                    "status"=>1,
-                    "addtime"=>date("Y-m-d H:i:s"),
-                    "updatetime"=>date("Y-m-d H:i:s")
-                ];
-                $tradchild =Db::name("trade_pool")->insert($create);
-                if($tradchild){
-                    Db::commit();
-                    return app_show(0,"资金认领成功",["logNo"=>$logNo]);
-                }
+            	   Db::commit();
+                    return app_show(0,"资金认领成功");
             }
              Db::rollback();
              return error_show(1004,"资金认领失败");
@@ -810,6 +812,7 @@ class OrderPay extends BaseController{
         }
     }
 	/**
+     * 资金导入
 	 * @return \think\response\Json|void
 	 */
     public function importTradeByArr()