添加演出日历页面相关

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
@@ -7,10 +8,8 @@ import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -52,6 +51,19 @@ public class AdamMemberOrderController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 订单详情
+     */
+    @RequiresPermissions("adam:order:orderlist:detail")
+    @GetMapping("/orderList/detail/{orderId}")
+    public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) {
+        LambdaQueryWrapper<AdamMemberOrder> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(AdamMemberOrder::getOrderNo,orderId);
+        AdamMemberOrder orderDetailsVo = adamMemberOrderAdminService.getOne(queryWrapper);
+        mmap.put("orderDetailsVo", orderDetailsVo);
+        return prefix + "/orderList/detail";
+    }
+
 //    /**
 //     * 导出【请填写功能名称】列表
 //     */

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

@@ -2,7 +2,6 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
-import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 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;
@@ -42,78 +41,6 @@ public class PerformanceCalendarController extends BaseController{
     @GetMapping()
     public String performances(PerformanceCalendarReq performanceCalendarReq, ModelMap mmap)
     {
-        performanceCalendarReq.setPerformanceIimeBegin("2021-05-31");
-        performanceCalendarReq.setPerformanceIimeend("2021-06-06");
-        int days = Long.valueOf(DateUtil.intervalDays(DateUtil.parse(performanceCalendarReq.getPerformanceIimeBegin(),DateUtil.DATE_SMALL_STR)
-                ,DateUtil.parse(performanceCalendarReq.getPerformanceIimeend(),DateUtil.DATE_SMALL_STR))).intValue() + 1;
-
-        //查询条件
-        LambdaQueryWrapper<KylinPerformances> wrapper = new LambdaQueryWrapper<>();
-        if (!StringUtils.isNotNull(performanceCalendarReq.getPerformanceIimeBegin())) {
-            wrapper.ge(KylinPerformances::getTimeStart, DateUtil.parse(performanceCalendarReq.getPerformanceIimeBegin(),DateUtil.DATE_SMALL_STR));
-        }
-        if (!StringUtils.isNotNull(performanceCalendarReq.getPerformanceIimeend())) {
-            wrapper.le(KylinPerformances::getTimeStart, DateUtil.addDay(DateUtil.parse(performanceCalendarReq.getPerformanceIimeend(),DateUtil.DATE_SMALL_STR),1));
-        }
-
-        List<KylinPerformances> list = kylinPerformancesAdminService.list(wrapper);
-
-        String[][] dateArray2 = getDateList(DateUtil.parse(performanceCalendarReq.getPerformanceIimeBegin(),DateUtil.DATE_SMALL_STR),days);
-        //初始化对象
-        List<PerformanceCalendarResp> respList = initRespList(dateArray2);
-        for (KylinPerformances kylinPerformances : list) {
-            //定义演出对象
-            PerformanceCalendarResp.PerformanceVo performanceVo = new PerformanceCalendarResp.PerformanceVo();
-            performanceVo.setTitle(kylinPerformances.getTitle());
-            performanceVo.setCityName(kylinPerformances.getCityName());
-            performanceVo.setTimeStart(DateUtil.format(kylinPerformances.getTimeStart(),DateUtil.Formatter.ddHHmmssTrim));
-
-            //页面行循环
-            for(int i = 0;i< dateArray2.length;i++){
-                //页面列循环
-                for(int j = 0;j<dateArray2[i].length; j++){
-
-                    String targetDate = dateArray2[i][j];
-                    if(DateUtil.format(kylinPerformances.getTimeStart(),DateUtil.Formatter.yyyy_MM_dd).equalsIgnoreCase(targetDate)){
-                        switch (j){
-                            case 0:
-                                List<PerformanceCalendarResp.PerformanceVo> monList = respList.get(i).getMonList();
-                                monList.add(performanceVo);
-                                break;
-                            case 1:
-                                List<PerformanceCalendarResp.PerformanceVo> tueList = respList.get(i).getTueList();
-                                tueList.add(performanceVo);
-                                break;
-                            case 2:
-                                List<PerformanceCalendarResp.PerformanceVo> wedList = respList.get(i).getWedList();
-                                wedList.add(performanceVo);
-                                break;
-                            case 3:
-                                List<PerformanceCalendarResp.PerformanceVo> thuList = respList.get(i).getThuList();
-                                thuList.add(performanceVo);
-                                break;
-                            case 4:
-                                List<PerformanceCalendarResp.PerformanceVo> friList = respList.get(i).getFriList();
-                                friList.add(performanceVo);
-                                break;
-                            case 5:
-                                List<PerformanceCalendarResp.PerformanceVo> satList = respList.get(i).getSatList();
-                                satList.add(performanceVo);
-                                break;
-                            case 6:
-                                List<PerformanceCalendarResp.PerformanceVo> sunList = respList.get(i).getSunList();
-                                sunList.add(performanceVo);
-                                break;
-                            default:
-                                break;
-
-                        }
-                    }
-                }
-            }
-        }
-
-        mmap.put("respDataList",respList);
         return prefix + "/performanceCalendar";
     }
 
@@ -122,25 +49,25 @@ public class PerformanceCalendarController extends BaseController{
      */
     @RequiresPermissions("kylin:performanceCalendar:list")
     @PostMapping("/list")
-    public TableDataInfo list(PerformanceCalendarReq performanceCalendarReq, ModelMap mmap)
+    public String list(PerformanceCalendarReq performanceCalendarReq, ModelMap mmap)
     {
-        performanceCalendarReq.setPerformanceIimeBegin("2021-05-31");
-        performanceCalendarReq.setPerformanceIimeend("2021-06-06");
-        int days = Long.valueOf(DateUtil.intervalDays(DateUtil.parse(performanceCalendarReq.getPerformanceIimeBegin(),DateUtil.DATE_SMALL_STR)
-        ,DateUtil.parse(performanceCalendarReq.getPerformanceIimeend(),DateUtil.DATE_SMALL_STR))).intValue() + 1;
+//        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;
 
         //查询条件
         LambdaQueryWrapper<KylinPerformances> wrapper = new LambdaQueryWrapper<>();
-        if (!StringUtils.isNotNull(performanceCalendarReq.getPerformanceIimeBegin())) {
-            wrapper.ge(KylinPerformances::getTimeStart, DateUtil.asLocalDate(DateUtil.parse(performanceCalendarReq.getPerformanceIimeBegin(),DateUtil.DATE_SMALL_STR)));
+        if (!StringUtils.isNotNull(performanceCalendarReq.getTimeBegin())) {
+            wrapper.ge(KylinPerformances::getTimeStart, DateUtil.asLocalDate(DateUtil.parse(performanceCalendarReq.getTimeBegin(),DateUtil.DATE_SMALL_STR)));
         }
-        if (!StringUtils.isNotNull(performanceCalendarReq.getPerformanceIimeend())) {
-            wrapper.le(KylinPerformances::getTimeStart, DateUtil.addDay(DateUtil.parse(performanceCalendarReq.getPerformanceIimeend(),DateUtil.DATE_SMALL_STR),1));
+        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.getPerformanceIimeBegin(),DateUtil.DATE_SMALL_STR),days);
+        String[][] dateArray2 = getDateList(DateUtil.parse(performanceCalendarReq.getTimeBegin(),DateUtil.DATE_SMALL_STR),days);
         //初始化对象
         List<PerformanceCalendarResp> respList = initRespList(dateArray2);
         for (KylinPerformances kylinPerformances : list) {
@@ -196,7 +123,7 @@ public class PerformanceCalendarController extends BaseController{
         }
 
         mmap.put("respDataList",respList);
-        return getDataTable(respList);
+        return prefix + "/performanceCalendar";
     }
 
     /**

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-client-admin-web.yml

@@ -86,7 +86,7 @@ spring:
   devtools:
     restart:
       # 热部署开关
-      enabled: true
+      enabled: false
 
 # MyBatis
 mybatis:

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html

-<!DOCTYPE html>
+s<!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <th:block th:include="include :: header('【请填写功能名称】列表')" />
@@ -81,8 +81,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('kylin:order:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('kylin:order:remove')}]];
+        var detailFlag = [[${@permission.hasPermi('adam:order:orderList')}]];
         var prefix = ctx + "adam/order/orderList";
 
         $(function() {
@@ -96,90 +95,45 @@
                 columns: [{
                     checkbox: true
                 },
-                {
-                    field: 'mid',
-                    title: '支付时间',
-                    visible: false
-                },
                 {
                     field: 'orderNo',
-                    title: '支付时间'
+                    title: '订单号'
                 },
                 {
                     field: 'uid',
-                    title: '支付时间'
+                    title: '订单状态'
                 },
                 {
                     field: 'mode',
-                    title: '购买方式:0-购买会员 1-购买会员码,2-使用会员码'
+                    title: '支付方式'
                 },
                 {
                     field: 'price',
-                    title: '原价'
+                    title: '价格(元)'
                 },
                 {
                     field: 'pricePaid',
-                    title: '实际支付'
+                    title: '支付时间'
                 },
                 {
                     field: 'memberName',
-                    title: '实际支付'
+                    title: '创建时间'
                 },
                 {
                     field: 'memberId',
-                    title: '会员id'
+                    title: '用户ID'
                 },
                 {
                     field: 'memberPriceId',
-                    title: '会员价格id'
+                    title: '手机号'
                 },
                 {
                     field: 'days',
-                    title: '购买天数'
+                    title: '客户端'
                 },
                 {
                     field: 'state',
-                    title: '订单状态'
-                },
-                {
-                    field: 'memberNo',
-                    title: '会员号'
-                },
-                {
-                    field: 'payChannel',
-                    title: '支付渠道'
-                },
-                {
-                    field: 'payNo',
-                    title: '支付订单'
-                },
-                {
-                    field: 'birthday',
-                    title: '用户生日'
-                },
-                {
-                    field: 'paymentAt',
-                    title: '支付时间'
-                },
-                {
-                    field: 'createdAt',
-                    title: '支付时间'
-                },
-                {
-                    field: 'updatedAt',
-                    title: '支付时间'
-                },
-                {
-                    field: 'clientIp',
-                    title: '支付时间'
-                },
-                {
-                    field: 'source',
-                    title: '支付时间'
-                },
-                {
-                    field: 'version',
-                    title: '支付时间'
+                    title: '快递状态'
                 },
                 {
                     title: '操作',
@@ -187,7 +141,6 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.mid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mid + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]

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

@@ -7,7 +7,7 @@
      <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse">
-                <form id="formId">
+                <form id="formId" >
                     <div class="select-list">
                         <ul>
                             <li>

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

@@ -16,7 +16,7 @@
 <!--                                <input type="text" id="perStartTime" placeholder="开始日期" name="params[beginTime]"/>-->
 <!--                                <span>-</span>-->
 <!--                                <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>-->
-                                    <label th:style="'width:120px'">请选择时间范围2： </label>
+                                    <label th:style="'width:120px'">请选择时间范围3： </label>
                                     <input type="text" class="input-sm form-control" id="perStartTime" placeholder="yyyy-MM-dd"/>
                                     <span>-</span>
                                     <input type="text" class="input-sm form-control" id="perEndTime" placeholder="yyyy-MM-dd" readonly/>
@@ -28,7 +28,7 @@
 <!--                                <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>-->
 <!--                            </li>-->
                             <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="submit()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
@@ -186,7 +186,14 @@
         var editFlag = [[${@permission.hasPermi('kylin:performances:edit')}]];
         var removeFlag = [[${@permission.hasPermi('kylin:performances:remove')}]];
         var prefix = ctx + "kylin/performanceCalendar";
+        var selectListUrl = ctx + "kylin/performanceCalendar/list";
 
+        function submit(){
+            var queryData = $.common.formToJSON("table-form");
+            $.operate.post(selectListUrl,queryData,function (res) {
+                location.reload();
+            });
+        }
         $(function() {
             var options = {
                 url: prefix + "/list",

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/PerformanceCalendarReq.java

@@ -13,6 +13,6 @@ import lombok.Data;
  */
 @Data
 public class PerformanceCalendarReq {
-    String performanceIimeBegin;
-    String performanceIimeend;
+    private String timeBegin;
+    private String timeEnd;
 }