Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html

@@ -37,23 +37,23 @@
                             </li>
                             <li>
                                 <label>支付方式：</label>
-                                <select name="orderType">
+                                <select name="paymentType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
                                 <label>订单状态：</label>
-                                <select name="orderType">
+                                <select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
                                 <label>客户端：</label>
-                                <select name="orderType">
+                                <select name="orderSource" th:with="type=${@dict.getType('zhengzai_order_source')}">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>

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
@@ -48,8 +47,8 @@ public class ServiceAdamApplication implements CommandLineRunner {
         }
     }
 
-    @Bean
-    MongoTransactionManager transactionManager(MongoDbFactory factory){
-        return new MongoTransactionManager(factory);
-    }
+//    @Bean
+//    MongoTransactionManager transactionManager(MongoDbFactory factory){
+//        return new MongoTransactionManager(factory);
+//    }
 }

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

@@ -48,8 +48,8 @@ public class ServiceKylinApplication implements CommandLineRunner {
         }
     }
 
-    @Bean
-    MongoTransactionManager transactionManager(MongoDbFactory factory){
-        return new MongoTransactionManager(factory);
-    }
+//    @Bean
+//    MongoTransactionManager transactionManager(MongoDbFactory factory){
+//        return new MongoTransactionManager(factory);
+//    }
 }

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(@Pattern(regexp = "\\b(recent|over)\\b", message = "模块参数无效")
                                                                          @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);
         }