Merge branch 'dev' into test

liquidnet-bus-common/liquidnet-common-swagger/src/main/java/com/liquidnet/common/swagger/config/Swagger2Config.java

 package com.liquidnet.common.swagger.config;
 
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -14,11 +13,10 @@ import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.Contact;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 @Configuration
-@EnableKnife4j
-@EnableSwagger2
+@EnableSwagger2WebMvc
 public class Swagger2Config {
     @Autowired
     private Environment environment;

liquidnet-bus-common/pom.xml

@@ -129,7 +129,7 @@
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.7</version>
             </dependency>
             <dependency>
                 <groupId>com.belerweb</groupId>

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -11,6 +11,7 @@ server:
     context-path: ${liquidnet.info.context}
 # -----------------------------------------------------------
 knife4j:
+  enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
     enable: false

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -11,6 +11,7 @@ server:
     context-path: ${liquidnet.info.context}
 # -----------------------------------------------------------
 knife4j:
+  enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
     enable: false

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * <p>
@@ -47,7 +48,15 @@ public class AdamEntersController {
     @ApiOperation(value = "添加入场人")
     @PostMapping("add")
     public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) {
-        return ResponseDto.success(adamEntersService.add(parameter));
+        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid());
+
+        Optional<AdamEntersVo> any = vos.stream().filter(r -> (r.getIdCard().equals(parameter.getIdCard())) && r.getType().equals(parameter.getType())).findAny();
+        if (any.isPresent()) {
+            return ResponseDto.failure(ErrorMapping.get("10019"));
+        }
+
+        String entersId = adamEntersService.add(parameter);
+        return ResponseDto.success(entersId);
     }
 
     @ApiOperationSupport(order = 2)

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

@@ -154,11 +154,17 @@ public class AdamMemberOrderController {
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "兑换码校验")
+    @ApiOperation(value = "兑换码校验", notes = "响应参数[`code`:0-当前兑换码可用，否则不可用]")
     @GetMapping("check/code")
     public ResponseDto<Integer> checkMemberCode(@NotBlank @RequestParam String mCode) {
         AdamMemberCodeVo vo = adamRdmService.getMemberCodeVoByCode(mCode);
-        return ResponseDto.success(null == vo ? -1 : vo.getState());
+        if (null == vo) {
+            return ResponseDto.failure(ErrorMapping.get("10207"));
+        }
+        if (vo.getState() != 0) {
+            return ResponseDto.failure(ErrorMapping.get(vo.getState() == 1 ? "10208" : "10209"));
+        }
+        return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 4)

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

@@ -3,11 +3,16 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.constant.LnsRegex;
-import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.service.*;
+import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.IAdamUserInfoService;
+import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
@@ -27,7 +32,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.Pattern;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @ApiSupport(order = 10020)
 @Api(tags = "用户中心")

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -21,6 +21,7 @@
 10016=收货地址ID不能为空
 10017=入场人不存在，请核实
 10018=收货地址不存在，请核实
+10019=入场人已存在，请核实
 
 
 10101=姓名或身份证件号无效

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

@@ -115,7 +115,7 @@ public class PerformancePartnerController {
         return performancesPartnerService.withdraw(performancesId);
     }
 
-    @PostMapping(value = "orderStatistical")
+    @GetMapping(value = "orderStatistical")
     @ApiOperation(value = "演出订单统计",position = 9)
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<List<PerformanceOrderStatisticalDao>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull String performancesId) {