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

Commit 99326de9 authored by 张国柄's avatar 张国柄

fix

parent 0bdb0d25
......@@ -19,7 +19,6 @@ import java.util.Arrays;
@Slf4j
@EnableFeignClients
@MapperScan(basePackages = "com.liquidnet.service.adam.mapper")
//@SpringBootApplication(scanBasePackages = {"com.liquidnet"},exclude = {MongoAutoConfiguration.class,})
@SpringBootApplication(scanBasePackages = {"com.liquidnet"})
public class ServiceAdamApplication implements CommandLineRunner {
@Autowired
......
......@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
......@@ -119,13 +118,10 @@ public class KylinStationController {
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageSize", value = "页记录数", example = "5"),
})
@GetMapping("performances")
public ResponseDto<PageInfo<KylinStationPerformanceVo>> performances(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
public ResponseDto<PageInfo<KylinStationPerformanceVo>> performances(
@RequestParam String mod,
@Size(max = 30, message = "匹配字符过长")
@RequestParam(required = false) String match,
@Size(min = 1, max = 100, message = "页码无效")
@RequestParam(defaultValue = "1", required = false) int pageNo,
@Size(min = 5, max = 10, message = "页记录数无效")
@RequestParam(defaultValue = "5", required = false) int pageSize) {
List<KylinStationPerformanceVo> voList = new ArrayList<>();
String currentUid = CurrentUtil.getCurrentUid();
......@@ -199,8 +195,7 @@ public class KylinStationController {
// 演出的所有订单票明细
List<KylinOrderTicketEntitiesVo> performanceTicketEntitiesVoList = oteVoMap.get(r.getPerformancesId());
if (!CollectionUtils.isEmpty(performanceTicketEntitiesVoList)) continue;
if (!CollectionUtils.isEmpty(performanceTicketEntitiesVoList)) {
// 订单票明细按票种分组
Map<String, List<KylinOrderTicketEntitiesVo>> performanceTicketEntitiesVoMap =
performanceTicketEntitiesVoList.stream().collect(Collectors.groupingBy(KylinOrderTicketEntitiesVo::getTicketId));
......@@ -247,6 +242,7 @@ public class KylinStationController {
}
}
}
}
} catch (Exception e) {
log.error("验票:查取演出列表异常:/station/performances/?", e);
}
......
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