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

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -176,16 +176,15 @@
              

              String labels = followTraderInfoEntity.getLabels();

              if(StrUtil.isNotEmpty(labels)) {

                 String labelsName = "";

                 ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();

                 String[] split = labels.split(",");

                 int length = split.length;

                 for(int i = 0;i < length;i++) {

                    String string = split[i];

                    FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));

                    labelsName = selectById.getLabels();

                    labelsName += (labelsName + ",");

                    arrayList.add(selectById);

                 }

                 FollowTraderProfitInfoVo.setLabels(labelsName);

                 FollowTraderProfitInfoVo.setLabels(arrayList);

              }

              

           }

@@ -194,7 +193,7 @@
   }

   

   public static void main(String[] args) {

      String labels = "";

      String labels = "1,2,3";

      if(StrUtil.isNotEmpty(labels)) {

         String labelsName = "";

         String[] split = labels.split(",");

@@ -727,9 +726,9 @@
        String phone = memberEntity.getPhone();

        String email = memberEntity.getEmail();

        if(StrUtil.isNotEmpty(phone)) {

           followTraderInfoEntity.setNickname(phone);

           followTraderInfoEntity.setNickname(phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));

        }else {

           followTraderInfoEntity.setNickname(email);

           followTraderInfoEntity.setNickname(email.replaceAll("(\\w?)(\\w+)(\\w)(@\\w+\\.[a-z]+(\\.[a-z]+)?)","$1****$3$4"));

        }

        followTraderInfoEntity.setDeclaration(FollowTraderInfoEntity.DECLARATION_DEFAULT);

        followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);

@@ -784,16 +783,15 @@
        

        String labels = followTraderInfoEntity.getLabels();

      if(StrUtil.isNotEmpty(labels)) {

         String labelsName = "";

         ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();

         String[] split = labels.split(",");

         int length = split.length;

         for(int i = 0;i < length;i++) {

            String string = split[i];

            FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));

            labelsName = selectById.getLabels();

            labelsName += (labelsName + ",");

            arrayList.add(selectById);

         }

         tradeSetInfoVo.setLabels(labelsName);

         tradeSetInfoVo.setFollowTraderLabelEntitys(arrayList);

      }

      return Result.ok(tradeSetInfoVo);

   }