order_ticket_entities 表 id bug

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

@@ -2,9 +2,11 @@ package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
@@ -47,6 +49,8 @@ public class PerformanceVoUtils {
     private DataUtils dataUtils;
     @Autowired
     private MongoVoUtils mongoVoUtils;
+    @Autowired
+    private RedisUtil redisUtil;
 
     @Autowired
     private KylinPerformancesMapper performancesMapper;
@@ -226,6 +230,8 @@ public class PerformanceVoUtils {
             KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
             BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
 
+            performances.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
+            performances.setCityId(Integer.parseInt((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
             performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getCreatedAt())));
             performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeStart())));
             performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeEnd())));

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -149,17 +149,16 @@
         ) AS t ON p.performances_id = t.performance_id
         LEFT JOIN(
         SELECT
-        sum(ot.number) AS 'sale_general' ,
-        sum(ot.price_actual) AS 'total_sale_price' ,
-        ote.performance_id AS 'performance_id'
+        (sum(ot.number)- sum(ot.refund_number)) AS 'sale_general' ,
+        (sum(ot.price_actual) - sum(ot.price_refund)) AS 'total_sale_price' ,
+        otr.performance_id AS 'performance_id'
         FROM
         kylin_order_tickets AS ot
         LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
-        LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
+        LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
         WHERE
-        ots.`status` = 0
-        OR ots.`status` = 1
-        GROUP BY ote.performance_id
+        ots.`status` = 1
+        GROUP BY otr.performance_id
         ) AS ot ON ot.performance_id = p.performances_id
         <where>
             <if test="title!=''">
@@ -228,17 +227,16 @@
         ) AS t ON p.performances_id = t.performance_id
         LEFT JOIN(
         SELECT
-        sum(ot.number) AS 'sale_general' ,
-        sum(ot.price_actual) AS 'total_sale_price' ,
-        ote.performance_id AS 'performance_id'
+        (sum(ot.number)- sum(ot.refund_number)) AS 'sale_general' ,
+        (sum(ot.price_actual) - sum(ot.price_refund)) AS 'total_sale_price' ,
+        otr.performance_id AS 'performance_id'
         FROM
         kylin_order_tickets AS ot
         LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
-        LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
+        LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
         WHERE
-        ots.`status` = 0
-        OR ots.`status` = 1
-        GROUP BY ote.performance_id
+        ots.`status` = 1
+        GROUP BY otr.performance_id
         ) AS ot ON ot.performance_id = p.performances_id
         <where>
             <if test="title!=''">

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

@@ -383,12 +383,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         //生成票
         KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
-        String orderTicketEntitiesId = IDGenerator.nextSnowId().toString();
         LinkedList<Object[]> sqlsDataD = null;
         sqlsDataD = new LinkedList<Object[]>();
         sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
         if (isTrueName == 1) {
             for (AdamEntersVo enters : entersVoList) {
+                String orderTicketEntitiesId = IDGenerator.nextSnowId().toString();
                 orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
                 orderTicketEntities.setOrderId(orderTicketId);
                 orderTicketEntities.setTicketId(payOrderParam.getTicketId());
@@ -424,6 +424,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
         } else {
             for (int i = 0; i < payOrderParam.getNumber(); i++) {
+                String orderTicketEntitiesId = IDGenerator.nextSnowId().toString();
                 orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
                 orderTicketEntities.setOrderId(orderTicketId);
                 orderTicketEntities.setTicketId(payOrderParam.getTicketId());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java

 package com.liquidnet.service.kylin.timerTask;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
@@ -48,6 +50,8 @@ public class PerformanceVoTask {
     @Autowired
     private DataUtils dataUtils;
     @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
     private MongoVoUtils mongoVoUtils;
 
     @Autowired
@@ -239,6 +243,8 @@ public class PerformanceVoTask {
             performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getCreatedAt())));
             performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeStart())));
             performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeEnd())));
+            performances.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
+            performances.setCityId(Integer.parseInt((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
             performances.setUpdatedAt(updatedAt);
 
             performanceStatus.setPerformanceId(performances.getPerformancesId());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/MongoVoUtils.java

@@ -55,7 +55,7 @@ public class MongoVoUtils {
             //场地相关数据
             KylinFields fields = new KylinFields();
             String cityName = (String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
-            fields.setCityId(null);
+            fields.setCityId(Integer.parseInt((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_id")));
             fields.setLatitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
             fields.setLongitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
             fields.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));