Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -16,6 +16,7 @@ public class AdamRedisConst {
     public static final String INFO_THIRD_PARTY = INFO.concat("third_party:");
     public static final String INFO_ENTERS = INFO.concat("enters:");
     public static final String INFO_ADDRESSES = INFO.concat("addresses:");
+    public static final String INFO_CERTIFICATION = INFO.concat("certification:");
 
     public static final String INFO_MEMBER_SIMPLE = INFO.concat("member:simple");
     public static final String INFO_MEMBER_CATEGORY = INFO.concat("member:category:");

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java

@@ -28,7 +28,9 @@ public interface IAdamRdmService {
 
     AdamRealInfoVo getRealInfoVoByUid(String uid);
 
-    void delRealInfoVoByUid(String uid);
+    boolean setCertification(int idType, String idNo, String idName);
+
+    boolean isCertification(int idType, String idNo, String idName);
 
     boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList);
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

@@ -46,6 +46,9 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
     //TASK 订单状态
     ResponseDto<Integer> checkOrderResult(String orderId);
 
+    //TASK 订单状态
+    ResponseDto<Integer> orderUnPayCount();
+
 
     // 下单接口(无订单->待支付->可支付)
     // 删除订单

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
@@ -205,8 +206,20 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         try {
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
+
+
+
             for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
+                if(item.getStatus() >=6 && item.getStatus()!=7){
+                    if (DateUtil.compareStrDay(item.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
+                        item.setStatus(9);
+                    } else if (DateUtil.compareStrDay(item.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
+                        item.setStatus(10);
+                    }else{
+                        item.setStatus(6);
+                    }
+                }
                 newList.add(item);
             }
         } catch (Exception e) {

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

@@ -93,10 +93,10 @@ public class MongoVoUtils {
                     ticketList.add(kylinTicketVo);
 
                     //票种 库存redis
-                    if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
-                        dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral());
-                        dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange());
-                    }
+//                    if (!redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
+//                        dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral());
+//                        dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange());
+//                    }
 
                     if (kylinTicketVo.getIsMember() == 1) {
                         if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) {

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

@@ -292,6 +292,15 @@ public class PerformanceVoUtils {
                     ticketTimes.setStatus(1);
                     ticketTimesMapper.insert(ticketTimes);
                     ticketTimeRelationMapper.insert(ticketTimeRelation);
+
+                    HashMap<String ,Object> map2 = new HashMap<>();
+                    map2.put("status",1);
+                    map2.put("updatedAt",map.get("updatedAt"));
+                    BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map2));
+                    mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
+                            Query.query(Criteria.where("ticketTimesId").is(ticketTimeRelation.getTimesId())).getQueryObject(),
+                            objectTicketVo
+                    );
                 } else {
                     ticketTimesMapper.update(ticketTimes, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimes.getTicketTimesId()));
                     ticketTimeRelationMapper.update(ticketTimeRelation, new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimes.getTicketTimesId()));

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

@@ -2,6 +2,8 @@ package com.liquidnet.service.kylin.dao;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class PerformanceAdminListDao {
 
@@ -14,10 +16,12 @@ 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;
-    private Integer totalSalePrice;
+    private BigDecimal totalSalePrice;
     private Integer surplusGeneral;
     private Integer syncDamai;
     private String rejectTxt;

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

@@ -2,6 +2,8 @@ package com.liquidnet.service.kylin.dao;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class PerformancePartnerListDao {
 
@@ -12,10 +14,12 @@ public class PerformancePartnerListDao {
     private String timeEnd;
     private Integer totalGeneral;
     private Integer saleGeneral;
-    private Integer totalSalePrice;
+    private BigDecimal totalSalePrice;
     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-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -11,6 +11,8 @@
         <result column="sale_general" property="saleGeneral"/>
         <result column="total_sale_price" property="totalSalePrice"/>
         <result column="surplus_general" property="surplusGeneral"/>
+        <result column="time_sell" property="timeSell"/>
+        <result column="time_stop" property="timeStop"/>
         <result column="status" property="status"/>
         <result column="type" property="type"/>
         <result column="sort" property="sort"/>
@@ -29,6 +31,8 @@
         <result column="total_sale_price" property="totalSalePrice"/>
         <result column="surplus_general" property="surplusGeneral"/>
         <result column="status" property="status"/>
+        <result column="time_sell" property="timeSell"/>
+        <result column="time_stop" property="timeStop"/>
         <result column="audit_status" property="auditStatus"/>
         <result column="reject_txt" property="rejectTxt"/>
         <result column="sort" property="sort"/>
@@ -50,7 +54,6 @@
     </resultMap>
 
 
-
     <resultMap id="PerformanceRecommendAdminDaoResult"
                type="com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao">
         <result column="performances_id" property="performancesId"/>
@@ -74,7 +77,8 @@
         <result column="is_exclusive" property="isExclusive"/>
     </resultMap>
 
-    <resultMap id="performanceOrderStatisticalDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao">
+    <resultMap id="performanceOrderStatisticalDaoResult"
+               type="com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao">
         <result column="performances_id" property="performancesId"/>
         <result column="tickets_id" property="ticketsId"/>
         <result column="title" property="title"/>
@@ -123,6 +127,8 @@
         p.title ,
         p.time_start ,
         p.time_end ,
+        t.time_sell ,
+        t.time_stop ,
         IFNULL(t.total_general , 0) AS 'total_general' ,
         IFNULL(ot.sale_general , 0) AS 'sale_general' ,
         IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
@@ -130,10 +136,10 @@
         (
         t.total_general - ot.sale_general
         ) ,
-        0
+        t.total_general
         ) AS 'surplus_general' ,
         ps.`status` ,
-        p.type,
+        p.type ,
         ps.audit_status ,
         p.reject_txt ,
         p.created_at
@@ -144,26 +150,32 @@
         LEFT JOIN(
         SELECT
         ttr.performance_id ,
-        ts.ticket_id ,
-        sum(ts.total_general) AS 'total_general'
+        sum(ts.total_general) AS 'total_general' ,
+        MIN(
+        DATE_SUB(
+        t.time_start ,
+        INTERVAL  pay_countdown_minute MINUTE
+        )
+        ) AS 'time_sell' ,
+        MAX(t.time_end) AS 'time_stop'
         FROM
         kylin_ticket_status AS ts
         LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+        LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
         LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
-        GROUP BY ttr.performance_id
+        GROUP BY
+        ttr.performance_id
         ) AS t ON p.performances_id = t.performance_id
         LEFT JOIN(
-        SELECT
-        (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_relations AS otr ON otr.order_id = ot.order_tickets_id
-        WHERE
-        ots.`status` = 1 and coupon_type ='no'
-        GROUP BY otr.performance_id
+        SELECT(
+        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_relations AS otr ON otr.order_id =
+        ot.order_tickets_id WHERE ots.`status` = 1 AND coupon_type = 'no' GROUP BY otr.performance_id
         ) AS ot ON ot.performance_id = p.performances_id
         <where>
             <if test="title!=''">
@@ -202,6 +214,8 @@
         p.time_start ,
         p.time_end ,
         ps.sync_damai ,
+        t.time_sell,
+        t.time_stop,
         IFNULL(t.total_general , 0) AS 'total_general' ,
         IFNULL(ot.sale_general , 0) AS 'sale_general' ,
         IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
@@ -209,7 +223,7 @@
         (
         t.total_general - ot.sale_general
         ) ,
-        0
+        t.total_general
         ) AS 'surplus_general' ,
         ps.`status` ,
         ps.audit_status ,
@@ -222,13 +236,21 @@
         LEFT JOIN(
         SELECT
         ttr.performance_id ,
-        ts.ticket_id ,
-        sum(ts.total_general) AS 'total_general'
+        sum(ts.total_general) AS 'total_general' ,
+        MIN(
+        DATE_SUB(
+        t.time_start ,
+        INTERVAL  pay_countdown_minute MINUTE
+        )
+        ) AS 'time_sell' ,
+        MAX(t.time_end) AS 'time_stop'
         FROM
         kylin_ticket_status AS ts
         LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+        LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
         LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
-        GROUP BY ttr.performance_id
+        GROUP BY
+        ttr.performance_id
         ) AS t ON p.performances_id = t.performance_id
         LEFT JOIN(
         SELECT
@@ -259,9 +281,9 @@
             <if test="auditStatus!='-2'">
                 AND ps.audit_status = #{auditStatus}
             </if>
-<!--            <if test="auditStatus=='-2'">-->
-<!--                AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
-<!--            </if>-->
+            <!--            <if test="auditStatus=='-2'">-->
+            <!--                AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
+            <!--            </if>-->
             <if test="stopSellDay!=-2">
                 AND p.time_end BETWEEN #{stopSellTime} AND NOW()
             </if>
@@ -361,57 +383,56 @@
 
     </select>
     <!-- 演出订单统计-->
-    <select id="getPerformanceOrderStatisticalList" parameterType="java.lang.String" resultMap="performanceOrderStatisticalDaoResult">
-        SELECT
-            kp.performances_id ,
+    <select id="getPerformanceOrderStatisticalList" parameterType="java.lang.String"
+            resultMap="performanceOrderStatisticalDaoResult">
+        SELECT kp.performances_id,
                kt.tickets_id,
                kt.title,
                kt.price,
                kt.type,
                kt.use_start,
-            IFNULL(kts.total_general , 0) AS 'total_general' ,
-            IFNULL(ot.total_sale_general , 0) AS 'sale_general' ,
-            IFNULL((kts.total_general - ot.total_sale_general),0) AS 'surplus_general',
-            IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
-            IFNULL(kts.total_exchange , 0) AS 'total_exchange',
-            IFNULL(ot.total_refund_general , 0) AS 'total_refund_general',
-            IFNULL(ot.total_refund_price , 0) AS 'total_refund_price',
-            IFNULL(ot.total_member_number , 0) AS 'total_member_number',
-            IFNULL(ot.total_paying_number , 0) AS 'total_paying_number',
-            IFNULL(ut.total_buy_users , 0) AS 'total_buy_users'
-        FROM
-            (select t.performances_id from kylin_performances t where t.performances_id = ${performancesId}) AS kp
+               IFNULL(kts.total_general, 0)                           AS 'total_general',
+               IFNULL(ot.total_sale_general, 0)                       AS 'sale_general',
+               IFNULL((kts.total_general - ot.total_sale_general), 0) AS 'surplus_general',
+               IFNULL(ot.total_sale_price, 0)                         AS 'total_sale_price',
+               IFNULL(kts.total_exchange, 0)                          AS 'total_exchange',
+               IFNULL(ot.total_refund_general, 0)                     AS 'total_refund_general',
+               IFNULL(ot.total_refund_price, 0)                       AS 'total_refund_price',
+               IFNULL(ot.total_member_number, 0)                      AS 'total_member_number',
+               IFNULL(ot.total_paying_number, 0)                      AS 'total_paying_number',
+               IFNULL(ut.total_buy_users, 0)                          AS 'total_buy_users'
+        FROM (select t.performances_id from kylin_performances t where t.performances_id = ${performancesId}) AS kp
                  inner JOIN(
-                SELECT
-                    kotr.performance_id AS 'performance_id',
+            SELECT kotr.performance_id                             AS           'performance_id',
                    kotr.ticket_id,
-                    (sum(kot.number)- sum(kot.refund_number)) AS 'total_sale_general' ,
+                   (sum(kot.number) - sum(kot.refund_number))      AS           'total_sale_general',
                    (sum(kot.price_actual) - sum(kot.price_refund)) AS           'total_sale_price',
                    sum(kot.refund_number)                          as           'total_refund_general',
                    sum(kot.price_refund)                           as           'total_refund_price',
                    sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number,
                    sum(case when kots.`status` = 0 then kot.number else 0 end)  total_paying_number
-                FROM
-                    kylin_order_ticket_relations kotr
+            FROM kylin_order_ticket_relations kotr
                      inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                      inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
-                WHERE 1>0 and kotr.performance_id = ${performancesId}
-                  and kots.`status` in(1,3,4) and kot.coupon_type ='no'
-                group by kotr.performance_id,kotr.ticket_id
+            WHERE 1 > 0
+              and kotr.performance_id = ${performancesId}
+              and kots.`status` in (1, 3, 4)
+              and kot.coupon_type = 'no'
+            group by kotr.performance_id, kotr.ticket_id
         ) AS ot ON ot.performance_id = kp.performances_id
                  inner join kylin_tickets kt on kt.tickets_id = ot.ticket_id
                  inner join kylin_ticket_status kts on kts.ticket_id = kt.tickets_id
                  inner JOIN(
-                select t.performance_id,count(t.user_id) as 'total_buy_users' from(
-                                                                                      SELECT
-                                                                                          kotr.performance_id,
+            select t.performance_id, count(t.user_id) as 'total_buy_users'
+            from (
+                     SELECT kotr.performance_id,
                             kot.user_id
-                                                                                      FROM
-                                                                                          kylin_order_ticket_relations kotr
+                     FROM kylin_order_ticket_relations kotr
                               inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                               inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
-                                                                                      WHERE kotr.performance_id = ${performancesId} and (kots.`status` = 0 OR kots.`status` = 1)
-                                                                                      group by kotr.performance_id,kot.user_id
+                     WHERE kotr.performance_id = ${performancesId}
+                       and (kots.`status` = 0 OR kots.`status` = 1)
+                     group by kotr.performance_id, kot.user_id
                  ) t
         ) AS ut ON ut.performance_id = kp.performances_id
     </select>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.DeleteResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -184,13 +185,10 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 //        removeVo.setDeletedAt(now);
 
         long s = System.currentTimeMillis();
-        Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("addressesId").is(addressesId)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
         );
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        if (null != doc) {
         List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
         vos.removeIf(r -> r.getAddressesId().equals(addressesId));
         s = System.currentTimeMillis();
@@ -203,7 +201,6 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
     }
-    }
 
     @Override
     public AdamAddressesVo queryDefault(String uid) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.DeleteResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
@@ -19,12 +20,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
@@ -65,26 +63,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
 
         if (1 == parameter.getType()) {
-            LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-            paramsMap.add("realName", parameter.getName());
-            paramsMap.add("cardNo", parameter.getIdCard());
-
-            String respStr = null;
-            try {
-                long s = System.currentTimeMillis();
-                respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
-                log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
-                log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
-                Map respMap = JsonUtils.fromJson(respStr, Map.class);
-                if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
-                    log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr);
-                    ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-                    throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-                }
-            } catch (Exception e) {
-                log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr, e);
-                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
             }
         }
 
@@ -105,6 +85,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
         s = System.currentTimeMillis();
         adamRdmService.delEntersVoByUid(currentUid);
+        if (1 == parameter.getType()) {
+            adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+        }
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
         s = System.currentTimeMillis();
@@ -178,9 +161,18 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamEntersParam parameter) {
         LocalDateTime now = LocalDateTime.now();
+        String currentUid = CurrentUtil.getCurrentUid();
+
+
+        if (1 == parameter.getType()) {
+            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
+            }
+        }
+
 
         AdamEntersVo updateVo = AdamEntersVo.getNew();
         BeanUtils.copyProperties(parameter, updateVo);
@@ -194,10 +186,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         if (null != doc) {
             updateVo = BsonUtil.toBean(doc, AdamEntersVo.class);
 
-            String currentUid = CurrentUtil.getCurrentUid();
             List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
             s = System.currentTimeMillis();
             adamRdmService.setEntersVoByUid(currentUid, this.collectionProcess(vos, parameter.getEntersId(), updateVo));
+            if (1 == parameter.getType()) {
+                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+            }
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
             s = System.currentTimeMillis();
@@ -211,24 +205,14 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void remove(String uid, String entersId) {
         LocalDateTime now = LocalDateTime.now();
-
-//        AdamEntersVo removeVo = AdamEntersVo.getNew();
-//        removeVo.setState(2);
-//        removeVo.setIsDefault(false);
-//        removeVo.setUpdatedAt(now);
-//        removeVo.setDeletedAt(now);
-
         long s = System.currentTimeMillis();
-        Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("entersId").is(entersId)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("entersId").is(entersId)), AdamEntersVo.class.getSimpleName()
         );
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        if (null != doc) {
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
         vos.removeIf(r -> r.getEntersId().equals(entersId));
         s = System.currentTimeMillis();
@@ -241,7 +225,6 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
     }
-    }
 
     @Override
     public AdamEntersVo queryDefault(String uid) {
@@ -286,4 +269,28 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         log.debug("#collect.process耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
+
+    private void identityHandler(String currentUid, String name, String idCard) {
+        String respStr = null;
+        try {
+            LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+            paramsMap.add("realName", name);
+            paramsMap.add("cardNo", idCard);
+
+            long s = System.currentTimeMillis();
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
+            log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
+            log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
+            Map respMap = JsonUtils.fromJson(respStr, Map.class);
+            if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
+                log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", currentUid, name, idCard, respStr);
+                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            }
+        } catch (Exception e) {
+            log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", currentUid, name, idCard, respStr, e);
+            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -232,6 +232,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
                         new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
                 );
                 log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
+                existUserMemberVo.setState(1);
                 existUserMemberVo.setExpiryAt(expiryAt);
                 s = System.currentTimeMillis();
                 adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), existUserMemberVo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java

@@ -143,8 +143,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public void delRealInfoVoByUid(String uid) {
-        redisUtil.del(AdamRedisConst.INFO_REAL_NAME.concat(uid));
+    public boolean setCertification(int idType, String idNo, String idName) {
+        return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName);
+    }
+
+    @Override
+    public boolean isCertification(int idType, String idNo, String idName) {
+        String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION + idType + idNo);
+        return !StringUtils.isEmpty(o) && o.equals(idName);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -366,12 +366,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
         if (RedisLockUtil.tryLock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid, 1, 3)) {
             vo = adamRdmService.getRealInfoVoByUid(uid);
             if (null == vo) {
+                if (!adamRdmService.isCertification(1, idCard, name)) {
+                    String respStr = null;
+                    try {
                         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
                         paramsMap.add("realName", name);
                         paramsMap.add("cardNo", idCard);
-
-                String respStr = null;
-                try {
                         long s = System.currentTimeMillis();
                         respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
                         log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
@@ -387,6 +387,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                         ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
                         throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
                     }
+                }
 
                 AdamRealName realName = new AdamRealName();
                 realName.setRealNameId(IDGenerator.nextSnowId() + "");
@@ -407,6 +408,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
                 long s = System.currentTimeMillis();
                 adamRdmService.setRealInfoVoByUid(uid, vo);
+                adamRdmService.setCertification(1, idCard, name);
                 log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
             }
             RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid);

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

@@ -54,9 +54,9 @@ public class KylinOrderTicketsController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
         PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
-        if(null==vo){
+        if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
-        }else{
+        } else {
             return ResponseDto.success(vo);
         }
     }
@@ -78,11 +78,11 @@ public class KylinOrderTicketsController {
     @GetMapping("details")
     @ApiOperation("订单详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId",required = false) @NotNull(message = "订单id不能为空") String orderId) {
+    public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
         OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
-        if(null==vo){
+        if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
-        }else {
+        } else {
             return ResponseDto.success(vo);
         }
     }
@@ -92,15 +92,24 @@ public class KylinOrderTicketsController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
         Integer status = orderTicketsService.checkOrderResult(orderId).getData();
-        if(null==status){
+        if (null == status) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
-        }else {
-            HashMap<String,Integer> map = new HashMap<>();
-            map.put("status",status);
+        } else {
+            HashMap<String, Integer> map = new HashMap<>();
+            map.put("status", status);
             return ResponseDto.success(map);
         }
     }
 
+    @GetMapping("orderUnPayCount")
+    @ApiOperation("待支付演出订单数量")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<HashMap> orderUnPayCount() {
+        Integer unPayCount = orderTicketsService.orderUnPayCount().getData();
+        HashMap<String, Integer> map = new HashMap<>();
+        map.put("unPayCount", unPayCount);
+        return ResponseDto.success(map);
+    }
 
 
     @PostMapping("checkOrderTime")

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

@@ -197,6 +197,12 @@ public class DataImpl {
                         performancePartnerVo.setDetails(performances.getDetails());
                         performancePartnerVo.setApprovalUrl(performances.getApprovalUrl());
                         performancePartnerVo.setPayCountdownMinute(5);
+                        performancePartnerVo.setNoticeIds(new ArrayList<String>(){{
+                            add("1");
+                            add("3");
+                            add("7");
+                            add("12");
+                        }});
                         performancePartnerVo.setNoticeImage(performances.getNoticeImage());
                         performancePartnerVo.setIsTrueName(performanceStatus.getIsTrueName());
                         performancePartnerVo.setLimitCount(performanceStatus.getLimitCount());

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

@@ -29,6 +29,7 @@ import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
+import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.kylin.utils.*;
@@ -104,6 +105,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     private TaobaoTicketUtils taobaoTicketUtils;
     @Autowired
     private KylinOrderTicketsMapper orderTicketsMapper;
+    @Autowired
+    private OrderRefundsCallbackServiceImpl orderRefundsCallbackService;
 
     ArrayList<Integer> canBuyStatus = new ArrayList() {{
         add(6);
@@ -290,12 +293,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 }
 
                 //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
-                Query queryPerformance = new Query();
-                Query queryTicket = new Query();
-                queryPerformance.addCriteria(Criteria.where("performanceId").is(payOrderParam.getPerformanceId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
-                queryTicket.addCriteria(Criteria.where("ticketId").is(payOrderParam.getTicketId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
-
-
                 if (entersVoList.size() > 0) {
                     currentTime = System.currentTimeMillis();
                     for (int i = 0; i < entersVoList.size(); i++) {
@@ -779,10 +776,18 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
 
         LinkedList<String> sqls = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataB = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataC = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataD = new LinkedList<>();
+
         LocalDateTime strTime = orderTicketData.getChangeDate();
 
-        //sql
         KylinOrderTickets orderTickets = new KylinOrderTickets();
+        KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
+        KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
+
+        if(orderTicketData.getStatus()==0){
             orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
             orderTickets.setPaymentType(syncOrderParam.getPayment_type());
             orderTickets.setPayCode(syncOrderParam.getCode());
@@ -790,31 +795,24 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderTickets.setQrCode(IDGenerator.ticketQrCode(orderTicketData.getOrderTicketsId()));
             orderTickets.setUpdatedAt(now);
             sqls.add(SqlMapping.get("kylin_order_ticket.synPay"));
-        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
             sqlsDataA.add(orderTickets.getSynOrderObject(strTime, strTime));
 
-        KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
             orderTicketStatus.setOrderId(orderTicketData.getOrderTicketsId());
             orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS1);
             orderTicketStatus.setPayStatus(syncOrderParam.getStatus());
             orderTicketStatus.setUpdatedAt(orderTickets.getUpdatedAt());
             sqls.add(SqlMapping.get("kylin_order_ticket_status.synPay"));
-        LinkedList<Object[]> sqlsDataB = new LinkedList<>();
             sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
 
             sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
-        LinkedList<Object[]> sqlsDataC = new LinkedList<>();
             sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
-        KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
             orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
             orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
             orderTicketEntities.setUpdatedAt(orderTickets.getUpdatedAt());
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.synPay"));
-        LinkedList<Object[]> sqlsDataD = new LinkedList<>();
             sqlsDataD.add(orderTicketEntities.getSynOrderObject(strTime, strTime));
 
-
             //vo
             HashMap<String, Object> orderTicketVo = new HashMap<>();
             orderTicketVo.put("paymentType", orderTickets.getPaymentType());
@@ -883,6 +881,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
             // 大麦回调
             sycDamaiOrder(orderTickets.getOrderTicketsId());
+        }else{
+             orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
+        }
         redisLockUtil.unlock(lock);
         return "success";
     }
@@ -1126,6 +1127,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
     }
 
+    @Override
+    public ResponseDto<Integer> orderUnPayCount() {
+        String uid = CurrentUtil.getCurrentUid();
+        List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
+        Integer unPayCount = 0;
+        for (KylinOrderListVo item : voList ){
+            if(item.getStatus()==0){
+                unPayCount+=1;
+            }
+
+        }
+        return ResponseDto.success(unPayCount);
+    }
+
     public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
         boolean isAgent = ticketData.getIsAgent() == 1;
         if (isAgent) {

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

@@ -17,6 +17,7 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
@@ -25,6 +26,8 @@ import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerServ
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import com.mongodb.BasicDBObject;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.ReturnDocument;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -201,6 +204,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             }
             return performanceId;
         } catch (Exception e) {
+            e.printStackTrace();
             return null;
         }
     }
@@ -368,7 +372,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));
 
                     //提示：票种价格、售票时间、购票限制 直接生效
@@ -377,10 +381,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         List<KylinTicketPartnerVo> ticketList = timesItem.getTicket();
                         for (KylinTicketPartnerVo ticketItem : ticketList) {
                             //修改 redis库存
-                            if (redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
+                            if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
                                 KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
-                                int changeGeneral = ticketStatus.getTotalGeneral() - ticketItem.getTotalGeneral();
-                                int changeExchange = ticketStatus.getTotalGeneral() - ticketItem.getTotalExchange();
+                                int changeGeneral = ticketItem.getTotalGeneral() - ticketStatus.getTotalGeneral();
+                                int changeExchange = ticketItem.getTotalExchange() - ticketStatus.getTotalGeneral();
                                 dataUtils.changeSurplusGeneral(ticketItem.getTicketsId(), changeGeneral);
                                 dataUtils.changeSurplusExchange(ticketItem.getTicketsId(), changeExchange);
                             }
@@ -479,6 +483,14 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     ticketStatusUpdate.setUpdatedAt(updatedAt);
                     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);
+                    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))
+                    );
                 }
             }
 //            判断状态
@@ -585,6 +597,18 @@ 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);
+                        } else {
+                            vo.setStatus(6);
+                        }
+                    }
+                }
                 pageInfoTmp = new PageInfo(voList);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -640,7 +664,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()));
@@ -655,7 +679,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

@@ -116,14 +116,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
             kylinTicketPartnerVo.setStatus(0);
             kylinTicketPartnerVo.setDefault();
-            if(ticketCreateParam.getIsExpress()==1){
+            if (ticketCreateParam.getIsExpress() == 1) {
                 kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
-            }else{
+            } else {
                 kylinTicketPartnerVo.setDescribesExpress("");
             }
-            if(ticketCreateParam.getIsElectronic()==1){
+            if (ticketCreateParam.getIsElectronic() == 1) {
                 kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
-            }else{
+            } else {
                 kylinTicketPartnerVo.setDescribeElectronic("");
             }
 
@@ -166,14 +166,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setUseStart(kylinTicketTimesPartnerVo.getUseStart());
             kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
             kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
-            if(ticketCreateParam.getIsExpress()==1){
+            if (ticketCreateParam.getIsExpress() == 1) {
                 kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
-            }else{
+            } else {
                 kylinTicketPartnerVo.setDescribesExpress("");
             }
-            if(ticketCreateParam.getIsElectronic()==1){
+            if (ticketCreateParam.getIsElectronic() == 1) {
                 kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
-            }else{
+            } else {
                 kylinTicketPartnerVo.setDescribeElectronic("");
             }
 
@@ -221,10 +221,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             kylinTicketPartnerVo.setTimesId(null);
             kylinTicketPartnerVo.setStatus(null);
-            if(ticketCreateParam.getIsExpress()==1){
+            if (ticketCreateParam.getIsExpress() == 1) {
                 kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
             }
-            if(ticketCreateParam.getIsElectronic()==1){
+            if (ticketCreateParam.getIsElectronic() == 1) {
                 kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
             }
 
@@ -299,13 +299,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     }
 
     @Override
-    public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId) {
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId, String ticketsId) {
         try {
             // 获取 当前时间 -> 创建时间
             LocalDateTime createdAt = LocalDateTime.now();
 
             PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
-            if(performancePartnerVo.getAuditStatus()==0 || performancePartnerVo.getAuditStatus()==1){
+            if (performancePartnerVo.getAuditStatus() == 0 || performancePartnerVo.getAuditStatus() == 1) {
                 return ResponseDto.failure(ErrorMapping.get(20107));
             }
 
@@ -324,22 +324,28 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     }
 
     @Override
-    public boolean submitTicketByTimes(String timesId,Integer status) {
+    public boolean submitTicketByTimes(String timesId, Integer status) {
         LocalDateTime updatedAt = LocalDateTime.now();
 
         HashMap<String, Object> map = new HashMap<>();
-        if(null==status) {
+        if (null == status) {
             map.put("status", 1);
-        }else{
+        } else {
             map.put("status", status);
         }
         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").ne(-2)).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
@@ -353,7 +359,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     }
 
     @Override
-    public ResponseDto<String> onLine(String ticketsId,String performancesId) {
+    public ResponseDto<String> onLine(String ticketsId, String performancesId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
             KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
@@ -365,8 +371,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                 ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
 
 
-                HashMap<String,Object> map = new HashMap<>();
-                map.put("status",9);
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("status", 9);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                 mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
@@ -378,14 +384,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20110));
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20108));
         }
     }
 
     @Override
-    public ResponseDto<String> outLine(String ticketsId,String performancesId) {
+    public ResponseDto<String> outLine(String ticketsId, String performancesId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
             KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
@@ -396,8 +402,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                 changeStatus.setStatus(7);
                 ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
                 // mongo 操作
-                HashMap<String,Object> map = new HashMap<>();
-                map.put("status",7);
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("status", 7);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                 mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
@@ -409,7 +415,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20111));
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20109));
         }

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

@@ -194,6 +194,7 @@ public class PerformanceVoTask {
      * @return
      */
     public KylinPerformanceMisVo getPerformanceMisVo(String performancesId) {
+        try {
             PerformancePartnerVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
             List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
@@ -227,6 +228,10 @@ public class PerformanceVoTask {
             kylinPerformanceMisVo.setAuditStatus(0);
 
             return kylinPerformanceMisVo;
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
     }
 
     /**

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

@@ -88,6 +88,9 @@ public class MongoVoUtils {
                     KylinTicketRelations ticket = t3.get(y);
                     KylinTickets t1 = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticket.getTicketId()));
                     KylinTicketStatus t2 = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticket.getTicketId()));
+//                    if(t2.getStatus()==7){
+//                        continue;
+//                    }
                     KylinTicketVo kylinTicketVo = new KylinTicketVo();
                     kylinTicketVo.setTimeId(ticket.getTimesId());
                     kylinTicketVo.setTicket(t1);
@@ -137,12 +140,14 @@ public class MongoVoUtils {
                     }
                 }
 
+//                if(ticketList.size()>0) {
                     KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
                     kylinTicketTimesVo.setTicketTimes(tt1);
                     kylinTicketTimesVo.setPerformanceId(times.getPerformanceId());
                     kylinTicketTimesVo.setTimeId(times.getTimesId());
                     kylinTicketTimesVo.setTicketList(ticketList);
                     timeList.add(kylinTicketTimesVo);
+//                }
             }
 
             voData.setPerformance(p1);

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=撤回失败