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

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

@@ -30,7 +30,7 @@ import java.util.List;
  * @since 2021-05-10
  */
 @ApiSupport(order = 10050)
-@Api(tags = "收获地址")
+@Api(tags = "收货地址")
 @Slf4j
 @Validated
 @RestController
@@ -42,14 +42,14 @@ public class AdamAddressesController {
     IAdamAddressesService adamAddressesService;
 
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "添加收获地址")
+    @ApiOperation(value = "添加收货地址")
     @PostMapping("add")
     public ResponseDto<Object> add(@Valid @RequestBody AdamAddressesParam parameter) {
         return ResponseDto.success(adamAddressesService.add(parameter));
     }
 
     @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "收获地址列表")
+    @ApiOperation(value = "收货地址列表")
     @GetMapping("list")
     public ResponseDto<List<AdamAddressesVo>> list() {
         return ResponseDto.success(adamRdmService.getAddressesVoByUid(CurrentUtil.getCurrentUid()));
@@ -70,7 +70,7 @@ public class AdamAddressesController {
     }
 
     @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "编辑收获地址")
+    @ApiOperation(value = "编辑收货地址")
     @PostMapping("edit")
     public ResponseDto<Object> edit(@RequestBody @Valid AdamAddressesParam parameter) {
         if (StringUtils.isBlank(parameter.getAddressesId())) {
@@ -86,7 +86,7 @@ public class AdamAddressesController {
     }
 
     @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "删除收获地址")
+    @ApiOperation(value = "删除收货地址")
     @PostMapping("del/{addrId}")
     public ResponseDto<Object> del(@NotBlank @PathVariable String addrId) {
         String currentUid = CurrentUtil.getCurrentUid();
@@ -108,7 +108,7 @@ public class AdamAddressesController {
     }
 
     @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "获取默认收获地址")
+    @ApiOperation(value = "获取默认收货地址")
     @PostMapping("query/def")
     public ResponseDto<AdamAddressesVo> queryDef() {
         return ResponseDto.success(adamAddressesService.queryDefault(CurrentUtil.getCurrentUid()));

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

@@ -121,8 +121,8 @@ public class AdamEntersController {
     }
 
     @GetMapping("query/depth")
-    public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank @PathVariable String entersId,
-                                                   @NotBlank @RequestParam(required = false) String uid) {
+    public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank @RequestParam String entersId,
+                                                   @NotBlank @RequestParam String uid) {
         AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(uid, entersId);
         return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo);
     }

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

@@ -11,8 +11,6 @@ import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +63,7 @@ public class AdamMemberController {
         return ResponseDto.success(adamRdmService.getMemberAgreement());
     }
 
-    @GetMapping("check")
+    @GetMapping("check/depth")
     public ResponseDto<Boolean> isMember(@NotBlank @RequestParam String uid) {
         AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);
         return ResponseDto.success(null != userMemberInfo && userMemberInfo.isActive());