admin 提交

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java

 package com.liquidnet.service.kylin.dto.vo.partner;
 
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.kylin.entity.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -128,4 +130,41 @@ public class KylinTicketPartnerVo implements Serializable,Cloneable {
             return new KylinTicketPartnerVo();
         }
     }
+
+    public KylinTicketPartnerVo copy(KylinTickets t, KylinTicketStatus ts, KylinTicketRelations tr,List<ExpressModuleVo> ExpressModuleList){
+        this.ticketsId = t.getTicketsId();
+        this.title = t.getTitle();
+        this.isStudent = ts.getIsStudent();
+        this.isElectronic = ts.getIsElectronic();
+        this.isExpress = ts.getIsExpress();
+        this.type = t.getType();
+        this.price = t.getPrice();
+        this.timeEndExpress = DateUtil.Formatter.yyyyMMddHHmmss.format(t.getTimeEndExpress());
+        this.totalGeneral = ts.getTotalGeneral();
+        this.totalExchange = ts.getTotalExchange();
+        this.limitCount = ts.getLimitCount();
+        this.counts = ts.getCounts();
+        this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(t.getTimeStart());
+        this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(t.getTimeEnd());
+        this.useStart = DateUtil.Formatter.yyyyMMddHHmmss.format(t.getUseStart());
+        this.useEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(t.getUseEnd());
+        this.describes = t.getDescribes();
+        this.describeExpress = t.getDescribeExpress();
+        this.describeElectronic = t.getDescribeElectronic();
+        this.status = ts.getStatus();
+        this.isShowCode = ts.getIsShowCode();
+        this.qrCodeShowTime = DateUtil.Formatter.yyyyMMddHHmmss.format(ts.getQrCodeShowTime());
+        this.timesId = tr.getTimesId();
+        this.isLackRegister = ts.getIsLackRegister();
+        this.surplusGeneral = ts.getSurplusGeneral();
+        this.surplusExchange = ts.getSurplusExchange();
+        this.expressType = ts.getExpressType();
+        this.isTransfer = ts.getIsTransfer();
+        this.isMember = ts.getIsMember();
+        this.isExclusive = ts.getIsExclusive();
+        this.ExpressModuleList = ExpressModuleList;
+        this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(t.getCreatedAt()));
+        this.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(t.getUpdatedAt()));
+        return this;
+    }
 }

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

@@ -196,8 +196,11 @@ public class PerformanceVoUtils {
     public KylinPerformanceMisVo getPerformanceMisVo(String performancesId) {
         PerformancePartnerVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
         List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = getTimesMongoList(performancesId);
-        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
+        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList();
 
+        if (!performanceData.getAuditStatus().equals(0)) {
+            return getPerformanceMisDB(performancesId);
+        }
         ArrayList<BigDecimal> floatList = new ArrayList<>();
         ArrayList<String> StringList = new ArrayList<>();
 
@@ -242,8 +245,9 @@ public class PerformanceVoUtils {
         KylinPerformances performances = performancesMapper.selectOne(Wrappers.lambdaQuery(KylinPerformances.class).eq(KylinPerformances::getPerformancesId, performancesId));
         KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
         KylinPerformanceRelations performanceRelations = performanceRelationsMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getPerformanceId, performancesId));
+        MerchantFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
         PerformancePartnerVo performanceData = PerformancePartnerVo.getNew().copy(performances, performanceStatus, performanceRelations,
-                (String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "name"));
+                fieldsVo.getName());
 
         List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = new ArrayList();
         ArrayList<BigDecimal> floatList = new ArrayList<>();
@@ -252,14 +256,20 @@ public class PerformanceVoUtils {
         List<KylinTicketTimeRelation> ticketTimeRelationsList = ticketTimeRelationMapper.selectList(Wrappers.lambdaQuery(KylinTicketTimeRelation.class).eq(KylinTicketTimeRelation::getPerformanceId, performancesId));
         for (KylinTicketTimeRelation item : ticketTimeRelationsList) {
             KylinTicketTimes ticketTimes = ticketTimesMapper.selectOne(Wrappers.lambdaQuery(KylinTicketTimes.class).eq(KylinTicketTimes::getTicketTimesId, item.getTimesId()));
-            kylinTicketTimesPartnerVos.add(KylinTicketTimesPartnerVo.getNew().copy(ticketTimes,item));
+            kylinTicketTimesPartnerVos.add(KylinTicketTimesPartnerVo.getNew().copy(ticketTimes, item));
         }
 
         for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) {
-            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
+            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew();
             BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
+            List<KylinTicketRelations> ticketRelationsList = ticketRelationsMapper.selectList(Wrappers.lambdaQuery(KylinTicketRelations.class).eq(KylinTicketRelations::getTimesId, ticketTimes.getTicketTimesId()));
+            List<KylinTicketPartnerVo> kylinTicketPartnerVos = new ArrayList();
+            for (KylinTicketRelations item : ticketRelationsList) {
+                KylinTickets tickets = ticketsMapper.selectOne(Wrappers.lambdaQuery(KylinTickets.class).eq(KylinTickets::getTicketsId, item.getTicketId()));
+                KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, item.getTicketId()));
+                kylinTicketPartnerVos.add(KylinTicketPartnerVo.getNew().copy(tickets, ticketStatus, item, dataUtils.getTEMVo(item.getTicketId()).getProduceCodeList()));
+            }
 
-            List<KylinTicketPartnerVo> kylinTicketPartnerVos = getTicketMongoList(ticketTimes.getTicketTimesId());
             ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos);
             ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
             for (KylinTicketPartnerVo kylinTicketPartnerVoItem : kylinTicketPartnerVos) {