记得上下班打卡 | git大法好,push需谨慎

Commit 80d111c9 authored by GaoHu's avatar GaoHu

新增特邀代理获取可代理的演出列表

parent 9c78ae88
...@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam; ...@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam; import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.TakeByPerId; import com.liquidnet.client.admin.zhengzai.smile.dto.TakeByPerId;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService; import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancesVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -31,10 +32,17 @@ public class SmileShowController { ...@@ -31,10 +32,17 @@ public class SmileShowController {
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("演出列表") @ApiOperation("演出列表")
@ResponseBody @ResponseBody
public TableDataInfo schoolList(SmileShowParam smileShowParam) { public TableDataInfo list(SmileShowParam smileShowParam) {
return smileShowService.listShow(smileShowParam); return smileShowService.listShow(smileShowParam);
} }
@GetMapping("/listAll")
@ApiOperation("特邀代理获取可代理的演出列表")
@ResponseBody
public AjaxResult listAll() {
return smileShowService.listAll();
}
@GetMapping("/getShowById") @GetMapping("/getShowById")
@ApiOperation("根据演出id查询演出详情") @ApiOperation("根据演出id查询演出详情")
public AjaxResult getShowById(String performancesId) { public AjaxResult getShowById(String performancesId) {
......
...@@ -73,4 +73,7 @@ public interface ISmileShowService extends IService<SmileSchool> { ...@@ -73,4 +73,7 @@ public interface ISmileShowService extends IService<SmileSchool> {
void exportData(ServletOutputStream servletOutputStream, String performancesId); void exportData(ServletOutputStream servletOutputStream, String performancesId);
AjaxResult upTakeByPerId(String perId, Integer type); AjaxResult upTakeByPerId(String perId, Integer type);
AjaxResult listAll();
} }
...@@ -25,6 +25,7 @@ import com.liquidnet.service.goblin.dto.vo.SmileUserVO; ...@@ -25,6 +25,7 @@ import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.dao.TicketAndStatusDao; import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
import com.liquidnet.service.kylin.dao.report.KylinPerformancesDto; import com.liquidnet.service.kylin.dao.report.KylinPerformancesDto;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancesVo;
import com.liquidnet.service.kylin.entity.KylinPerformances; import com.liquidnet.service.kylin.entity.KylinPerformances;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.smile.entity.SmileAgent; import com.liquidnet.service.smile.entity.SmileAgent;
...@@ -620,6 +621,16 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -620,6 +621,16 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
return AjaxResult.success(); return AjaxResult.success();
} }
@Override
public AjaxResult listAll() {
//返回可代理的演出名称和id
List<KylinPerformancesDto> kylinPerformancesDtoList = kylinPerformancesMapper.getListAll();
List<Object> collect = kylinPerformancesDtoList.stream().map(kylinPerformancesDto -> {
return KylinPerformancesVo.getNew().copyListAll(kylinPerformancesDto);
}).collect(Collectors.toList());
return AjaxResult.success(collect);
}
private List<List<String>> head(List<String> ticketList) { private List<List<String>> head(List<String> ticketList) {
List<List<String>> headTitles = new ArrayList<>(); List<List<String>> headTitles = new ArrayList<>();
String basicInfo = "代理数据"; String basicInfo = "代理数据";
......
...@@ -83,4 +83,5 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> { ...@@ -83,4 +83,5 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
//商品订单信息 //商品订单信息
List<CommodityOrderExportDao> exportCommodityOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime); List<CommodityOrderExportDao> exportCommodityOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime);
List<KylinPerformancesDto> getListAll();
} }
...@@ -768,6 +768,24 @@ GROUP BY user_mobile,tickets_id; ...@@ -768,6 +768,24 @@ GROUP BY user_mobile,tickets_id;
kp.time_start DESC kp.time_start DESC
</select> </select>
<select id="getListAll" resultType="com.liquidnet.service.kylin.dao.report.KylinPerformancesDto">
SELECT
kp.performances_id AS performancesId,
kp.title,
kps.`status`,
sa.type
FROM
kylin_performances AS kp
LEFT JOIN kylin_performance_status AS kps ON kps.performance_id = kp.performances_id
LEFT JOIN smile_agent AS sa ON sa.performance_id = kp.performances_id
WHERE
kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent AS sa WHERE sa.del_tag = 0 AND sa.type = 0 GROUP BY sa.performance_id )
AND kps.`status` = 6
ORDER BY
kp.COMMENT DESC,
kp.time_start DESC
</select>
<select id="selectTicketIdByPerId" resultType="com.liquidnet.service.kylin.dao.KylinPerformancesDao"> <select id="selectTicketIdByPerId" resultType="com.liquidnet.service.kylin.dao.KylinPerformancesDao">
SELECT SELECT
kp.performances_id, kp.performances_id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment