Merge branch 'dev_merchant_tice' into dev_merchant

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantFieldsApplyParam.java → liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantFieldApplyParam.java

@@ -10,9 +10,9 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
-@ApiModel(value = "MerchantFieldsApplyParam", description = "认领/创建场地入参")
+@ApiModel(value = "MerchantFieldApplyParam", description = "认领/创建场地入参")
 @Data
-public class MerchantFieldsApplyParam implements java.io.Serializable {
+public class MerchantFieldApplyParam implements java.io.Serializable {
     private static final long serialVersionUID = 7889390710531228185L;
 
     @ApiModelProperty(position = 10, required = false, value = "场地ID，认领时必传[50]")

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantFieldsAppliesService.java

 package com.liquidnet.service.merchant.service;
 
 import com.liquidnet.service.base.PagedResult;
-import com.liquidnet.service.merchant.dto.param.MerchantFieldsApplyParam;
+import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 
 public interface IMerchantFieldsAppliesService {
     PagedResult<MerchantFieldsVo> search(String name, int page, int size);
 
-    String apply(String uid, MerchantFieldsApplyParam parameter);
+    String apply(String uid, MerchantFieldApplyParam parameter);
 
     void editIsCheck(String uid, String fieldId, int isCheck);
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantFieldsController.java

@@ -5,7 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.merchant.dto.param.MerchantFieldsApplyParam;
+import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.service.IMerchantFieldsAppliesService;
 import io.swagger.annotations.Api;
@@ -48,7 +48,7 @@ public class MerchantFieldsController {
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "申请场地")
     @PostMapping("apply")
-    public ResponseDto<Object> apply(@Valid @RequestBody MerchantFieldsApplyParam parameter) {
+    public ResponseDto<Object> apply(@Valid @RequestBody MerchantFieldApplyParam parameter) {
         String currentUid = CurrentUtil.getCurrentUid();
 
         return ResponseDto.success(merchantFieldsAppliesService.apply(currentUid, parameter));

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsAppliesServiceImpl.java

@@ -8,7 +8,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.merchant.dto.param.MerchantFieldsApplyParam;
+import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.service.IMerchantFieldsAppliesService;
@@ -71,7 +71,7 @@ public class MerchantFieldsAppliesServiceImpl implements IMerchantFieldsAppliesS
     }
 
     @Override
-    public String apply(String uid, MerchantFieldsApplyParam parameter) {
+    public String apply(String uid, MerchantFieldApplyParam parameter) {
         LocalDateTime now = LocalDateTime.now();
 
         LinkedList<String> toMqSqls = CollectionUtil.linkedListString();