预约到店订单在超过预约时间之前可以申请退款

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

@@ -88,6 +88,7 @@ import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
 import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
 import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
 import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
+import com.freemud.sdk.api.assortment.order.enums.NewOrderType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
@@ -1032,8 +1033,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已完成，无法退款");
         }
-        if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
-            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "麦咖啡到店订单不支持退款");
+        if(NewOrderType.GENERAL_DINE_IN.getCode().equals(orderBean.getOrderType()) || NewOrderType.GENERAL_SELF_PICKUP.getCode().equals(orderBean.getOrderType())) {
+            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "实时到店订单无法退款");
+        }
+        if(NewOrderType.RESERVED_DINE_IN.getCode().equals(orderBean.getOrderType()) || NewOrderType.RESERVED_SELF_PICKUP.getCode().equals(orderBean.getOrderType())) {
+            Date expectTime = new Date(orderBean.getGmtExpect());
+            if(expectTime.before(new Date())) {
+                return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "预约到店订单超过预约时间后无法退款");
+            }
         }
 
 //        if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {