bugfix外卖单退款问题

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -128,6 +128,9 @@ public class QueryOrdersResponseDto {
              * 下游订单号
              */
             private String downstreamThirdOrderCode;
+            /**
+             * 订单类型   1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
+             */
             private Integer orderType;
             /**
              * 取餐码

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

@@ -1028,13 +1028,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
             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(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
+            if(null == orderBean.getGmtExpect() || orderBean.getGmtExpect().equals(0l)) {
+                return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "实时到店订单无法退款");
+            } else {
+                Date expectTime = new Date(orderBean.getGmtExpect());
+                if(expectTime.before(new Date())) {
+                    return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "预约到店订单超过预约时间后无法退款");
+                }
             }
         }