wugg 3 lat temu
rodzic
commit
c235bd5258
2 zmienionych plików z 28 dodań i 27 usunięć
  1. 1 3
      app/admin/controller/Consult.php
  2. 27 24
      app/admin/controller/Orderback.php

+ 1 - 3
app/admin/controller/Consult.php

@@ -1544,12 +1544,10 @@ class Consult extends Base
                 ];
             if($value['is_gold_price']==1){
                 $price = GoldPrice($god, $budget/100);
-            }else{
-                $price = GoodPrice($god, $budget/100);
+                $value['sale_price'] = round($price,2);
             }
             $value['specinfo'] = json_decode($value['specinfo'],true);
             $value['metal_name']=isset($value['metal_id'])&& $value['metal_id']!=0?$this->noble[$value['metal_id']]:"";
-            $value['sale_price'] =round($price,2);
             $value['bargain_status']=$bidinfo['bargain_status'];
             $data[]=$value;
         }

+ 27 - 24
app/admin/controller/Orderback.php

@@ -223,43 +223,46 @@ class Orderback extends \app\BaseController
           return error_show(1004,"未找到数据");
       }
       $errorlist = isset($this->post['errorlist']) && $this->post['errorlist']!=="" ? $this->post['errorlist']:[];
-      $status = isset($this->post['status']) && $this->post['status']!=="" ? intval($this->post['status']):"";
-      if($status===""){
-          return error_show(1004,"参数status不能为空");
-      }
       Db::startTrans();
       try{
           $temp=$info['status'];
-          $info['status'] =$status;
+          $info['status'] =3;
           $info['updatetime'] = date("Y-m-d H:i:s");
           $up=Db::name("order_back")->save($info);
           if($up){
               $stn = ["order_code"=>$thNo,"status"=>$temp,"action_remark"=>'',"action_type"=>"edit"];
               ActionLog::logAdd($this->post['token'],$stn,$info['order_type'] == 2?"ZXCKTHD":"CKTHD",$info['status'],$stn);
-              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
+              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>3,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
               ProcessOrder::AddProcess($this->post['token'],$process);
               if(empty($errorlist)){
+                  $up =Db::name("order_backinfo")->where(["thNo"=>$thNo,"is_del"=>0])->save(["status"=>1,
+                      "updatetime"=>date("Y-m-d H:i:s")]);
+                  if($up){
+                      Db::commit();
+                      return app_show(0,'更新成功');
+                  }else{
+                      Db::rollback();
+                      return error_show(1005,'异常记录数据更新失败');
+                  }
+              }else{
+                  foreach($errorlist as $value){
+                      $temp=Db::name("order_backinfo")->where(['id'=>$value["id"],"is_del"=>0,"thNo"=>$thNo])->find();
+                      if(empty($temp)){
+                          Db::rollback();
+                          return error_show(1005,'异常记录数据未找到');
+                      }
+                      $temp['status']=$value['status'];
+                      $temp['exam_remark']=$value['remark'];
+                      $temp['updatetime']=date("Y-m-d H:i:s");
+                      $com = Db::name("order_backinfo")->save($temp);
+                      if($com==false){
+                          Db::rollback();
+                          return error_show(1005,'异常记录数据更新失败');
+                      }
+                  }
                   Db::commit();
                   return app_show(0,'更新成功');
               }
-             // $temp =[];
-              foreach($errorlist as $value){
-                $temp=Db::name("order_backinfo")->where(['id'=>$value["id"],"is_del"=>0,"thNo"=>$thNo])->find();
-                if(empty($temp)){
-                    Db::rollback();
-                    return error_show(1005,'异常记录数据未找到');
-                }
-                $temp['status']=$value['status'];
-                $temp['exam_remark']=$value['remark'];
-                $temp['updatetime']=date("Y-m-d H:i:s");
-                $com = Db::name("order_backinfo")->save($temp);
-                if($com==false){
-                    Db::rollback();
-                    return error_show(1005,'异常记录数据更新失败');
-                }
-              }
-                  Db::commit();
-                  return app_show(0,'更新成功');
           }
           Db::rollback();
           return error_show(1005,'更新失败');