|
|
@@ -868,17 +868,17 @@ class OrderInv extends BaseController{
|
|
|
}
|
|
|
}
|
|
|
if($status==2){
|
|
|
- $qrdArr=Db::name("assoc")->where(["viceCode"=>$return['invNo'],"is_del"=>0,"status"=>[1,2]])->column("id,orderCode,cancel_fee");
|
|
|
+ $qrdArr=Db::name("assoc")->where(["viceCode"=>$return['invNo'],"is_del"=>0,"status"=>2])->column("id,orderCode,cancel_fee");
|
|
|
if(!empty($qrdArr)){
|
|
|
foreach ($qrdArr as $value){
|
|
|
$qrdinfo =Db::name("qrd_info")->where(["sequenceNo"=>$value['orderCode']])->find();
|
|
|
if($qrdinfo==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1003,"确认单信息未找到");
|
|
|
+ throw new Exception("确认单信息未找到");
|
|
|
+// return error_show(1003,"确认单信息未找到");
|
|
|
}
|
|
|
- if($qrdinfo['inv_fee']<$value['cancel_fee']){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1003,"确认单信息开票金额不足");
|
|
|
+ if($qrdinfo['ainv_fee']<$value['cancel_fee']){
|
|
|
+ throw new Exception("确认单信息开票金额不足");
|
|
|
+// return error_show(1003,"确认单信息开票金额不足");
|
|
|
}
|
|
|
$update =[
|
|
|
"winv_fee"=>$qrdinfo['winv_fee']+$value['cancel_fee'],
|
|
|
@@ -889,16 +889,19 @@ class OrderInv extends BaseController{
|
|
|
];
|
|
|
$qrdup = Db::name("qrd_info")->where($qrdinfo)->update($update);
|
|
|
if($qrdup==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1003,"确认单信息更新失败");
|
|
|
+ throw new Exception("确认单信息更新失败");
|
|
|
+// return error_show(1003,"确认单信息更新失败");
|
|
|
}
|
|
|
$assoc=["status"=>3,"updatetime"=>date("Y-m-d H:i:s")];
|
|
|
$assocup =Db::name("assoc")->where($value)->update($assoc);
|
|
|
if($assocup==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1003,"确认单关联信息更新失败");
|
|
|
+
|
|
|
+ throw new Exception("确认单关联信息更新失败");
|
|
|
+// return error_show(1003,"确认单关联信息更新失败");
|
|
|
}
|
|
|
}
|
|
|
+ }else{
|
|
|
+ throw new Exception("未找到关联订单数据信息");
|
|
|
}
|
|
|
}
|
|
|
if($status==3 || $status==4){
|
