演出status

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

 package com.liquidnet.service.kylin.dto.vo.returns;
 
-import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import io.swagger.annotations.ApiModel;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import lombok.Data;
@@ -21,7 +20,7 @@ import java.util.List;
 @ApiModel
 public class KylinOrderRefundBatchesPerformanceVo implements Serializable {
 
-    private KylinPerformanceMisVo kylinPerformanceMisVo;
+    private String title;
     private List<PerformanceOrderStatisticalDao> performanceOrderStatisticalDao;
 
 }

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

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
@@ -13,9 +14,12 @@ import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesVo;
+import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
+import com.liquidnet.service.kylin.entity.KylinPerformances;
+import com.liquidnet.service.kylin.mapper.KylinPerformanceStatusMapper;
+import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -45,6 +49,12 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
     @Autowired
     private KylinPerformancesAdminServiceImpl kylinPerformancesService;
 
+    @Autowired
+    private KylinPerformanceStatusMapper performanceStatusMapper;
+
+    @Autowired
+    private KylinPerformancesMapper performancesMapper;
+
     @RequiresPermissions("kylin:refundBatch:view")
     @GetMapping()
     public String operlog()
@@ -83,16 +93,23 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
     public AjaxResult applyPerformance(RefundBatchApplyParam refundBatchApplyParam) {
         String performancesId = refundBatchApplyParam.getTargetId();
         //获取演出详情
-        KylinPerformanceMisVo performanceMisVo = kylinPerformancesService.performanceDetails(performancesId);
-        if (null == performanceMisVo) {
+        KylinPerformances kylinPerformances = performancesMapper.selectOne(Wrappers.lambdaQuery(KylinPerformances.class)
+                .eq(KylinPerformances::getPerformancesId, performancesId)
+                .select(KylinPerformances::getTitle)
+        );
+        KylinPerformanceStatus kylinPerformanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class)
+                .eq(KylinPerformanceStatus::getPerformanceId, performancesId)
+                .select(KylinPerformanceStatus::getStatus)
+        );
+        if (null == kylinPerformances) {
             return error("未找到该演出数据");
         }
-        if (performanceMisVo.getStatus() != 7) {
+        if (kylinPerformanceStatus.getStatus() != 7) {
             return error("当前演出未下架，不可退款");
         }
         List<PerformanceOrderStatisticalDao> result = kylinPerformancesService.getPerformanceOrderStatisticalList(performancesId);
         KylinOrderRefundBatchesPerformanceVo kylinOrderRefundBatchesPerformanceVo = new KylinOrderRefundBatchesPerformanceVo();
-        kylinOrderRefundBatchesPerformanceVo.setKylinPerformanceMisVo(performanceMisVo);
+        kylinOrderRefundBatchesPerformanceVo.setTitle(kylinPerformances.getTitle());
         kylinOrderRefundBatchesPerformanceVo.setPerformanceOrderStatisticalDao(result);
         return AjaxResult.success(kylinOrderRefundBatchesPerformanceVo);
     }

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

@@ -61,7 +61,7 @@
 									layer.msg(result.msg);
 									return false;
 								}
-								$("#performanceTitle").text(result.data.kylinPerformanceMisVo.title);
+								$("#performanceTitle").text(result.data.title);
 								var options = {
 									data: result.data.performanceOrderStatisticalDao,
 									pagination: false,

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

@@ -90,11 +90,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     public KylinPerformanceMisVo performanceDetails(String performancesId) {
         log.info(" PERFORMANCE  mis演出详情");
         KylinPerformanceMisVo createMisVo = performanceVoUtils.getPerformanceMisVo(performancesId);
-        KylinPerformanceStatus kylinPerformanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class)
-                .eq(KylinPerformanceStatus::getPerformanceId, performancesId)
-                .select(KylinPerformanceStatus::getStatus)
-        );
-        createMisVo.setStatus(kylinPerformanceStatus.getStatus());
         return createMisVo;
     }