Merge branch 'dev_merchant_tice' into dev_merchant

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldsAppliesVo.java → liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldAppliesVo.java

@@ -10,9 +10,9 @@ import lombok.Data;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-@ApiModel(value = "MerchantFieldsAppliesVo", description = "申请的场地")
+@ApiModel(value = "MerchantFieldAppliesVo", description = "申请的场地")
 @Data
-public class MerchantFieldsAppliesVo implements java.io.Serializable, Cloneable {
+public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -3241866244946476511L;
 
     @ApiModelProperty(position = 10, value = "场地申请ID")
@@ -88,18 +88,18 @@ public class MerchantFieldsAppliesVo implements java.io.Serializable, Cloneable
     private LocalDateTime deletedAt;
 
 
-    private static final MerchantFieldsAppliesVo obj = new MerchantFieldsAppliesVo();
+    private static final MerchantFieldAppliesVo obj = new MerchantFieldAppliesVo();
 
-    public static MerchantFieldsAppliesVo getNew() {
+    public static MerchantFieldAppliesVo getNew() {
         try {
-            return (MerchantFieldsAppliesVo) obj.clone();
+            return (MerchantFieldAppliesVo) obj.clone();
         } catch (CloneNotSupportedException e) {
             e.printStackTrace();
         }
-        return new MerchantFieldsAppliesVo();
+        return new MerchantFieldAppliesVo();
     }
 
-    public MerchantFieldsAppliesVo copy(MerchantFieldApplies source) {
+    public MerchantFieldAppliesVo copy(MerchantFieldApplies source) {
         if (null == source) return this;
 
         this.setFieldApplyId(source.getFieldApplyId());

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldCheckersVo.java

+package com.liquidnet.service.merchant.dto.vo;
+
+public class MerchantFieldCheckersVo {
+}

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

@@ -2,7 +2,7 @@ package com.liquidnet.service.merchant.service;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.merchant.constant.MerchantRedisConst;
-import com.liquidnet.service.merchant.dto.vo.MerchantFieldsAppliesVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -31,17 +31,17 @@ public class MerchantRdmService {
     }
 
 
-    public List<MerchantFieldsAppliesVo> getFieldsAppliesVosByUid(String uid) {
+    public List<MerchantFieldAppliesVo> getFieldsAppliesVosByUid(String uid) {
         String key = MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid);
         long s = System.currentTimeMillis();
-        List<MerchantFieldsAppliesVo> vos = (List<MerchantFieldsAppliesVo>) redisUtil.get(key);
+        List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
-    public boolean addFieldsAppliesVoByUid(String uid, List<MerchantFieldsAppliesVo> vos, MerchantFieldsAppliesVo vo) {
+    public boolean addFieldsAppliesVoByUid(String uid, List<MerchantFieldAppliesVo> vos, MerchantFieldAppliesVo vo) {
         if (null == vos) {
-            vos = ObjectUtil.getMerchantFieldsAppliesVoArrayList();
+            vos = ObjectUtil.getMerchantFieldAppliesVoArrayList();
         }
         vos.add(vo);
         return redisUtil.set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);

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

@@ -9,7 +9,7 @@ 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.vo.MerchantFieldsAppliesVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.service.IMerchantFieldsAppliesService;
 import com.liquidnet.service.merchant.service.MerchantRdmService;
@@ -93,7 +93,7 @@ public class MerchantFieldsAppliesServiceImpl implements IMerchantFieldsAppliesS
         }
 
         // 申请场地 vos 上限
-        List<MerchantFieldsAppliesVo> fieldsAppliesVos = merchantRdmService.getFieldsAppliesVosByUid(uid);
+        List<MerchantFieldAppliesVo> fieldsAppliesVos = merchantRdmService.getFieldsAppliesVosByUid(uid);
         if (!CollectionUtils.isEmpty(fieldsAppliesVos)) {
             if (fieldsAppliesVos.size() >= 10) {
                 ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13003");
@@ -113,7 +113,7 @@ public class MerchantFieldsAppliesServiceImpl implements IMerchantFieldsAppliesS
         }
 
         // 申请场地 vo
-        MerchantFieldsAppliesVo fieldsAppliesVo = MerchantFieldsAppliesVo.getNew();
+        MerchantFieldAppliesVo fieldsAppliesVo = MerchantFieldAppliesVo.getNew();
         BeanUtils.copyProperties(parameter, fieldsAppliesVo);
         fieldsAppliesVo.setFieldApplyId(IDGenerator.nextSnowId());
         fieldsAppliesVo.setApplyStatus(0);

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

 package com.liquidnet.service.merchant.util;
 
 import com.liquidnet.service.base.PagedResult;
-import com.liquidnet.service.merchant.dto.vo.MerchantFieldsAppliesVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.mongodb.BasicDBObject;
 
@@ -9,15 +9,15 @@ import java.util.ArrayList;
 
 public class ObjectUtil {
 
-    private static final ArrayList<MerchantFieldsAppliesVo> merchantFieldsAppliesVoArrayList = new ArrayList<>();
+    private static final ArrayList<MerchantFieldAppliesVo> merchantFieldAppliesVoArrayList = new ArrayList<>();
 
     private static final PagedResult<MerchantFieldsVo> merchantFieldsVoPagedResult = new PagedResult<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
 
-    public static ArrayList<MerchantFieldsAppliesVo> getMerchantFieldsAppliesVoArrayList() {
-        return (ArrayList<MerchantFieldsAppliesVo>) merchantFieldsAppliesVoArrayList.clone();
+    public static ArrayList<MerchantFieldAppliesVo> getMerchantFieldAppliesVoArrayList() {
+        return (ArrayList<MerchantFieldAppliesVo>) merchantFieldAppliesVoArrayList.clone();
     }
 
     public static PagedResult<MerchantFieldsVo> getMerchantFieldsVoPagedResult() {