Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -548,6 +548,10 @@ public class NewOrderController extends BaseController {
     @RequestMapping("confirmOrder")
     public String confirmOrder(Integer orderID, Model model, RedirectAttributes redirectAttributes) {
         NewOrder order = newOrderService.get(orderID + "");
+        if (StringUtils.isNotEmpty(order.getStatus()) && Integer.parseInt(order.getStatus())>0){
+            addMessage(redirectAttributes, "订单状态异常，请刷新后重试！");
+            return "redirect:" + Global.getAdminPath() + "/order/detail/?id=" + orderID;
+        }
         //优惠券确认消耗
         CmCouponOrderRecord orderRecord = order.getCouponOrderRecord();
         if (order.getCouponAmount() > 0 && orderRecord != null) {