合并 孙云天代码

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

@@ -8,7 +8,6 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
 import com.liquidnet.service.kylin.dto.vo.KylinTimePerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.merchant.util.MongoMerchantUtils;
 import io.swagger.annotations.*;

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

@@ -280,9 +280,6 @@ public class MongoMerchantUtils {
                 if (performancePartnerListParam.getTimeStart() != null && !performancePartnerListParam.getTimeStart().isEmpty()) {
                     criteria = criteria.and("timeStart").gte(performancePartnerListParam.getTimeStart()).and("timeStart").lte(performancePartnerListParam.getTimeEnd());
                 }
-//                if (performancePartnerListParam.getStopSellDay() != -2) {
-//                    criteria = criteria.and("timeEnd").gte(performancePartnerListParam.getStopSellDay()).and("timeEnd").lte(DateUtil.getNowTime());
-//                }
             }
         }
         List<KylinPerformanceVo> performanceVos = mongoTemplate.find(