合并 master 提交代码

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisCandyUtil.java

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
  * @author AnJiabin <jiabin.an@lightnet.io>
  * @version V1.0
  * @Description: Redis工具类
- * @class: RedisUtil
  * @Package com.liquidnet.stellar.utils
  * @Copyright: LightNet @ Copyright (c) 2020
  * @date 2020/8/26 13:11

liquidnet-bus-config/liquidnet-config/liquidnet-service-merchant.yml

@@ -75,10 +75,10 @@ spring:
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
     database: 15
-    dbs: ${liquidnet.redis.dbs}
-    port: ${liquidnet.redis.port}
-    host: ${liquidnet.redis.host}
-    password: ${liquidnet.redis.password}
+    dbs: ${liquidnet.redis.kylin.dbs}
+    port: ${liquidnet.redis.kylin.port}
+    host: ${liquidnet.redis.kylin.host}
+    password: ${liquidnet.redis.kylin.password}
     lettuce:
       pool:
         max-active: 8

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/Utils/KylinUtils.java

@@ -2,13 +2,10 @@ package com.liquidnet.service.consumer.kylin.Utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -16,7 +13,6 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 @Component
@@ -149,11 +145,11 @@ public class KylinUtils {
      */
     public int getPerformanceIsTrueName(String performanceId) {
         Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId);
-        if (obj!=null) {
-            return (int)obj;
-        }else{
+        if (obj != null) {
+            return (int) obj;
+        } else {
             int isTrueName = getPerformanceVo(performanceId).getIsTrueName();
-            redisUtil.set(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId,isTrueName);
+            redisUtil.set(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId, isTrueName);
             return isTrueName;
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinExpressModuleServiceImpl.java

@@ -3,10 +3,7 @@ package com.liquidnet.service.kylin.service.impl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
-import com.liquidnet.service.kylin.entity.KylinExpressModule;
-import com.liquidnet.service.kylin.mapper.KylinExpressModuleMapper;
 import com.liquidnet.service.kylin.service.IKylinExpressModuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

 package com.liquidnet.service.merchant.service;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.merchant.constant.MerchantRedisConst;
 import com.liquidnet.service.merchant.dto.vo.*;
 import com.liquidnet.service.merchant.util.ObjectUtil;
@@ -16,7 +16,7 @@ import java.util.List;
 public class MerchantRdmService {
 
     @Autowired
-    RedisUtil redisUtil;
+    RedisDataSourceUtil redisDataSourceUtil;
 
     @Autowired
     private MerchantMongoService merchantMongoService;
@@ -28,18 +28,18 @@ public class MerchantRdmService {
         }
         String key = MerchantRedisConst.INFO_FIELD.concat(fieldId);
         long s = System.currentTimeMillis();
-        MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key);
+        MerchantFieldsVo vo = (MerchantFieldsVo) redisDataSourceUtil.getRedisKylinUtil().get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         if (null == vo) {
             vo = merchantMongoService.getFieldsVoByFieldId(fieldId);
-            redisUtil.set(key, vo);
+            redisDataSourceUtil.getRedisKylinUtil().set(key, vo);
         }
         return vo;
     }
 
     // 【场地】更新详情
     public boolean setFieldsVoByFieldId(String fieldId, MerchantFieldsVo vo) {
-        return redisUtil.set(MerchantRedisConst.INFO_FIELD.concat(fieldId), vo);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD.concat(fieldId), vo);
     }
 
 
@@ -50,11 +50,11 @@ public class MerchantRdmService {
         }
         String key = MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid);
         long s = System.currentTimeMillis();
-        List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key);
+        List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisDataSourceUtil.getRedisKylinUtil().get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         if (null == vos) {
             vos = merchantMongoService.getFieldAppliesVosByUid(uid);
-            redisUtil.set(key, vos);
+            redisDataSourceUtil.getRedisKylinUtil().set(key, vos);
         }
         return vos;
     }
@@ -65,7 +65,7 @@ public class MerchantRdmService {
             vos = ObjectUtil.getMerchantFieldAppliesVoArrayList();
         }
         vos.add(vo);
-        return redisUtil.set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
     }
 
     // 【场地申请】删除
@@ -74,7 +74,7 @@ public class MerchantRdmService {
             return true;
         }
         vos.removeIf(r -> r.getFieldApplyId().equals(vo.getFieldApplyId()));
-        return redisUtil.set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
     }
 
 
@@ -82,7 +82,7 @@ public class MerchantRdmService {
     public List<MerchantFieldCheckersVo> getFieldCheckersVosByFieldId(String fieldId) {
         String key = MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId);
         long s = System.currentTimeMillis();
-        List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>) redisUtil.get(key);
+        List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>) redisDataSourceUtil.getRedisKylinUtil().get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
@@ -93,7 +93,7 @@ public class MerchantRdmService {
             vos = ObjectUtil.getMerchantFieldCheckersVoArrayList();
         }
         vos.add(vo);
-        return redisUtil.set(MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId), vos);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId), vos);
     }
 
     // 【场地默认验票员】删除
@@ -102,7 +102,7 @@ public class MerchantRdmService {
             return true;
         }
         vos.removeIf(r -> r.getFieldCheckerId().equals(vo.getFieldCheckerId()));
-        return redisUtil.set(MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId), vos);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId), vos);
     }
 
     // 【主办】详情
@@ -112,18 +112,18 @@ public class MerchantRdmService {
         }
         String key = MerchantRedisConst.INFO_SPONSOR.concat(sponsorId);
         long s = System.currentTimeMillis();
-        MerchantSponsorsVo vo = (MerchantSponsorsVo) redisUtil.get(key);
+        MerchantSponsorsVo vo = (MerchantSponsorsVo) redisDataSourceUtil.getRedisKylinUtil().get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         if (null == vo) {
             vo = merchantMongoService.getSponsorsVoBySponsorId(sponsorId);
-            redisUtil.set(key, vo);
+            redisDataSourceUtil.getRedisKylinUtil().set(key, vo);
         }
         return vo;
     }
 
     // 【主办】更新详情
     public boolean setSponsorsVoBySponsorId(String sponsorId, MerchantSponsorsVo vo) {
-        return redisUtil.set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo);
     }
 
     // 【主办申请】我的列表
@@ -133,11 +133,11 @@ public class MerchantRdmService {
         }
         String key = MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid);
         long s = System.currentTimeMillis();
-        List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisUtil.get(key);
+        List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisDataSourceUtil.getRedisKylinUtil().get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         if (null == vos) {
             vos = merchantMongoService.getSponsorAppliesVosByUid(uid);
-            redisUtil.set(key, vos);
+            redisDataSourceUtil.getRedisKylinUtil().set(key, vos);
         }
         return vos;
     }
@@ -148,7 +148,7 @@ public class MerchantRdmService {
             vos = ObjectUtil.getMerchantSponsorAppliesVoArrayList();
         }
         vos.add(vo);
-        return redisUtil.set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos);
     }
 
     // 【主办申请】删除
@@ -157,6 +157,6 @@ public class MerchantRdmService {
             return true;
         }
         vos.removeIf(r -> r.getSponsorApplyId().equals(vo.getSponsorApplyId()));
-        return redisUtil.set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos);
+        return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos);
     }
 }

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

@@ -172,15 +172,17 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
     @Override
     public ResponseDto<PerformancePartnerVo> getStep1(String performancesId) {
         String merchantId = CurrentUtil.getCurrentUid();
-        if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
-                MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
-        })) {
-            return ResponseDto.failure(ErrorMapping.get(29999));
-        }
         PerformancePartnerVo data = mongoMerchantUtils.getPerformancePartnerVo(performancesId);
         if (data == null) {
             return ResponseDto.failure(ErrorMapping.get(20104));
         }
+        if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
+                MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
+        })) {
+            if(!data.getMerchantId().equals(merchantId)){
+                return ResponseDto.failure(ErrorMapping.get(29999));
+            }
+        }
         KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(data.getPerformancesId());
         if (null != vo) {
             data.setStatus(vo.getAppStatus());
@@ -486,13 +488,14 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
 //            sqls.add(SqlMapping.get("kylin_ticket_status.onLine"));
 //            LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
 //            LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
+            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
                     MerchantAuthorizationConst.PerformancePermission.LINE.getId(),
             })) {
-                return ResponseDto.failure(ErrorMapping.get(29999));
+                if(!vo.getMerchantId().equals(merchantId)){
+                    return ResponseDto.failure(ErrorMapping.get(29999));
+                }
             }
-
-            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (!(vo.getAppStatus() == 3 || vo.getAppStatus() == 7)) {
                 return ResponseDto.failure(ErrorMapping.get(20110));
             }
@@ -538,12 +541,14 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
     public ResponseDto<String> outLinePerformance(String performancesId) {
         try {
             String merchantId = CurrentUtil.getCurrentUid();
+            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
                     MerchantAuthorizationConst.PerformancePermission.LINE.getId(),
             })) {
-                return ResponseDto.failure(ErrorMapping.get(29999));
+                if(!vo.getMerchantId().equals(merchantId)){
+                    return ResponseDto.failure(ErrorMapping.get(29999));
+                }
             }
-            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (vo.getAppStatus() >= 3 && vo.getAppStatus() != 4 && vo.getAppStatus() != 7) {//未提审||被拒绝   && performanceStatusData.getStatus() != 10
 //                HashMap<String, Object> map = CollectionUtil.mapStringObject();
 //                map.put("status", 7);
@@ -673,13 +678,15 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
     public ResponseDto<String> withdraw(String performancesId) {
         try {
             String merchantId = CurrentUtil.getCurrentUid();
+            LocalDateTime now = LocalDateTime.now();
+            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
                     MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
             })) {
-                return ResponseDto.failure(ErrorMapping.get(29999));
+                if(!vo.getMerchantId().equals(merchantId)){
+                    return ResponseDto.failure(ErrorMapping.get(29999));
+                }
             }
-            LocalDateTime now = LocalDateTime.now();
-            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (vo != null && vo.getAuditStatus() == 0) {
                 PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
                 performancePartnerVo.setPerformancesId(performancesId);

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

@@ -80,9 +80,11 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             LocalDateTime createdAt = LocalDateTime.now();
             ticketCreateParam.setTicketsId(ticketsId);
             //快递类型判断
-            boolean result = judgeTEM(ticketsId, ticketCreateParam.getExpressType(), ticketCreateParam.getExpressModule());
-            if (!result) {
-                return ResponseDto.failure(ErrorMapping.get(20119));
+            if (ticketCreateParam.getIsExpress() == 1) {
+                boolean result = judgeTEM(ticketsId, ticketCreateParam.getExpressType(), ticketCreateParam.getExpressModule());
+                if (!result) {
+                    return ResponseDto.failure(ErrorMapping.get(20119));
+                }
             }
             // mongo 操作
             KylinTicketPartnerVo kylinTicketPartnerVo = KylinTicketPartnerVo.getNew();
@@ -119,6 +121,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             mongoMerchantUtils.insertTicketPartnerVo(kylinTicketPartnerVo);
             return ResponseDto.success(kylinTicketPartnerVo);
         } catch (Exception e) {
+            e.printStackTrace();
             log.info(UserPathDto.setPartnerData("0", "createTicket", ticketCreateParam, e));
             return ResponseDto.failure(ErrorMapping.get(20105));
         }
@@ -133,9 +136,11 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             LocalDateTime createdAt = LocalDateTime.now();
             ticketCreateParam.setTicketsId(ticketsId);
             //快递类型判断
-            boolean result = judgeTEM(ticketsId, ticketCreateParam.getExpressType(), ticketCreateParam.getExpressModule());
-            if (!result) {
-                return ResponseDto.failure(ErrorMapping.get(20119));
+            if (ticketCreateParam.getIsExpress() == 1) {
+                boolean result = judgeTEM(ticketsId, ticketCreateParam.getExpressType(), ticketCreateParam.getExpressModule());
+                if (!result) {
+                    return ResponseDto.failure(ErrorMapping.get(20119));
+                }
             }
             // mongo 操作
             KylinTicketPartnerVo kylinTicketPartnerVo = KylinTicketPartnerVo.getNew();
@@ -190,9 +195,11 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             String ticketId = ticketCreateParam.getTicketsId();
             LocalDateTime updatedAt = LocalDateTime.now();
             //快递类型判断
-            boolean result = judgeTEM(ticketId, ticketCreateParam.getExpressType(), ticketCreateParam.getExpressModule());
-            if (!result) {
-                return ResponseDto.failure(ErrorMapping.get(20119));
+            if (ticketCreateParam.getIsExpress() == 1) {
+                boolean result = judgeTEM(ticketId, ticketCreateParam.getExpressType(), ticketCreateParam.getExpressModule());
+                if (!result) {
+                    return ResponseDto.failure(ErrorMapping.get(20119));
+                }
             }
             // mongo 操作
             KylinTicketPartnerVo kylinTicketPartnerVo = KylinTicketPartnerVo.getNew();
@@ -327,12 +334,14 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
             String merchantId = CurrentUtil.getCurrentUid();
+            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
                     MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
             })) {
-                return ResponseDto.failure(ErrorMapping.get(29999));
+                if (!vo.getMerchantId().equals(merchantId)) {
+                    return ResponseDto.failure(ErrorMapping.get(29999));
+                }
             }
-            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             KylinTicketTimesVo ticketTimesData;
             KylinTicketVo ticketData = null;
             for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
@@ -376,12 +385,14 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
             String merchantId = CurrentUtil.getCurrentUid();
+            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
                     MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
             })) {
-                return ResponseDto.failure(ErrorMapping.get(29999));
+                if (!vo.getMerchantId().equals(merchantId)) {
+                    return ResponseDto.failure(ErrorMapping.get(29999));
+                }
             }
-            KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
             KylinTicketTimesVo ticketTimesData;
             KylinTicketVo ticketData = null;
             for (int x = 0; x < vo.getTicketTimeList().size(); x++) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -52,10 +52,10 @@ public class DataUtils {
     //获取场地redis
     public MerchantFieldsVo getFieldVo(String fieldId) {
         String key = MerchantRedisConst.INFO_FIELD.concat(fieldId);
-        MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key);
+        MerchantFieldsVo vo = (MerchantFieldsVo) redisDataSourceUtil.getRedisSweetUtil().get(key);
         if (null == vo) {
             vo = mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
-            redisUtil.set(key, vo);
+            redisDataSourceUtil.getRedisSweetUtil().set(key, vo);
         }
         return vo;
     }