修改 提交审核

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceAdminListDao.java

@@ -14,6 +14,8 @@ public class PerformanceAdminListDao {
     private Integer status;
     private String statusName;
     private String auditTime;
+    private String timeSell;
+    private String timeStop;
     private Integer auditStatus;
     private Integer totalGeneral;
     private Integer saleGeneral;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java

@@ -16,6 +16,8 @@ public class PerformancePartnerListDao {
     private Integer surplusGeneral;
     private Integer status;
     private Integer type;
+    private String timeSell;
+    private String timeStop;
     private Integer auditStatus;
     private String rejectTxt;
     private String createdAt;

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

@@ -371,7 +371,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     performances.setAuditTime(LocalDateTime.now());
                     performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
                     KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
-                    performanceStatus.setAuditStatus((int)map.get("auditStatus"));
+                    performanceStatus.setAuditStatus((int) map.get("auditStatus"));
                     performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
 
                     //提示：票种价格、售票时间、购票限制 直接生效
@@ -483,9 +483,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     ticketStatusMapper.update(ticketStatusUpdate
                             , new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelationsItem.getTicketId()).eq("status", 7));
 
-                    HashMap<String,Object> map = new HashMap<>();
-                    map.put("status",9);
-                    map.put("updatedAt",updatedAt);
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("status", 9);
+                    map.put("updatedAt", updatedAt);
                     mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
                             Query.query(Criteria.where("ticketsId").is(ticketRelationsItem.getTicketId()).and("status").ne(7)).getQueryObject(),
                             new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
@@ -596,6 +596,16 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             try {
                 PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize());
                 List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
+                for (int i = 0; i < voList.size(); i++) {
+                    PerformancePartnerListDao vo = voList.get(i);
+                    if(vo.getStatus() >=6 || vo.getStatus()!=7){
+                        if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
+                            vo.setStatus(9);
+                        } else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
+                            vo.setStatus(10);
+                        }
+                    }
+                }
                 pageInfoTmp = new PageInfo(voList);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -651,7 +661,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         List<PerformanceOrderStatisticalDao> dtoList = performancesMapper.getPerformanceOrderStatisticalList(performancesId);
         dtoList.forEach(dto -> {
             PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
-            BeanUtil.copy(dto,vo);
+            BeanUtil.copy(dto, vo);
             voList.add(vo);
 
             countBean.setTotalGeneral(countBean.getTotalGeneral().add(dto.getTotalGeneral()));
@@ -666,7 +676,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             countBean.setTotalBuyUsers(dto.getTotalBuyUsers());
         });
         PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
-        BeanUtil.copy(countBean,vo);
+        BeanUtil.copy(countBean, vo);
         voList.add(vo);
         return voList;
     }

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

@@ -335,11 +335,17 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         }
         map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-        UpdateResult updateResult = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany(
-                Query.query(Criteria.where("timesId").is(timesId).and("status").nin(-2,7)).getQueryObject(),
+        mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany(
+                Query.query(Criteria.where("timesId").is(timesId).and("status").nin(-2, 7)).getQueryObject(),
                 object
         );
-        return updateResult.getModifiedCount() <= 0;
+
+        long count = mongoTemplate.count(
+                Query.query(Criteria.where("timesId").is(timesId)),
+                KylinTicketPartnerVo.class,
+                KylinTicketPartnerVo.class.getSimpleName()
+        );
+        return count <= 0;
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties

@@ -39,7 +39,7 @@
 20112=不可修改
 
 20113=未创建场次
-20114=有场次为创建票种
+20114=有场次未创建票种
 20115=提交失败
 20116=不可撤回
 20117=撤回失败