wugg 2 jaren geleden
bovenliggende
commit
35b554847a
1 gewijzigde bestanden met toevoegingen van 7 en 8 verwijderingen
  1. 7 8
      app/admin/controller/After.php

+ 7 - 8
app/admin/controller/After.php

@@ -97,14 +97,6 @@ class After extends Base
             $orde = ["order_code"=>$returnCode,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
             ActionLog::logAdd($this->post['token'],$orde,$orderout['order_type']==1?'SHD':"ZXSHD",0,$orde);
             if($create>0){
-
-                    $orderout['status']=$is_receive==1?3:4;
-                    $orderout['updatetime']=date("Y-m-d H:i:s");
-                    $outup=Db::name("order_out")->save($orderout);
-                    if($outup==false){
-                        Db::rollback();
-                        return error_show(1005,"售后申请单新建失败");
-                    }
                     $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'SHD'];
                     ProcessOrder::AddProcess($token,$process);
                     Db::commit();
@@ -983,6 +975,13 @@ class After extends Base
                             "order_status" => $thdata['status']
                         ]);
 
+                        $out['status']=$info['is_receive']==1&&$info['total_num']>$info['error_num'] ?3:4;
+                        $out['updatetime']=date("Y-m-d H:i:s");
+                        $outup=Db::name("order_out")->save($out);
+                        if($outup==false){
+                            Db::rollback();
+                            return error_show(1005,"发货单更新失败");
+                        }
                         Db::commit();
                         return app_show(0,"退货单新建成功",["thNo"=>$thNo]);
                     }