Parcourir la source

Merge branch 'version1.5' into dev_wf

wufeng il y a 2 ans
Parent
commit
e5df70f153
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      app/admin/controller/Reorder.php

+ 1 - 1
app/admin/controller/Reorder.php

@@ -845,7 +845,7 @@ class Reorder extends Base
                                 $cgd['wsend_num'] -= $info['num'];
                                 $cgd['send_num'] += $info['num'];
                             }
-                            $cgd['status'] = $cgd['wsend_num']==0?2:($cgd['send_num']==0?0:1);
+                            $cgd['status'] = $cgd['wsend_num']==0?3:($cgd['send_num']==0?1:2);
                             $cgd['send_status'] =$cgd['wsend_num']==0?3:($cgd['send_num']==0?1:2);
                             $cgd['th_num'] += $info['num'];
                             if($cgd['th_num']==$cgd['send_num']&& $cgd['wsend_num']==0){