Merge branch 'dev_merchant_tice' into dev_merchant

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

@@ -4,6 +4,7 @@ import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -51,6 +52,13 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
     @Override
     public List<MerchantAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId) {
         List<MerchantAuthorizationRecordsVo> authorizationRecordsVos = merchantMongoService.getAuthorizationRecordsCheckersVosByCuid(cuid, performanceId);
+
+        for (MerchantAuthorizationRecordsVo recordsVo: authorizationRecordsVos) {
+            if (null != recordsVo.getMobile() && recordsVo.getMobile().length() > 4) {
+                recordsVo.setMobile(StringUtil.hiddenMobile(recordsVo.getMobile()));
+            }
+        }
+
         return authorizationRecordsVos;
     }
 
@@ -61,7 +69,7 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
         // 目前仅授权 验票 统计
         if (cuid.equals(parameter.getUid())) {
             // 无授权权限
-            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13301");
+            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13304");
             throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
         }
         MerchantAuthorizationPermissionParam checkPermissionParam = null;

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.merchant.service.impl;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.SqlMapping;
@@ -99,45 +100,6 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
         return fieldsVo;
     }
 
-//    @Override
-//    public void editBaseInfo(String uid, MerchantFieldEditParam parameter) {
-//        // 当前用户是否管理该场地
-//        MerchantFieldsVo fieldsVo = this.checkFieldAccount(uid, parameter.getFieldId());
-//
-//        LocalDateTime now = LocalDateTime.now();
-//        BeanUtils.copyProperties(parameter, fieldsVo);
-//        fieldsVo.setUpdatedAt(now);
-//
-//        // 场地 redis
-//        long s = System.currentTimeMillis();
-//        merchantRdmService.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
-//        log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
-//
-//        // 场地 mongo
-//        s = System.currentTimeMillis();
-//        merchantMongoService.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
-//        log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
-//
-//        LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
-//        LinkedList<Object[]> fieldUpdateObjs = CollectionUtil.linkedListObjectArr();
-//        // 场地 sql
-//        toMqSqls.add(SqlMapping.get("merchant_fields.update_base_info"));
-//        fieldUpdateObjs.add(new Object[]{
-//                fieldsVo.getName(), fieldsVo.getLogo(), fieldsVo.getBackground(), fieldsVo.getDescription(), fieldsVo.getBuiltDate(),
-//                fieldsVo.getProvinceId(), fieldsVo.getProvinceName(), fieldsVo.getCityId(), fieldsVo.getCityName(), fieldsVo.getDistrictId(), fieldsVo.getDistrictName(), fieldsVo.getAddress(), fieldsVo.getLongitude(), fieldsVo.getLatitude(),
-//                fieldsVo.getContactName(), fieldsVo.getContactEmail(),
-//                fieldsVo.getUpdatedAt(), fieldsVo.getFieldId()
-//        });
-//
-//        // mq
-//        s = System.currentTimeMillis();
-//        queueUtils.sendMsgByRedis(
-//                MQConst.MerchantQueue.SQL_MERCHANT_FIELD.getKey(),
-//                SqlMapping.gets(toMqSqls, fieldUpdateObjs)
-//        );
-//        log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
-//    }
-
     @Override
     public void editIsCheck(String uid, String fieldId, int isCheck) {
         // 当前用户是否管理该场地
@@ -185,6 +147,12 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
 
         List<MerchantFieldCheckersVo> fieldCheckersVos = merchantRdmService.getFieldCheckersVosByFieldId(fieldId);
 
+        for (MerchantFieldCheckersVo checkersVo : fieldCheckersVos) {
+            if (null != checkersVo.getMobile() && checkersVo.getMobile().length() > 4) {
+                checkersVo.setMobile(StringUtil.hiddenMobile(checkersVo.getMobile()));
+            }
+        }
+
         return fieldCheckersVos;
     }
 
@@ -195,7 +163,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
 
         // 场地默认验票员，是否已经添加
         if (cuid.equals(uid)) {
-            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13103");
+            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13105");
             throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
         }
         List<MerchantFieldCheckersVo> fieldCheckersVos = merchantRdmService.getFieldCheckersVosByFieldId(fieldId);

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

@@ -11,6 +11,8 @@
 13102=场地已被认领
 13103=验票员已存在
 13104=验票员不存在
+13105=不能添加自己为验票员
+
 
 # 场地申请
 13111=场地申请已达到上限
@@ -30,6 +32,7 @@
 13301=无授权权限
 13302=无权限授于统计权限
 13303=授权时间有误
+13304=不能授权自己权限