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

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

提交复制演出

parent 97f65ae8
...@@ -14,6 +14,7 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam; ...@@ -14,6 +14,7 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo; import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param; import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param; import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo; import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; 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.middle.KylinTicketVo;
...@@ -26,6 +27,7 @@ import com.liquidnet.service.merchant.constant.MerchantAuthorizationConst; ...@@ -26,6 +27,7 @@ import com.liquidnet.service.merchant.constant.MerchantAuthorizationConst;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo; import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.util.*; import com.liquidnet.service.merchant.util.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.util.DataUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
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.PageRequest;
...@@ -37,6 +39,7 @@ import org.springframework.stereotype.Service; ...@@ -37,6 +39,7 @@ 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;
...@@ -416,7 +419,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -416,7 +419,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMMerchantVo(ticketItem.getTicketsId()); KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMMerchantVo(ticketItem.getTicketsId());
if (moduleVo != null) { if (moduleVo != null) {
redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo); redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
sqlsDataE.add(new Object[]{ticketItem.getTicketsId(),now}); sqlsDataE.add(new Object[]{ticketItem.getTicketsId(), now});
for (ExpressModuleVo mVo : moduleVo.getProduceCodeList()) for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
sqlsDataF.add(new Object[]{ sqlsDataF.add(new Object[]{
ticketItem.getTicketsId(), mVo.getProductCode(), now, now ticketItem.getTicketsId(), mVo.getProductCode(), now, now
...@@ -464,13 +467,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -464,13 +467,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew(); 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());
for(KylinTicketPartnerVo item : kylinTicketPartnerVos){ for (KylinTicketPartnerVo item : kylinTicketPartnerVos) {
if(item.getIsExpress()==1) { if (item.getIsExpress() == 1) {
KylinTicketExpressModuleVo vo = redisMerchantUtils.getTEMMerchantVo(item.getTicketsId()); KylinTicketExpressModuleVo vo = redisMerchantUtils.getTEMMerchantVo(item.getTicketsId());
if(vo!=null) { if (vo != null) {
List<ExpressModuleVo> expressModuleVos = vo.getProduceCodeList(); List<ExpressModuleVo> expressModuleVos = vo.getProduceCodeList();
item.setExpressModuleList(expressModuleVos); item.setExpressModuleList(expressModuleVos);
}else{ } else {
item.setExpressModuleList(null); item.setExpressModuleList(null);
} }
} }
...@@ -615,9 +618,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -615,9 +618,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
List<KylinTicketPartnerVo> kylinTicketPartnerVos = mongoMerchantUtils.getTicketPartnerVoList(timesId); List<KylinTicketPartnerVo> kylinTicketPartnerVos = mongoMerchantUtils.getTicketPartnerVoList(timesId);
for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVos) { for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVos) {
//复制票 //复制票
String ticketsIdNew = IDGenerator.nextSnowId();
ticketItem.setStatus(0); ticketItem.setStatus(0);
ticketItem.setTimesId(timeItem.getTicketTimesId()); ticketItem.setTimesId(timeItem.getTicketTimesId());
ticketItem.setTicketsId(IDGenerator.nextSnowId()); ticketItem.setTicketsId(ticketsIdNew);
redisMerchantUtils.setTEMMerchantVo(ticketsIdNew, redisMerchantUtils.getTEMMerchantVo(ticketItem.getTicketsId()));
mongoMerchantUtils.insertTicketPartnerVo(ticketItem); mongoMerchantUtils.insertTicketPartnerVo(ticketItem);
} }
} }
...@@ -764,4 +769,5 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -764,4 +769,5 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
// voList.add(vo); // voList.add(vo);
return null; return null;
} }
} }
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