记得上下班打卡 | git大法好,push需谨慎

Commit f884b8ff authored by 胡佳晨's avatar 胡佳晨

去掉 new

parent 9c60ab24
...@@ -7,7 +7,7 @@ import lombok.Data; ...@@ -7,7 +7,7 @@ import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class KylinPerformanceMisVo { public class KylinPerformanceMisVo implements Cloneable{
//演出数据 //演出数据
@ApiModelProperty(value = "主键id") @ApiModelProperty(value = "主键id")
...@@ -128,4 +128,12 @@ public class KylinPerformanceMisVo { ...@@ -128,4 +128,12 @@ public class KylinPerformanceMisVo {
@ApiModelProperty(value = "场次数据") @ApiModelProperty(value = "场次数据")
private List<TicketTimesTicketCreatePartnerVo> ticketTimes; private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
private static final KylinPerformanceMisVo obj = new KylinPerformanceMisVo();
public static KylinPerformanceMisVo getNew() {
try {
return (KylinPerformanceMisVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinPerformanceMisVo();
}
}
} }
...@@ -2,6 +2,7 @@ package com.liquidnet.commons.lang.util; ...@@ -2,6 +2,7 @@ package com.liquidnet.commons.lang.util;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.function.Predicate; import java.util.function.Predicate;
...@@ -14,6 +15,7 @@ public class CollectionUtil { ...@@ -14,6 +15,7 @@ public class CollectionUtil {
private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>(); private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
private static final ArrayList<String> STRING_ARRAY_LIST = new ArrayList<>(); private static final ArrayList<String> STRING_ARRAY_LIST = new ArrayList<>();
private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>(); private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
private static final ArrayList<BigDecimal> BIGDECIMAL_ARRAY_LIST = new ArrayList<>();
public static HashMap<String, String> mapStringString() { public static HashMap<String, String> mapStringString() {
...@@ -36,6 +38,10 @@ public class CollectionUtil { ...@@ -36,6 +38,10 @@ public class CollectionUtil {
return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone(); return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone();
} }
public static ArrayList<BigDecimal> arrayListBigDeciaml() {
return (ArrayList<BigDecimal>) BIGDECIMAL_ARRAY_LIST.clone();
}
public static LinkedMultiValueMap<String, String> linkedMultiValueMapStringString() { public static LinkedMultiValueMap<String, String> linkedMultiValueMapStringString() {
return (LinkedMultiValueMap<String, String>) STRING_STRING_LINKED_MULTI_VALUE_MAP.clone(); return (LinkedMultiValueMap<String, String>) STRING_STRING_LINKED_MULTI_VALUE_MAP.clone();
} }
......
package com.liquidnet.service.merchant.service.impl; package com.liquidnet.service.merchant.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo; import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import com.liquidnet.service.kylin.entity.KylinBuyNotice;
import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService; import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
import com.liquidnet.service.merchant.util.RedisMerchantUtils; import com.liquidnet.service.merchant.util.RedisMerchantUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
......
...@@ -35,7 +35,6 @@ import org.springframework.stereotype.Service; ...@@ -35,7 +35,6 @@ import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
...@@ -413,7 +412,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -413,7 +412,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
return ResponseDto.failure(ErrorMapping.get(20104)); return ResponseDto.failure(ErrorMapping.get(20104));
} }
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId); List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList(); List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = ObjectUtil.getTicketTimesTicketCreatePartnerVoList();
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) { for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) {
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew(); TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew();
BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo); BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
...@@ -576,7 +575,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -576,7 +575,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
List<PerformancePartnerVo> performancePartnerVo = mongoMerchantUtils.getPerformancePartnerList(query); List<PerformancePartnerVo> performancePartnerVo = mongoMerchantUtils.getPerformancePartnerList(query);
query.with(pageable); query.with(pageable);
//处理Vo //处理Vo
List<KylinPerformancePartnerListVo> voList = new ArrayList<>(); List<KylinPerformancePartnerListVo> voList = ObjectUtil.getKylinPerformancePartnerListVo();
for (PerformancePartnerVo item : performancePartnerVo) { for (PerformancePartnerVo item : performancePartnerVo) {
KylinPerformancePartnerListVo voData = KylinPerformancePartnerListVo.getNew(); KylinPerformancePartnerListVo voData = KylinPerformancePartnerListVo.getNew();
voData.setStatus0Data(item); voData.setStatus0Data(item);
......
package com.liquidnet.service.merchant.service.impl; package com.liquidnet.service.merchant.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
...@@ -11,8 +10,6 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; ...@@ -11,8 +10,6 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.KylinTicketTimes;
import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper;
import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService; import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
import com.liquidnet.service.merchant.util.*; import com.liquidnet.service.merchant.util.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
...@@ -12,20 +12,15 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo; ...@@ -12,20 +12,15 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.merchant.constant.MerchantAuthorizationConst; import com.liquidnet.service.merchant.constant.MerchantAuthorizationConst;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPerformanceVo; import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPerformanceVo;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPermissionsVo;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument; import com.mongodb.client.model.ReturnDocument;
import org.bson.Document; import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.Aggregation; import org.springframework.data.mongodb.core.aggregation.Aggregation;
import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
import org.springframework.data.mongodb.core.aggregation.AggregationResults; import org.springframework.data.mongodb.core.aggregation.AggregationResults;
import org.springframework.data.mongodb.core.aggregation.LookupOperation;
import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
...@@ -81,7 +76,7 @@ public class MongoMerchantUtils { ...@@ -81,7 +76,7 @@ public class MongoMerchantUtils {
public void updateTicketTimesPartnerVo(KylinTicketTimesPartnerVo data) { public void updateTicketTimesPartnerVo(KylinTicketTimesPartnerVo data) {
Query query = Query.query(Criteria.where("ticketTimesId").is(data.getTicketTimesId())); Query query = Query.query(Criteria.where("ticketTimesId").is(data.getTicketTimesId()));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data)); BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(), query.getQueryObject(),
objectTicketVo objectTicketVo
...@@ -98,7 +93,7 @@ public class MongoMerchantUtils { ...@@ -98,7 +93,7 @@ public class MongoMerchantUtils {
public void updateTicketPartnerVo(KylinTicketPartnerVo data) { public void updateTicketPartnerVo(KylinTicketPartnerVo data) {
Query query = Query.query(Criteria.where("ticketsId").is(data.getTicketsId())); Query query = Query.query(Criteria.where("ticketsId").is(data.getTicketsId()));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data)); BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(), query.getQueryObject(),
objectTicketVo objectTicketVo
...@@ -107,7 +102,7 @@ public class MongoMerchantUtils { ...@@ -107,7 +102,7 @@ public class MongoMerchantUtils {
public void submitTicketByTimes(KylinTicketPartnerVo data) { public void submitTicketByTimes(KylinTicketPartnerVo data) {
Query query = Query.query(Criteria.where("timesId").is(data.getTimesId()).and("status").nin(-2, 7)); Query query = Query.query(Criteria.where("timesId").is(data.getTimesId()).and("status").nin(-2, 7));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data)); BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(), query.getQueryObject(),
objectTicketVo objectTicketVo
...@@ -138,7 +133,7 @@ public class MongoMerchantUtils { ...@@ -138,7 +133,7 @@ public class MongoMerchantUtils {
public void updatePerformancePartnerVoById(PerformancePartnerVo data) { public void updatePerformancePartnerVoById(PerformancePartnerVo data) {
Query query = Query.query(Criteria.where("performancesId").is(data.getPerformancesId())); Query query = Query.query(Criteria.where("performancesId").is(data.getPerformancesId()));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data)); BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(), query.getQueryObject(),
objectTicketVo objectTicketVo
...@@ -147,7 +142,7 @@ public class MongoMerchantUtils { ...@@ -147,7 +142,7 @@ public class MongoMerchantUtils {
public void updateSubmitTicketVoById(KylinTicketPartnerVo data) { public void updateSubmitTicketVoById(KylinTicketPartnerVo data) {
Query query = Query.query(Criteria.where("ticketsId").is(data.getTicketsId()).and("status").in(3, 6, 8, 9, 10)); Query query = Query.query(Criteria.where("ticketsId").is(data.getTicketsId()).and("status").in(3, 6, 8, 9, 10));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data)); BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(), query.getQueryObject(),
objectTicketVo objectTicketVo
...@@ -203,7 +198,7 @@ public class MongoMerchantUtils { ...@@ -203,7 +198,7 @@ public class MongoMerchantUtils {
} }
public Document getObjectTicketVo(HashMap<String, Object> map, String ticketsId) { public Document getObjectTicketVo(HashMap<String, Object> map, String ticketsId) {
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map)); BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
Document docTicket = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).findOneAndUpdate( Document docTicket = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(), Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
objectTicketVo, objectTicketVo,
...@@ -271,7 +266,7 @@ public class MongoMerchantUtils { ...@@ -271,7 +266,7 @@ public class MongoMerchantUtils {
); );
AggregationResults<PerformancePartnerListDao> outputType = mongoTemplate.aggregate(aggregation, KylinOrderTicketVo.class.getSimpleName(), PerformancePartnerListDao.class); AggregationResults<PerformancePartnerListDao> outputType = mongoTemplate.aggregate(aggregation, KylinOrderTicketVo.class.getSimpleName(), PerformancePartnerListDao.class);
List<PerformancePartnerListDao> dataList = new ArrayList(outputType.getMappedResults()); List<PerformancePartnerListDao> dataList = new ArrayList(outputType.getMappedResults());
List<PerformancePartnerListDao> list = new ArrayList(); List<PerformancePartnerListDao> list = ObjectUtil.getPerformancePartnerListDaoArrayList();
for (KylinPerformanceVo item : performanceVos) { for (KylinPerformanceVo item : performanceVos) {
boolean findData = false; boolean findData = false;
PerformancePartnerListDao dao = PerformancePartnerListDao.getNew(); PerformancePartnerListDao dao = PerformancePartnerListDao.getNew();
......
package com.liquidnet.service.merchant.util; package com.liquidnet.service.merchant.util;
import com.liquidnet.service.base.PagedResult; import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancePartnerListVo;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
import com.liquidnet.service.merchant.dto.vo.*; import com.liquidnet.service.merchant.dto.vo.*;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
...@@ -21,6 +24,22 @@ public class ObjectUtil { ...@@ -21,6 +24,22 @@ public class ObjectUtil {
private static final BasicDBObject basicDBObject = new BasicDBObject(); private static final BasicDBObject basicDBObject = new BasicDBObject();
private static final ArrayList<PerformancePartnerListDao> performancePartnerListDaoArrayList = new ArrayList<>();
private static final ArrayList<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<>();
private static final ArrayList<KylinPerformancePartnerListVo> performancePartnerListVo = new ArrayList<>();
public static ArrayList<PerformancePartnerListDao> getPerformancePartnerListDaoArrayList() {
return (ArrayList<PerformancePartnerListDao>) performancePartnerListDaoArrayList.clone();
}
public static ArrayList<KylinPerformancePartnerListVo> getKylinPerformancePartnerListVo() {
return (ArrayList<KylinPerformancePartnerListVo>) performancePartnerListVo.clone();
}
public static ArrayList<TicketTimesTicketCreatePartnerVo> getTicketTimesTicketCreatePartnerVoList() {
return (ArrayList<TicketTimesTicketCreatePartnerVo>) ticketTimesTicketCreatePartnerVoList.clone();
}
public static ArrayList<MerchantStationsVo> getMerchantStationsVosArrayList() { public static ArrayList<MerchantStationsVo> getMerchantStationsVosArrayList() {
return (ArrayList<MerchantStationsVo>) merchantStationsVosArrayList.clone(); return (ArrayList<MerchantStationsVo>) merchantStationsVosArrayList.clone();
} }
......
...@@ -24,6 +24,8 @@ import java.time.LocalDateTime; ...@@ -24,6 +24,8 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Component @Component
@Slf4j @Slf4j
public class PerformanceUtils { public class PerformanceUtils {
...@@ -46,14 +48,14 @@ public class PerformanceUtils { ...@@ -46,14 +48,14 @@ public class PerformanceUtils {
* *
* @param performanceSingleId * @param performanceSingleId
*/ */
public void performanceVoStatus(String performanceSingleId,Integer voStatus) { public void performanceVoStatus(String performanceSingleId, Integer voStatus) {
LinkedList<String> sqls = CollectionUtil.linkedListString(); LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("kylin_ticket_status.VoStatus")); sqls.add(SqlMapping.get("kylin_ticket_status.VoStatus"));
sqls.add(SqlMapping.get("kylin_performance_status.VoStatus")); sqls.add(SqlMapping.get("kylin_performance_status.VoStatus"));
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
LocalDateTime timeNow = LocalDateTime.now(); LocalDateTime timeNow = LocalDateTime.now();
List<String> performanceIdList = new ArrayList<>(); List<String> performanceIdList = CollectionUtil.linkedListString();
if (performanceSingleId == null) { if (performanceSingleId == null) {
List<KylinPerformanceVo> list = mongoMerchantUtils.getPerformanceVoOnlineList(); List<KylinPerformanceVo> list = mongoMerchantUtils.getPerformanceVoOnlineList();
for (KylinPerformanceVo item : list) { for (KylinPerformanceVo item : list) {
...@@ -65,7 +67,7 @@ public class PerformanceUtils { ...@@ -65,7 +67,7 @@ public class PerformanceUtils {
for (String performancesId : performanceIdList) { for (String performancesId : performanceIdList) {
KylinPerformanceVo vo = combinePerformanceVoData(performancesId); KylinPerformanceVo vo = combinePerformanceVoData(performancesId);
if(voStatus!=null){ if (voStatus != null) {
vo.setAppStatus(voStatus); vo.setAppStatus(voStatus);
} }
//场次 //场次
...@@ -114,13 +116,13 @@ public class PerformanceUtils { ...@@ -114,13 +116,13 @@ public class PerformanceUtils {
} }
//修改票状态 //修改票状态
KylinTicketStatus changeStatus = new KylinTicketStatus(); KylinTicketStatus changeStatus = KylinTicketStatus.getNew();
changeStatus.setStatus(status); changeStatus.setStatus(status);
if (surplusGeneral != -1) { if (surplusGeneral != -1) {
changeStatus.setSurplusGeneral(surplusGeneral); changeStatus.setSurplusGeneral(surplusGeneral);
} }
sqlsDataA.add(new Object[]{ sqlsDataA.add(new Object[]{
changeStatus.getStatus(), changeStatus.getSurplusGeneral(), kylinTicketVoItem.getTicketsId(),timeNow,timeNow changeStatus.getStatus(), changeStatus.getSurplusGeneral(), kylinTicketVoItem.getTicketsId(), timeNow, timeNow
}); });
kylinTicketVoItem.setStatus(status); kylinTicketVoItem.setStatus(status);
...@@ -144,7 +146,7 @@ public class PerformanceUtils { ...@@ -144,7 +146,7 @@ public class PerformanceUtils {
} }
//修改演出状态 //修改演出状态
sqlsDataB.add(new Object[]{ sqlsDataB.add(new Object[]{
appStatus, performancesId,timeNow,timeNow appStatus, performancesId, timeNow, timeNow
}); });
String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB); String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB);
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_PERFORMANCE_UPDATE.getKey(), queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_PERFORMANCE_UPDATE.getKey(),
...@@ -167,11 +169,11 @@ public class PerformanceUtils { ...@@ -167,11 +169,11 @@ public class PerformanceUtils {
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId); List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>(); List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
ArrayList<BigDecimal> floatList = new ArrayList<>(); ArrayList<BigDecimal> floatList = CollectionUtil.arrayListBigDeciaml();
ArrayList<String> StringList = new ArrayList<>(); ArrayList<String> StringList = CollectionUtil.arrayListString();
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) { for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) {
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo(); TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew();
BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo); BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
List<KylinTicketPartnerVo> kylinTicketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId()); List<KylinTicketPartnerVo> kylinTicketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos); ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos);
...@@ -181,7 +183,7 @@ public class PerformanceUtils { ...@@ -181,7 +183,7 @@ public class PerformanceUtils {
StringList.add(kylinTicketPartnerVoItem.getTimeEnd()); StringList.add(kylinTicketPartnerVoItem.getTimeEnd());
} }
} }
KylinPerformanceMisVo kylinPerformanceMisVo = new KylinPerformanceMisVo(); KylinPerformanceMisVo kylinPerformanceMisVo = KylinPerformanceMisVo.getNew();
BeanUtils.copyProperties(performanceData, kylinPerformanceMisVo); BeanUtils.copyProperties(performanceData, kylinPerformanceMisVo);
floatList.sort(Comparator.naturalOrder()); floatList.sort(Comparator.naturalOrder());
...@@ -254,16 +256,16 @@ public class PerformanceUtils { ...@@ -254,16 +256,16 @@ public class PerformanceUtils {
LinkedList<Object[]> insert9 = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> insert9 = CollectionUtil.linkedListObjectArr();
//创建演出 //创建演出
KylinPerformances performances = new KylinPerformances(); KylinPerformances performances = KylinPerformances.getNew();
BeanUtils.copyProperties(kylinPerformanceMisVo, performances); BeanUtils.copyProperties(kylinPerformanceMisVo, performances);
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus(); KylinPerformanceStatus performanceStatus = KylinPerformanceStatus.getNew();
BeanUtils.copyProperties(kylinPerformanceMisVo, performanceStatus); BeanUtils.copyProperties(kylinPerformanceMisVo, performanceStatus);
KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations(); KylinPerformanceRelations performanceRelations = KylinPerformanceRelations.getNew();
BeanUtils.copyProperties(kylinPerformanceMisVo, performanceRelations); BeanUtils.copyProperties(kylinPerformanceMisVo, performanceRelations);
performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getCreatedAt()))); performances.setCreatedAt(LocalDateTime.parse(kylinPerformanceMisVo.getCreatedAt(), DTF_YMD_HMS));
performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeStart()))); performances.setTimeStart(LocalDateTime.parse(kylinPerformanceMisVo.getTimeStart(), DTF_YMD_HMS));
performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeEnd()))); performances.setTimeEnd(LocalDateTime.parse(kylinPerformanceMisVo.getTimeEnd(), DTF_YMD_HMS));
MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(performanceRelations.getFieldId()); MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(performanceRelations.getFieldId());
performances.setCityName(fieldsVo.getCityName()); performances.setCityName(fieldsVo.getCityName());
performances.setCityId(Integer.parseInt(fieldsVo.getCityId())); performances.setCityId(Integer.parseInt(fieldsVo.getCityId()));
...@@ -275,9 +277,9 @@ public class PerformanceUtils { ...@@ -275,9 +277,9 @@ public class PerformanceUtils {
performanceStatus.setAuditStatus(0); performanceStatus.setAuditStatus(0);
performanceStatus.setUpdatedAt(updatedAt); performanceStatus.setUpdatedAt(updatedAt);
performanceStatus.setLimitCountMember(1); performanceStatus.setLimitCountMember(1);
if(performances.getApprovalUrl()==null || performances.getApprovalUrl().equals("")){ if (performances.getApprovalUrl() == null || performances.getApprovalUrl().equals("")) {
performanceStatus.setStatusSell(0); performanceStatus.setStatusSell(0);
}else{ } else {
performanceStatus.setStatusSell(1); performanceStatus.setStatusSell(1);
} }
...@@ -297,14 +299,14 @@ public class PerformanceUtils { ...@@ -297,14 +299,14 @@ public class PerformanceUtils {
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId); List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) { for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
//创建场次 //创建场次
KylinTicketTimes ticketTimes = new KylinTicketTimes(); KylinTicketTimes ticketTimes = KylinTicketTimes.getNew();
BeanUtils.copyProperties(ticketTimeItem, ticketTimes); BeanUtils.copyProperties(ticketTimeItem, ticketTimes);
KylinTicketTimeRelation ticketTimeRelation = new KylinTicketTimeRelation(); KylinTicketTimeRelation ticketTimeRelation = KylinTicketTimeRelation.getNew();
BeanUtils.copyProperties(ticketTimeItem, ticketTimeRelation); BeanUtils.copyProperties(ticketTimeItem, ticketTimeRelation);
ticketTimes.setUseStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseStart()))); ticketTimes.setUseStart(LocalDateTime.parse(ticketTimeItem.getUseStart(), DTF_YMD_HMS));
ticketTimes.setUseEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseEnd()))); ticketTimes.setUseEnd(LocalDateTime.parse(ticketTimeItem.getUseEnd(), DTF_YMD_HMS));
ticketTimes.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getCreatedAt()))); ticketTimes.setCreatedAt(LocalDateTime.parse(ticketTimeItem.getCreatedAt(), DTF_YMD_HMS));
ticketTimes.setUpdatedAt(updatedAt); ticketTimes.setUpdatedAt(updatedAt);
ticketTimeRelation.setPerformanceId(performancesId); ticketTimeRelation.setPerformanceId(performancesId);
...@@ -324,35 +326,36 @@ public class PerformanceUtils { ...@@ -324,35 +326,36 @@ public class PerformanceUtils {
KylinTicketPartnerVo kylinTicketPartnerVo = JsonUtils.fromJson(docTicket.toJson(), KylinTicketPartnerVo.class); KylinTicketPartnerVo kylinTicketPartnerVo = JsonUtils.fromJson(docTicket.toJson(), KylinTicketPartnerVo.class);
//创建演出 //创建演出
KylinTickets tickets = new KylinTickets(); KylinTickets tickets = KylinTickets.getNew();
BeanUtils.copyProperties(kylinTicketPartnerVo, tickets); BeanUtils.copyProperties(kylinTicketPartnerVo, tickets);
KylinTicketStatus ticketStatus = new KylinTicketStatus(); KylinTicketStatus ticketStatus = KylinTicketStatus.getNew();
BeanUtils.copyProperties(kylinTicketPartnerVo, ticketStatus); BeanUtils.copyProperties(kylinTicketPartnerVo, ticketStatus);
KylinTicketRelations ticketRelations = new KylinTicketRelations(); KylinTicketRelations ticketRelations = KylinTicketRelations.getNew();
BeanUtils.copyProperties(kylinTicketPartnerVo, ticketRelations); BeanUtils.copyProperties(kylinTicketPartnerVo, ticketRelations);
tickets.setPayCountdownMinute(kylinPerformanceMisVo.getPayCountdownMinute()); tickets.setPayCountdownMinute(kylinPerformanceMisVo.getPayCountdownMinute());
tickets.setPriceExpress(new BigDecimal("0.00")); tickets.setPriceExpress(BigDecimal.ZERO);
tickets.setPriceDiscountMember(new BigDecimal("0.00")); tickets.setPriceDiscountMember(BigDecimal.ZERO);
tickets.setPriceDiscount(new BigDecimal("0.00")); tickets.setPriceDiscount(BigDecimal.ZERO);
tickets.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeStart())));
tickets.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEnd()))); tickets.setTimeStart(LocalDateTime.parse(ticketItem.getTimeStart(),DTF_YMD_HMS));
tickets.setTimeEnd(LocalDateTime.parse(ticketItem.getTimeEnd(),DTF_YMD_HMS));
if (ticketItem.getIsExpress() == 1) { if (ticketItem.getIsExpress() == 1) {
tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress()))); tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
tickets.setDescribeExpress(ticketItem.getDescribeExpress()); tickets.setDescribeExpress(ticketItem.getDescribeExpress());
}else{ } else {
tickets.setTimeEndExpress(updatedAt); tickets.setTimeEndExpress(updatedAt);
tickets.setDescribeExpress(""); tickets.setDescribeExpress("");
} }
if (ticketItem.getIsElectronic() == 1) { if (ticketItem.getIsElectronic() == 1) {
tickets.setDescribeElectronic(ticketItem.getDescribeElectronic()); tickets.setDescribeElectronic(ticketItem.getDescribeElectronic());
}else{ } else {
tickets.setDescribeElectronic(""); tickets.setDescribeElectronic("");
} }
tickets.setUseStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseStart()))); tickets.setUseStart(LocalDateTime.parse(ticketTimeItem.getUseStart(),DTF_YMD_HMS));
tickets.setUseEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseEnd()))); tickets.setUseEnd(LocalDateTime.parse(ticketTimeItem.getUseEnd(),DTF_YMD_HMS));
tickets.setSaleRemindMinute(60); tickets.setSaleRemindMinute(60);
tickets.setAdvanceMinuteMember(5); tickets.setAdvanceMinuteMember(5);
tickets.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getCreatedAt()))); tickets.setCreatedAt(LocalDateTime.parse(ticketTimeItem.getCreatedAt(),DTF_YMD_HMS));
tickets.setUpdatedAt(updatedAt); tickets.setUpdatedAt(updatedAt);
ticketStatus.setTicketStatusId(IDGenerator.nextSnowId()); ticketStatus.setTicketStatusId(IDGenerator.nextSnowId());
ticketStatus.setTicketId(tickets.getTicketsId()); ticketStatus.setTicketId(tickets.getTicketsId());
...@@ -362,8 +365,8 @@ public class PerformanceUtils { ...@@ -362,8 +365,8 @@ public class PerformanceUtils {
ticketStatus.setMemberLimitCount(1); ticketStatus.setMemberLimitCount(1);
ticketStatus.setStatusExchange(7); ticketStatus.setStatusExchange(7);
if (ticketItem.getIsShowCode() == 1) { if (ticketItem.getIsShowCode() == 1) {
ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime()))); ticketStatus.setQrCodeShowTime(LocalDateTime.parse(ticketItem.getQrCodeShowTime(),DTF_YMD_HMS));
}else{ } else {
ticketStatus.setQrCodeShowTime(updatedAt); ticketStatus.setQrCodeShowTime(updatedAt);
} }
...@@ -388,9 +391,9 @@ public class PerformanceUtils { ...@@ -388,9 +391,9 @@ public class PerformanceUtils {
KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId()); KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId());
redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo); redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo);
del9.add(new Object[]{tickets.getTicketsId()}); del9.add(new Object[]{tickets.getTicketsId()});
for (String mVo:moduleVo.getProduceCodeList()) for (String mVo : moduleVo.getProduceCodeList())
insert9.add(new Object[]{ insert9.add(new Object[]{
tickets.getTicketsId(),mVo,updatedAt,updatedAt tickets.getTicketsId(), mVo, updatedAt, updatedAt
}); });
} }
} }
...@@ -500,7 +503,7 @@ public class PerformanceUtils { ...@@ -500,7 +503,7 @@ public class PerformanceUtils {
//演出数据 //演出数据
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVoNoMerchant(performancesId); KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVoNoMerchant(performancesId);
//场地相关数据 //场地相关数据
KylinFields fields = new KylinFields(); KylinFields fields = KylinFields.getNew();
MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(vo.getFieldId()); MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(vo.getFieldId());
fields.setCityId(Integer.parseInt(fieldsVo.getCityId())); fields.setCityId(Integer.parseInt(fieldsVo.getCityId()));
fields.setLatitude(fieldsVo.getLatitude()); fields.setLatitude(fieldsVo.getLatitude());
...@@ -519,7 +522,7 @@ public class PerformanceUtils { ...@@ -519,7 +522,7 @@ public class PerformanceUtils {
int isAdvance = 0; int isAdvance = 0;
int isDiscount = 0; int isDiscount = 0;
int payCountdownMinute = 15; int payCountdownMinute = 15;
BigDecimal price = new BigDecimal("0.00"); BigDecimal price = BigDecimal.ZERO;
//场次数据 //场次数据
List<KylinTicketTimesVo> timeList = vo.getTicketTimeList(); List<KylinTicketTimesVo> timeList = vo.getTicketTimeList();
...@@ -550,7 +553,7 @@ public class PerformanceUtils { ...@@ -550,7 +553,7 @@ public class PerformanceUtils {
isLackRegister = 1; isLackRegister = 1;
} }
payCountdownMinute = vo.getPayCountdownMinute(); payCountdownMinute = vo.getPayCountdownMinute();
if (price.compareTo(new BigDecimal("0.00")) == 0) { if (price.compareTo(BigDecimal.ZERO) == 0) {
price = ticket.getPrice(); price = ticket.getPrice();
} else { } else {
if (ticket.getPrice().compareTo(price) < 0) { if (ticket.getPrice().compareTo(price) < 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment