修改取消订单的逻辑

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -258,23 +258,26 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             logger.info("closeBuy2Qqhe>>>>> 未找到 orderNo {}", orderNo);
             return BaseController.succeed();
         }
-
-        //订单是ing 并且有第三方支付编号的 要主动去查询一下
-        if (orderByOrderNo.getStatus().getCode().equals(DealStatusEnum.ING.getCode())
-                && StringUtils.isNotBlank(orderByOrderNo.getTransNo())) {
-            Map<String, Object> payment = Payment.queryPayment(orderByOrderNo.getTransNo());
-            String status = (String) payment.get("status");
-            if (status.equals("succeeded")) {
-                throw new BizException("该订单已经支付成功，无法关闭。");
+        //订单是ing 才可以关闭
+        if (orderByOrderNo.getStatus().getCode().equals(DealStatusEnum.ING.getCode())) {
+            //有第三方支付编号的 要主动去查询一下
+            if (StringUtils.isNotBlank(orderByOrderNo.getTransNo())) {
+                Map<String, Object> payment = Payment.queryPayment(orderByOrderNo.getTransNo());
+                String status = (String) payment.get("status");
+                if (status.equals("succeeded")) {
+                    throw new BizException("该订单已经支付成功，无法关闭。");
+                }
             }
+            //关闭订单  退余额 退优惠券
+            studentPaymentOrderService.quitCouponAndBalance(orderByOrderNo);
+            //将订单关闭
+            orderByOrderNo.setStatus(DealStatusEnum.CLOSE);
+            orderByOrderNo.setUpdateTime(new Date());
+            studentPaymentOrderService.update(orderByOrderNo);
+            return BaseController.succeed();
+        } else if (orderByOrderNo.getStatus().getCode().equals(DealStatusEnum.SUCCESS.getCode())) {
+            throw new BizException("该订单已经支付成功，无法关闭。");
         }
-
-        //关闭订单  退余额 退优惠券
-        studentPaymentOrderService.quitCouponAndBalance(orderByOrderNo);
-        //将订单关闭
-        orderByOrderNo.setStatus(DealStatusEnum.CLOSE);
-        orderByOrderNo.setUpdateTime(new Date());
-        studentPaymentOrderService.update(orderByOrderNo);
         return BaseController.succeed();
     }