Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/task/BillOrderCheckTask.java

@@ -37,9 +37,13 @@ public class BillOrderCheckTask {
                 continue;
             }
             JSONObject order = orderMapper.find(p);
-            if(order.getIntValue("status")==3||order.getIntValue("status")==1){
+            int status = order.getIntValue("status");
+            if(status==3||status==1){
                 billOrderMapper.updateStatusByOrderId(p,"2");
             }
+            if(status==5){
+                billOrderMapper.updateStatusByOrderId(p,"1");
+            }
         }
     }
 }