调整审单校验

app/Http/Controllers/OrderController.php

@@ -909,6 +909,8 @@ Class OrderController extends Controller
                     $pingtai_id = Config('config.pingtai_id');
                     $pingtai_id = Config('config.pingtai_id');
 
 
                     foreach ($resData['change_info'] as $v) {
                     foreach ($resData['change_info'] as $v) {
+                        if ($v['status'] == -1) continue;
+
                         if ($v['buyer_id'] == $pingtai_id) {
                         if ($v['buyer_id'] == $pingtai_id) {
                             $client = new \Hprose\Http\Client(Config('website.footstone_url').'/service', false);
                             $client = new \Hprose\Http\Client(Config('website.footstone_url').'/service', false);
 
 
@@ -928,12 +930,12 @@ Class OrderController extends Controller
 
 
                             // 判断库存
                             // 判断库存
                             if (!$goods_info['stock'] || $goods_info['stock'] < $v['goods_number']) {
                             if (!$goods_info['stock'] || $goods_info['stock'] < $v['goods_number']) {
-                                return ['errcode'=>-1, 'errmsg'=>'请求基石库存接口，'.$v['goods_name'].'型号库存不足，当前库存为'.$goods_info['stock']];
+                                return ['errcode'=>-1, 'errmsg'=>'请求基石库存接口，'.$v['goods_name'].'型号库存不足，当前商品库存为'.$goods_info['stock']];
                             }
                             }
 
 
                             // 判断倍数
                             // 判断倍数
                             if ($v['goods_number'] % $goods_info['mpl'] != 0) {
                             if ($v['goods_number'] % $goods_info['mpl'] != 0) {
-                                return ['errcode'=>-1, 'errmsg'=>'请求基石库存接口，'.$v['goods_name'].'型号倍数不满足下单条件，当前倍数为'.$goods_info['mpl']];
+                                return ['errcode'=>-1, 'errmsg'=>'请求基石库存接口，'.$v['goods_name'].'型号倍数不满足下单条件，当前商品倍数为'.$goods_info['mpl']];
                             }
                             }
                         }
                         }
                     }
                     }