dd

app/admin/controller/OrderPay.php

@@ -131,9 +131,9 @@ class OrderPay extends BaseController{
             return error_show(1004,"参数 status 不能为空");
         }
          $remark=isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
-        if($remark==""){
-            return error_show(1004,"参数 remark 不能为空");
-        }
+//        if($remark==""){
+//            return error_show(1004,"参数 remark 不能为空");
+//        }
         Db::startTrans();
         try {
             $logingo= Db::name("trade_pool")->where(["logNo"=>$logNo,"is_del"=>0])->find();
@@ -580,7 +580,7 @@ class OrderPay extends BaseController{
         $up =Db::name("trade_return")->where($returninfo)->update($update);
         if($up){
             if($status==1){
-               $qrdArr=Db::name("assoc")->where(["viceCode"=>$returninfo['logNo'],"status"=>1,"is_del"=>0])->select()
+               $qrdArr=Db::name("assoc")->where(["viceCode"=>$returninfo['logNo'],"status"=>2,"is_del"=>0])->select()
                ->toArray();
                     if(!empty($qrdArr)){
                         foreach ($qrdArr as $value){

app/admin/controller/Payment.php

@@ -907,12 +907,12 @@ class Payment extends BaseController
         }
         $tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")->where
             (["code"=>$payNo,"a.status"=>1])->column("b.tag_name,a.tag_img,a.tag_remark","b.type");
-            $pay['inv_tag_name']=$tag[2]['tag_name']??'';
-            $pay['pay_tag_name']=$tag[1]['tag_name']??'';
-            $pay['pay_tag_img']=$tag[1]['tag_img']??'';
-            $pay['pay_tag_remark']=$tag[1]['tag_remark']??'';
-            $pay['inv_tag_img']=$tag[2]['tag_img']??'';
-            $pay['inv_tag_remark']=$tag[2]['tag_remark']??'';
+            $payinfo['inv_tag_name']=$tag[2]['tag_name']??'';
+            $payinfo['pay_tag_name']=$tag[1]['tag_name']??'';
+            $payinfo['pay_tag_img']=$tag[1]['tag_img']??'';
+            $payinfo['pay_tag_remark']=$tag[1]['tag_remark']??'';
+            $payinfo['inv_tag_img']=$tag[2]['tag_img']??'';
+            $payinfo['inv_tag_remark']=$tag[2]['tag_remark']??'';
         $payinfo['cgdlist'] = $pay;
         return app_show(0,"获取成功",$payinfo);
     }