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

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/controller/FieldsPartnerController.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/FieldsPartnerController.java

-package com.liquidnet.service.kylin.partner.controller;
+package com.liquidnet.service.platform.controller.partner;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
-import com.liquidnet.service.kylin.service.impl.partner.FieldsPartnerServiceImpl;
+import com.liquidnet.service.platform.service.partner.impl.FieldsPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/controller/KylinBuyNoticeParnterController.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinBuyNoticeParnterController.java

-package com.liquidnet.service.kylin.partner.controller;
+package com.liquidnet.service.platform.controller.partner;
 
 
 import com.github.pagehelper.PageInfo;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/controller/KylinCheckUserPartnerController.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPartnerController.java

-package com.liquidnet.service.kylin.partner.controller;
+package com.liquidnet.service.platform.controller.partner;
 
 
 import com.github.pagehelper.PageInfo;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/controller/KylinCheckUserPerformancesPartnerController.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPerformancesPartnerController.java

-package com.liquidnet.service.kylin.partner.controller;
+package com.liquidnet.service.platform.controller.partner;
 
 
 import com.github.pagehelper.PageInfo;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/controller/KylinTicketTimesPartnerController.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinTicketTimesPartnerController.java

-package com.liquidnet.service.kylin.partner.controller;
+package com.liquidnet.service.platform.controller.partner;
 
 
 import com.liquidnet.service.base.ResponseDto;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/controller/KylinTicketsPartnerController.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinTicketsPartnerController.java

-package com.liquidnet.service.kylin.partner.controller;
+package com.liquidnet.service.platform.controller.partner;
 
 
 import com.liquidnet.service.base.ResponseDto;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/controller/PerformancePartnerController.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/PerformancePartnerController.java

-package com.liquidnet.service.kylin.partner.controller;
+package com.liquidnet.service.platform.controller.partner;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
@@ -9,7 +9,6 @@ import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
 import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
-import com.liquidnet.service.kylin.utils.OtherUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -29,8 +28,6 @@ import java.util.Map;
 @Validated
 public class PerformancePartnerController {
 
-    @Autowired
-    private OtherUtils otherUtils;
     @Autowired
     private IKylinPerformancesPartnerService performancesPartnerService;
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/impl/FieldsPartnerServiceImpl.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/FieldsPartnerServiceImpl.java

-package com.liquidnet.service.kylin.partner.impl;
+package com.liquidnet.service.platform.service.partner.impl;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/impl/KylinBuyNoticePartnerServiceImpl.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinBuyNoticePartnerServiceImpl.java

-package com.liquidnet.service.kylin.partner.impl;
+package com.liquidnet.service.platform.service.partner.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/impl/KylinCheckUserPartnerServiceImpl.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinCheckUserPartnerServiceImpl.java

-package com.liquidnet.service.kylin.partner.impl;
+package com.liquidnet.service.platform.service.partner.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,8 +12,8 @@ import com.liquidnet.service.kylin.dao.ChildListDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
 import com.liquidnet.service.kylin.entity.KylinCheckUser;
 import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
-import com.liquidnet.service.kylin.partner.utils.DataUtils;
 import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
+import com.liquidnet.service.platform.utils.DataUtils;
 import com.mongodb.BasicDBObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/impl/KylinCheckUserPerformancesPartnerServiceImpl.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinCheckUserPerformancesPartnerServiceImpl.java

-package com.liquidnet.service.kylin.partner.impl;
+package com.liquidnet.service.platform.service.partner.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/impl/KylinPerformancesPartnerServiceImpl.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinPerformancesPartnerServiceImpl.java

-package com.liquidnet.service.kylin.partner.impl;
+package com.liquidnet.service.platform.service.partner.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,9 +21,9 @@ import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
-import com.liquidnet.service.kylin.partner.utils.DataUtils;
-import com.liquidnet.service.kylin.partner.utils.PerformanceVoTask;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
+import com.liquidnet.service.platform.utils.DataUtils;
+import com.liquidnet.service.platform.utils.PerformanceVoTask;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/impl/KylinTicketTimesPartnerServiceImpl.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinTicketTimesPartnerServiceImpl.java

-package com.liquidnet.service.kylin.partner.impl;
+package com.liquidnet.service.platform.service.partner.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/impl/KylinTicketsPartnerServiceImpl.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinTicketsPartnerServiceImpl.java

-package com.liquidnet.service.kylin.partner.impl;
+package com.liquidnet.service.platform.service.partner.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

-package com.liquidnet.service.kylin.partner.utils;
+package com.liquidnet.service.platform.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/utils/MongoVoUtils.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/MongoVoUtils.java

-package com.liquidnet.service.kylin.partner.utils;
+package com.liquidnet.service.platform.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/utils/OrderUtils.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/OrderUtils.java

-package com.liquidnet.service.kylin.partner.utils;
+package com.liquidnet.service.platform.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/utils/OtherUtils.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/OtherUtils.java

-package com.liquidnet.service.kylin.partner.utils;
+package com.liquidnet.service.platform.utils;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.liquidnet.commons.lang.util.HttpUtil;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/kylin/partner/utils/PerformanceVoTask.java → liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

-package com.liquidnet.service.kylin.partner.utils;
+package com.liquidnet.service.platform.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
@@ -16,8 +16,8 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
-import com.liquidnet.service.kylin.partner.impl.KylinTicketTimesPartnerServiceImpl;
-import com.liquidnet.service.kylin.partner.impl.KylinTicketsPartnerServiceImpl;
+import com.liquidnet.service.platform.service.partner.impl.KylinTicketTimesPartnerServiceImpl;
+import com.liquidnet.service.platform.service.partner.impl.KylinTicketsPartnerServiceImpl;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;