蜜雪APP取消订单重复，取消支付准确提示

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1676,6 +1676,12 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
         }
         OrderBean orderBean = responseDto.getData();
+        if (PayStatus.HAVE_PAID.getCode().equals(orderBean.getPayStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "已支付成功");
+        }
+        if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单已关闭");
+        }
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许删除");
         }
@@ -1723,6 +1729,9 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
         }
         OrderBean orderBean = responseDto.getData();
+        if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单已取消");
+        }
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许取消");
         }
@@ -3871,6 +3880,10 @@ public class OrderServiceImpl implements Orderservice {
         return paySuccess;
     }
 
+    /**
+     * 与　closePrePay 待合并
+     * @param orderBean
+     */
     private void closeHistoryPrePay(OrderBean orderBean) {
 
         OrderExtInfoDto extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);