ad

app/admin/controller/Reorder.php

@@ -828,7 +828,8 @@ class Reorder extends Base
                 if (in_array($param['status'], [4, 8]) == false) return json_show(1004, '选项错误');
                 break;
             case 8:
-                if (in_array($param['status'], [11, 10]) == false) return json_show(1004, '选项错误');
+                if (in_array($param['status'], [4,10]) == false && $info['order_type']!=1) return json_show(1004,'选项错误');
+                if (in_array($param['status'], [11, 10]) == false && $info['order_type']==1) return json_show(1004,'选项错误');
                 break;
             case 10:
                 if (in_array($param['status'], [4, 8]) == false) return json_show(1004, '选项错误');

app/admin/controller/Sale.php

@@ -5411,9 +5411,9 @@ class Sale extends Base
                 ->where(['is_del' => 0, 'id' => $cgdId])
                 ->update([
                 	'status' => 4,
-                    'th_num' => Db::raw('wsend_num'),
+                    'th_num' => Db::raw('wsend_num+send_num'),
                 	'th_fee' =>Db::raw('total_fee'),
-                	'send_num' =>Db::raw('wsend_num'),
+                	'send_num' =>Db::raw('wsend_num+send_num'),
                 	'wsend_num' =>0,
                 	'send_status' =>3,
                     'updatetime' => $date]);