Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Reorder.php

@@ -157,6 +157,7 @@ class Reorder extends Base
                                         return error_show(1004, "地址发货单发货数量不足");
                                     }
                                     $out['send_num'] -= $val['return_num'];
+                                    $out['is_del'] = $out['send_num']==0?1:0;
                                     $out['updatetime'] = date("Y-m-d H:i:s");
                                     $outup = Db::name("order_out")->save($out);
                                     if ($outup == false) {