fix

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/ServiceAdamApplication.java

@@ -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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinStationController.java

@@ -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,51 +195,51 @@ public class KylinStationController {
                         // 演出的所有订单票明细
                         List<KylinOrderTicketEntitiesVo> performanceTicketEntitiesVoList = oteVoMap.get(r.getPerformancesId());
 
-                        if (!CollectionUtils.isEmpty(performanceTicketEntitiesVoList)) continue;
-
-                        // 订单票明细按票种分组
-                        Map<String, List<KylinOrderTicketEntitiesVo>> performanceTicketEntitiesVoMap =
-                                performanceTicketEntitiesVoList.stream().collect(Collectors.groupingBy(KylinOrderTicketEntitiesVo::getTicketId));
-
-                        List<KylinStationTicketVo> ticketVoList = new ArrayList<>();
-
-                        BigDecimal priceSum = BigDecimal.ZERO;
-                        int number = 0, checkedNum = 0, remainderNum = 0;
-                        for (Map.Entry<String, List<KylinOrderTicketEntitiesVo>> entry : performanceTicketEntitiesVoMap.entrySet()) {
-                            KylinTicketVo ticketVo = performanceTicketMap.get(entry.getKey());
-
-                            KylinStationTicketVo stationTicketVo = KylinStationTicketVo.getNew();
-                            stationTicketVo.setTicketId(ticketVo.getTicketsId());
-                            stationTicketVo.setTitle(ticketVo.getTitle());
-                            stationTicketVo.setPrice(ticketVo.getPrice());
-                            stationTicketVo.setUseStart(ticketVo.getUseStart());
-                            stationTicketVo.setUseEnd(ticketVo.getUseEnd());
-
-                            List<KylinOrderTicketEntitiesVo> subPerformanceTicketEntitiesVoList = entry.getValue();
-                            // 订单票明细按出票状态分组
-                            Map<Integer, List<KylinOrderTicketEntitiesVo>> subStatusPerformanceTicketEntitiesVoMap
-                                    = subPerformanceTicketEntitiesVoList.stream().collect(Collectors.groupingBy(KylinOrderTicketEntitiesVo::getStatus));
-
-                            stationTicketVo.setNumber(subPerformanceTicketEntitiesVoList.size());
-                            stationTicketVo.setPriceSum(stationTicketVo.getPrice().multiply(BigDecimal.valueOf(stationTicketVo.getNumber())));
-                            List<KylinOrderTicketEntitiesVo> checkedEntitiesVoList = subStatusPerformanceTicketEntitiesVoMap.get(1);
-                            stationTicketVo.setCheckedNum(CollectionUtils.isEmpty(checkedEntitiesVoList) ? 0 : checkedEntitiesVoList.size());
-                            List<KylinOrderTicketEntitiesVo> remainderEntitiesVoList = subStatusPerformanceTicketEntitiesVoMap.get(0);
-                            stationTicketVo.setRemainderNum(CollectionUtils.isEmpty(remainderEntitiesVoList) ? 0 : remainderEntitiesVoList.size());
-
-                            number += stationTicketVo.getNumber();
-                            checkedNum += stationTicketVo.getCheckedNum();
-                            remainderNum += stationTicketVo.getRemainderNum();
-                            priceSum = priceSum.add(stationTicketVo.getPriceSum());
-
-                            ticketVoList.add(stationTicketVo);
+                        if (!CollectionUtils.isEmpty(performanceTicketEntitiesVoList)) {
+                            // 订单票明细按票种分组
+                            Map<String, List<KylinOrderTicketEntitiesVo>> performanceTicketEntitiesVoMap =
+                                    performanceTicketEntitiesVoList.stream().collect(Collectors.groupingBy(KylinOrderTicketEntitiesVo::getTicketId));
+
+                            List<KylinStationTicketVo> ticketVoList = new ArrayList<>();
+
+                            BigDecimal priceSum = BigDecimal.ZERO;
+                            int number = 0, checkedNum = 0, remainderNum = 0;
+                            for (Map.Entry<String, List<KylinOrderTicketEntitiesVo>> entry : performanceTicketEntitiesVoMap.entrySet()) {
+                                KylinTicketVo ticketVo = performanceTicketMap.get(entry.getKey());
+
+                                KylinStationTicketVo stationTicketVo = KylinStationTicketVo.getNew();
+                                stationTicketVo.setTicketId(ticketVo.getTicketsId());
+                                stationTicketVo.setTitle(ticketVo.getTitle());
+                                stationTicketVo.setPrice(ticketVo.getPrice());
+                                stationTicketVo.setUseStart(ticketVo.getUseStart());
+                                stationTicketVo.setUseEnd(ticketVo.getUseEnd());
+
+                                List<KylinOrderTicketEntitiesVo> subPerformanceTicketEntitiesVoList = entry.getValue();
+                                // 订单票明细按出票状态分组
+                                Map<Integer, List<KylinOrderTicketEntitiesVo>> subStatusPerformanceTicketEntitiesVoMap
+                                        = subPerformanceTicketEntitiesVoList.stream().collect(Collectors.groupingBy(KylinOrderTicketEntitiesVo::getStatus));
+
+                                stationTicketVo.setNumber(subPerformanceTicketEntitiesVoList.size());
+                                stationTicketVo.setPriceSum(stationTicketVo.getPrice().multiply(BigDecimal.valueOf(stationTicketVo.getNumber())));
+                                List<KylinOrderTicketEntitiesVo> checkedEntitiesVoList = subStatusPerformanceTicketEntitiesVoMap.get(1);
+                                stationTicketVo.setCheckedNum(CollectionUtils.isEmpty(checkedEntitiesVoList) ? 0 : checkedEntitiesVoList.size());
+                                List<KylinOrderTicketEntitiesVo> remainderEntitiesVoList = subStatusPerformanceTicketEntitiesVoMap.get(0);
+                                stationTicketVo.setRemainderNum(CollectionUtils.isEmpty(remainderEntitiesVoList) ? 0 : remainderEntitiesVoList.size());
+
+                                number += stationTicketVo.getNumber();
+                                checkedNum += stationTicketVo.getCheckedNum();
+                                remainderNum += stationTicketVo.getRemainderNum();
+                                priceSum = priceSum.add(stationTicketVo.getPriceSum());
+
+                                ticketVoList.add(stationTicketVo);
+                            }
+                            r.setPriceSum(priceSum);
+                            r.setNumber(number);
+                            r.setCheckedNum(checkedNum);
+                            r.setRemainderNum(remainderNum);
+                            r.setTicketVoList(ticketVoList);
+                            r.setCanDownTime(performanceRelationMap.get(r.getPerformancesId()));
                         }
-                        r.setPriceSum(priceSum);
-                        r.setNumber(number);
-                        r.setCheckedNum(checkedNum);
-                        r.setRemainderNum(remainderNum);
-                        r.setTicketVoList(ticketVoList);
-                        r.setCanDownTime(performanceRelationMap.get(r.getPerformancesId()));
                     }
                 }
             }