admin 配置完成

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderListVo.java

@@ -23,5 +23,6 @@ public class KylinOrderListVo implements Serializable {
     private String express_number;
     private String express_company;
     private Integer kuaidi_status;
+    private String getTicketType;
     private String createdAt;
 }

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

@@ -4,8 +4,10 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -48,12 +50,21 @@ public class KylinPerformancesController extends BaseController
         startPage();/**/
         PageInfo<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
         return getDataTable(result.getList());
-//        if (null != result) {
-//            return ResponseDto.success(result);
-//        } else {
-//            return ResponseDto.failure("获取演出详情失败");
-//        }
     }
+
+    @GetMapping(value = "/details")
+    @ResponseBody
+    @RequiresPermissions("kylin:performances:list")
+    public ResponseDto<KylinPerformanceMisVo> performanceDetails(String performancesId) {
+        KylinPerformanceMisVo result = null;
+        result = kylinPerformancesService.performanceDetails(performancesId);
+        if (null != result) {
+            return ResponseDto.success(result);
+        } else {
+            return ResponseDto.failure("获取演出详情失败");
+        }
+    }
+
 //
 //    /**
 //     * 导出演出列表

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

@@ -201,7 +201,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     public PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
         PageInfo<PerformanceAdminListDao> pageInfoTmp = null;
         try {
-//            PageHelper.startPage(performanceAdminListParam.getPageNum(), performanceAdminListParam.getPageSize());
+            PageHelper.startPage(performanceAdminListParam.getPageNum(), performanceAdminListParam.getPageSize());
             List<PerformanceAdminListDao> newList = new ArrayList();
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(BeanUtil.convertBeanToMap(performanceAdminListParam));
             for (PerformanceAdminListDao item:voList){

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -217,7 +217,9 @@
                 AND p.time_end BETWEEN #{stopSellTime} AND NOW()
             </if>
         </where>
-        ORDER BY ${orderItem} ${orderSc}
+        <if test="orderItem!=''">
+            ORDER BY ${orderItem} ${orderSc}
+        </if>
     </select>
     <!-- Mis 根据巡演查询演出列表 -->
     <select id="misTitleByRoadShowIdList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">