提交演出日历逻辑

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformanceCalendarController.java

@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceCalendarReq;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceCalendarResp;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -41,6 +43,11 @@ public class PerformanceCalendarController extends BaseController{
     @GetMapping()
     public String performances(PerformanceCalendarReq performanceCalendarReq, ModelMap mmap)
     {
+        //获取开始结束间隔天数
+        List<PerformanceCalendarResp> respList = this.getPerformanceList(performanceCalendarReq);
+
+        mmap.put("requestParam",performanceCalendarReq);
+        mmap.put("respDataList",respList);
         return prefix + "/performanceCalendar";
     }
 
@@ -51,23 +58,33 @@ public class PerformanceCalendarController extends BaseController{
     @PostMapping("/list")
     public String list(PerformanceCalendarReq performanceCalendarReq, ModelMap mmap)
     {
-//        performanceCalendarReq.setTimeBegin("2021-05-31");
-//        performanceCalendarReq.setTimeEnd("2021-06-06");
-        int days = Long.valueOf(DateUtil.intervalDays(DateUtil.parse(performanceCalendarReq.getTimeBegin(),DateUtil.DATE_SMALL_STR)
-        ,DateUtil.parse(performanceCalendarReq.getTimeEnd(),DateUtil.DATE_SMALL_STR))).intValue() + 1;
+        //获取开始结束间隔天数
+        List<PerformanceCalendarResp> respList = this.getPerformanceList(performanceCalendarReq);
+
+        mmap.put("requestParam",performanceCalendarReq);
+        mmap.put("respDataList",respList);
+        return prefix + "/performanceCalendar";
+    }
+
+    private List<PerformanceCalendarResp> getPerformanceList(PerformanceCalendarReq performanceCalendarReq){
+        Map<String,String> beginAndEndMap = this.getStartAndEndTime(performanceCalendarReq);
+        String startTime = beginAndEndMap.get("startTime");
+        String endTime = beginAndEndMap.get("endTime");
+        int days = Long.valueOf(DateUtil.intervalDays(DateUtil.parse(startTime,DateUtil.DATE_SMALL_STR)
+                ,DateUtil.parse(endTime,DateUtil.DATE_SMALL_STR))).intValue() + 1;
 
         //查询条件
         LambdaQueryWrapper<KylinPerformances> wrapper = new LambdaQueryWrapper<>();
-        if (!StringUtils.isNotNull(performanceCalendarReq.getTimeBegin())) {
+        if (StringUtils.isNotNull(performanceCalendarReq.getTimeBegin())) {
             wrapper.ge(KylinPerformances::getTimeStart, DateUtil.asLocalDate(DateUtil.parse(performanceCalendarReq.getTimeBegin(),DateUtil.DATE_SMALL_STR)));
         }
-        if (!StringUtils.isNotNull(performanceCalendarReq.getTimeEnd())) {
+        if (StringUtils.isNotNull(performanceCalendarReq.getTimeEnd())) {
             wrapper.le(KylinPerformances::getTimeStart, DateUtil.addDay(DateUtil.parse(performanceCalendarReq.getTimeEnd(),DateUtil.DATE_SMALL_STR),1));
         }
 
         List<KylinPerformances> list = kylinPerformancesAdminService.list(wrapper);
 
-        String[][] dateArray2 = getDateList(DateUtil.parse(performanceCalendarReq.getTimeBegin(),DateUtil.DATE_SMALL_STR),days);
+        String[][] dateArray2 = getDateList(DateUtil.parse(startTime,DateUtil.DATE_SMALL_STR),days);
         //初始化对象
         List<PerformanceCalendarResp> respList = initRespList(dateArray2);
         for (KylinPerformances kylinPerformances : list) {
@@ -121,10 +138,7 @@ public class PerformanceCalendarController extends BaseController{
                 }
             }
         }
-
-        mmap.put("requestParam",performanceCalendarReq);
-        mmap.put("respDataList",respList);
-        return prefix + "/performanceCalendar";
+        return respList;
     }
 
     /**
@@ -192,4 +206,29 @@ public class PerformanceCalendarController extends BaseController{
         return respList;
     }
 
+    /**
+     * 根据输入日期获取开始结束日期
+     * @param performanceCalendarReq
+     * @return
+     */
+    private Map<String,String> getStartAndEndTime(PerformanceCalendarReq performanceCalendarReq){
+        LocalDate currDate = LocalDate.now();
+        LocalDate paramBegin = LocalDate.parse(currDate.toString());
+        LocalDate parseEnd = LocalDate.parse(currDate.toString());
+        LocalDate monday = paramBegin.with(TemporalAdjusters.previousOrSame( DayOfWeek.MONDAY));
+        LocalDate sunday = parseEnd.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY ));
+        if(StringUtil.isNull(performanceCalendarReq.getTimeBegin())){
+            performanceCalendarReq.setTimeBegin(monday.toString());
+            performanceCalendarReq.setTimeEnd(sunday.toString());
+        }else{
+            paramBegin = LocalDate.parse(performanceCalendarReq.getTimeBegin());
+            parseEnd = LocalDate.parse(performanceCalendarReq.getTimeEnd());
+            monday = paramBegin.with(TemporalAdjusters.previousOrSame( DayOfWeek.MONDAY));
+            sunday = parseEnd.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY ));
+        }
+        Map<String,String> hashMap = new HashMap();
+        hashMap.put("startTime",monday.toString());
+        hashMap.put("endTime",sunday.toString());
+        return  hashMap;
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performanceCalendar/performanceCalendar.html

@@ -248,7 +248,7 @@
                     min: mm, //最小可选择日期
                     range:false, //设置启用日期范围
                     // max: $('#perEndTime').val(),
-                    max: maxSunday,
+                    // max: maxSunday,
                     theme: 'molv',
                     trigger: 'focus',
                     done: function(value, date) {
@@ -268,7 +268,7 @@
                 var endDate = laydate.render({
                     elem: '#perEndTime',
                     min: $('#perStartTime').val(),
-                    max: maxSunday,
+                    // max: maxSunday,
                     theme: 'molv',
                     trigger: 'focus',
                     done: function(value, date) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
@@ -9,10 +8,10 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
@@ -56,9 +55,6 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
     @Autowired
     private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
 
-    @Autowired
-    private ExpressesMapper expressesMapper;
-
     @Override
     public List<OrderTicketsListDao> orderList(OrderListReq orderListReq) {
         Map<String, Object> reqParamMap = new HashMap<>();
@@ -96,7 +92,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
             orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId());
             orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId());
             if (null != orderTicketVo) {
-                Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
+//                Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
                 //获取演出信息
                 LambdaQueryWrapper<KylinPerformances> perWrapper = new LambdaQueryWrapper<>();
                 if (StringUtils.isNotNull(orderTicketVo.getPerformanceId())) {
@@ -146,15 +142,9 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
                     vo.setRestTime(0L);
                 }
                 //快递
-                if (null != expresses) {
-                    vo.setExpress_number(expresses.getNumber());
-                    vo.setExpress_company(expresses.getName());
-                    vo.setKuaidi_status(expresses.getStatus());
-                } else {
                 vo.setExpress_number("");
                 vo.setExpress_company("");
                 vo.setKuaidi_status(-2);
-                }
                 vo.setOrderTicketEntitiesVo(kylinOrderTicketEntitiesVoList);
                 vo.setPerformanceVo(performanceVo);
                 vo.setOrderTicketVo(orderTicketVo);