|
|
@@ -133,15 +133,16 @@ class OrderPay extends BaseController{
|
|
|
$status=isset($this->post['status'])&&$this->post['status']!=""?intval($this->post['status']):"";
|
|
|
if($status==""){
|
|
|
return error_show(1004,"参数 status 不能为空");
|
|
|
+ }
|
|
|
+ if($status==4 &&$logingo['status']!=1 ){
|
|
|
+ return error_show(1004,"认领资金状态有误");
|
|
|
}
|
|
|
$remark=isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
|
|
|
$trade =Db::name("trade")->where(["tradNo"=>$logingo['tradNo'],"is_del"=>0])->findOrEmpty();
|
|
|
if(empty($trade)){
|
|
|
return error_show(1005,"资金信息未找到");
|
|
|
}
|
|
|
-// if($remark==""){
|
|
|
-// return error_show(1004,"参数 remark 不能为空");
|
|
|
-// }
|
|
|
+
|
|
|
Db::startTrans();
|
|
|
try {
|
|
|
$up=["status"=>$status,"updatetime"=>date("Y-m-d H:i:s"),"remark"=>$remark];
|
|
|
@@ -185,7 +186,7 @@ class OrderPay extends BaseController{
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if($status==3){
|
|
|
+ if($status==3 || $status==4){
|
|
|
$qrdArr=Db::name("assoc")->where(["viceCode"=>$logNo,"status"=>1,"is_del"=>0])->select()->toArray();
|
|
|
if(!empty($qrdArr)){
|
|
|
foreach ($qrdArr as $value){
|
