APP提货配置时间列表增加逻辑

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/common/OrderPickTimeConfigBean.java

@@ -15,4 +15,7 @@ public class OrderPickTimeConfigBean extends OrderPickTimeConfig {
 
     @ApiModelProperty(value = "天数时间段订单数")
     List<OrderPickTimeCountBean> countList;
+
+    @ApiModelProperty(value = "当前日期时间段是否可用（结束时间判断）")
+    boolean overCurTime;
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -390,13 +390,15 @@ public class CommonLogic {
             DateTime curDate = DateUtil.date();
             int queryDayCount = 7;
 
+            boolean overCurTime = true;
+
             List<OrderPickTimeCountBean> countBeanList = new ArrayList<>();
             while (queryDayCount > 0) {
                 if (queryDayCount < 7) {
                     curDate = DateUtil.offsetDay(curDate, 1);
                 }
                 OrderPickTimeCountBean countBean = new OrderPickTimeCountBean();
-                String date = DateUtil.formatDateTime(curDate);
+                String date = DateUtil.formatDate(curDate);
 
                 Date startTime = DateUtil.parseDateTime(date + " " + config.getStartTime() + ":00");
                 Date endTime = DateUtil.parseDateTime(date + " " + config.getEndTime() + ":00");
@@ -415,13 +417,21 @@ public class CommonLogic {
 
                 countBeanList.add(countBean);
 
+                // 检查当天时间是否超过结束时间
+                if (queryDayCount == 7 && curDate.getTime() > endTime.getTime()) {
+                    overCurTime = false;
+                }
+
                 queryDayCount--;
             }
             bean.setCountList(countBeanList);
+            bean.setOverCurTime(overCurTime);
             beanList.add(bean);
-
         }
 
+
+
+
         return beanList;
     }
 }