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

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

@@ -153,7 +153,14 @@ public class AdamMemberOrderController {
         return "success";
     }
 
-    @ApiOperationSupport(order = 3)
+//    @ApiOperationSupport(order = 3)
+//    @ApiOperation(value = "会员码详情")
+//    @GetMapping("check/code")
+//    public ResponseDto<AdamMemberCodeVo> getMemberOrderList(@NotBlank @PathVariable String orderNo) {
+//        return ResponseDto.success(adamRdmService.getShotMemberOrderVoByOrderNo(orderNo));
+//    }
+
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "使用兑换码")
     @PostMapping("exchange")
     public ResponseDto<AdamMemberOrderResult> exchangeMemberCode(@Valid @RequestBody AdamMemberOrderCodeParam param) {
@@ -177,7 +184,7 @@ public class AdamMemberOrderController {
         return adamMemberOrderService.exchangeMemberCode(param);
     }
 
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "会员订单列表")
     @GetMapping("list")
     public ResponseDto<PageInfo<AdamMemberOrderSimpleVo>> list(@RequestParam(defaultValue = "1", required = false) int pageNo,
@@ -185,14 +192,14 @@ public class AdamMemberOrderController {
         return ResponseDto.success(adamMemberOrderService.queryPage(CurrentUtil.getCurrentUid(), pageNo, pageSize));
     }
 
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "会员订单详情")
     @GetMapping("info/{orderNo}")
     public ResponseDto<AdamMemberOrderVo> getMemberOrderList(@NotBlank @PathVariable String orderNo) {
         return ResponseDto.success(adamRdmService.getShotMemberOrderVoByOrderNo(orderNo));
     }
 
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "会员订单状态")
     @GetMapping("check")
     public ResponseDto<Integer> checkOrderResult(@NotBlank @RequestParam String orderNo) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamDMAdminController.java

@@ -101,6 +101,8 @@ public class AdamDMAdminController {
     private boolean verify(int alis) {
         LocalDateTime now = LocalDateTime.now();
         int hour = now.getHour();
-        return alis == Integer.parseInt((hour > 12 ? hour - 12 : hour) + "" + now.getMinute());
+        int ali = Integer.parseInt((hour > 12 ? hour - 12 : hour) + "" + now.getMinute());
+        log.info("ali:{},alis:{}", ali, alis);
+        return alis == ali;
     }
 }

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

 package com.liquidnet.service.adam.service;
 
 import com.liquidnet.service.adam.mapper.AdamUserMapper;
+import com.liquidnet.service.adam.service.processor.DMAddressesProcessor;
 import com.liquidnet.service.adam.service.processor.DMEntersProcessor;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
@@ -43,8 +44,9 @@ public abstract class DataMigrationProcessorService {
     @SneakyThrows
     private void preHandler() {
         Class.forName("com.mysql.cj.jdbc.Driver");
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/";
-        if (this instanceof DMEntersProcessor) {
+        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/";
+//        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/";
+        if (this instanceof DMEntersProcessor || this instanceof DMAddressesProcessor) {
             url += "mall";
         } else {
             url += "passport";

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.processor;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -12,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -29,6 +32,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
+
+            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from addresses where 1=1";

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.processor;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
+import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.mapper.AdamEntersMapper;
@@ -12,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -29,9 +32,11 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
+
+            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from enters where type <> 1 or (type = 1 and is_certification = 'yes')";
+        String sqlCount = "select count(1) from enters where (type <> 1 or (type = 1 and is_certification = 'yes'))";
         String field = "id,user_id,type,`name`,mobile,idcode,if(is_default='no', 0, 1),created_at";
 //                     1-id,2-user_id,3-type,4-`name`,5-mobile,6-idcode,7-if(is_default='no', 0, 1),8-created_at
         String sql = sqlCount.replace("count(1)", field);
@@ -46,7 +51,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);
 
 

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

@@ -12,6 +12,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -29,6 +31,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
+
+            log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_real_name where 1=1";
@@ -46,7 +50,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);
 
 

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

@@ -12,6 +12,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -29,6 +31,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
+
+            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_third_parts where `status`=1 and delete_tag=0";

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

@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
+import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
@@ -15,6 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -37,6 +40,9 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
             log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price"));
+
+            log.info("DM.flush.AdamMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberVo.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamMemberPriceVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberPriceVo.class.getSimpleName()).getDeletedCount());
         }
         this.memberCardInfoHandler();
         this.memberCardPriceHandler();
@@ -102,7 +108,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
             o.setCreatedAt(row.getLocalDateTime(8));
             o.setUpdatedAt(row.getLocalDateTime(9));
 
-            AdamMemberPriceVo vo = AdamMemberPriceVo.getNew();
+            AdamMemberPriceVo vo = AdamMemberPriceVo.getNew().copy(o);
 
             memberPriceMapper.insert(o);
             mongoTemplate.insert(vo, AdamMemberPriceVo.class.getSimpleName());

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

@@ -18,6 +18,8 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.sql.SQLException;
@@ -50,6 +52,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
             log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
+
+            log.info("DM.flush.AdamUserInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from users where delete_tag in (0,1) and length(mobile)=11 ";
@@ -67,7 +71,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);
 
 

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.processor;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
@@ -12,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -31,6 +34,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
+
+            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_cards where 1=1";
@@ -48,7 +53,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);
 
 

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -114,7 +114,37 @@ public class ConsumerProcessor {
             exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
             value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
     ))
-    public void consumerOrderCreate(Message msg, Channel channel) {
+    public void consumerOrderCreate1(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_CREATE   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+
+    // 订单创建
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
+    ))
+    public void consumerOrderCreate2(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_CREATE   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+
+    // 订单创建
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
+    ))
+    public void consumerOrderCreate3(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_CREATE   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+
+    // 订单创建
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
+    ))
+    public void consumerOrderCreate4(Message msg, Channel channel) {
         log.info("===   CONSUMER_ORDER_CREATE   ===");
         this.consumerSqlDaoHandler(msg, channel);
     }

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

@@ -89,8 +89,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     private OrderUtils orderUtils;
     @Autowired
     private OtherUtils otherUtils;
-//    @Autowired
-//    private RedisLockUtil redisLockUtil;
+        @Autowired
+    private RedisLockUtil redisLockUtil;
     @Autowired
     private MongoVoUtils mongoVoUtils;
     @Autowired
@@ -110,7 +110,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
     @Override
     public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
-        Long currentTime = System.currentTimeMillis();
+        Long currentTime;
         boolean isDownGeneral = false;
         String uid = CurrentUtil.getCurrentUid();
         String lock = "userId:" + uid;
@@ -120,8 +120,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         try {
             currentTime = System.currentTimeMillis();
             KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(payOrderParam.getPerformanceId());
-            currentTime=System.currentTimeMillis()-currentTime;
-            log.debug("redis 获取演出详情 -> time:"+currentTime+"毫秒");
+            currentTime = System.currentTimeMillis() - currentTime;
+            log.debug("redis 获取演出详情 -> time:" + currentTime + "毫秒");
             KylinTicketTimesVo ticketTimesData = null;
             KylinTicketVo ticketData = null;
             for (int x = 0; x < performanceData.getTicketTimeList().size(); x++) {
@@ -161,8 +161,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
             currentTime = System.currentTimeMillis();
             boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
-            currentTime=System.currentTimeMillis()-currentTime;
-            log.debug("fegin 会员 -> time:"+(currentTime)+"毫秒");
+            currentTime = System.currentTimeMillis() - currentTime;
+            log.debug("fegin 会员 -> time:" + (currentTime) + "毫秒");
 //            boolean isMember = true;
             int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
             if (ticketData.getIsExclusive() == 1) {
@@ -192,6 +192,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
+            //TODO 演出 票状态
+
             //通用判断时间
             if (isMember) {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) {
@@ -231,15 +233,24 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
 
             // 判断库存
+
+            int surplusGeneral = -1;
+            if(redisLockUtil.tryLock("locak:"+ticketData.getTicketsId(),10,1)) {
                 currentTime = System.currentTimeMillis();
-            int surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
-            currentTime=System.currentTimeMillis()-currentTime;
-            log.debug("redis 获取库存 -> time:"+(currentTime)+"毫秒");
+                surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("redis 获取库存 -> time:" + (currentTime) + "毫秒");
+                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
+            }else{
+                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
+                return ResponseDto.failure("下单超时");//乱七八糟异常
+            }
+
             if (surplusGeneral < 0) {//库存回滚
                 currentTime = System.currentTimeMillis();
                 dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
-                currentTime=System.currentTimeMillis()-currentTime;
-                log.debug("redis 修改库存 售罄 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("redis 修改库存 售罄 -> time:" + (currentTime) + "毫秒");
                 //redisLockUtil.unlock(lock);
                 return ResponseDto.failure("该票种已售罄");//没抢到
             } else {
@@ -260,8 +271,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             }
                         }
                     }
-                    currentTime=System.currentTimeMillis()-currentTime;
-                    log.debug("获取 feign 入场人 -> time:"+(currentTime)+"毫秒");
+                    currentTime = System.currentTimeMillis() - currentTime;
+                    log.debug("获取 feign 入场人 -> time:" + (currentTime) + "毫秒");
                 }
 
                 //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
@@ -275,37 +286,37 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     currentTime = System.currentTimeMillis();
                     for (int i = 0; i < entersVoList.size(); i++) {
                         String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, entersVoList.get(i).getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, memberType, isTrueName);
-                        log.debug("redis 判断库存 -> time:"+(currentTime)+"毫秒");
+                        log.debug("redis 判断库存 -> time:" + (currentTime) + "毫秒");
                         if (!res1.equals("")) {
                             //redisLockUtil.unlock(lock);
                             return ResponseDto.failure(res1);//乱七八糟异常
                         }
                     }
-                    currentTime=System.currentTimeMillis()-currentTime;
+                    currentTime = System.currentTimeMillis() - currentTime;
 
                 } else {
-                    log.debug("redis 判断库存 -> time:"+(currentTime)+"毫秒");
+                    log.debug("redis 判断库存 -> time:" + (currentTime) + "毫秒");
                     currentTime = System.currentTimeMillis();
                     String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
-                    currentTime=System.currentTimeMillis()-currentTime;
+                    currentTime = System.currentTimeMillis() - currentTime;
                     if (!res1.equals("")) {
                         //redisLockUtil.unlock(lock);
                         return ResponseDto.failure(res1);//乱七八糟异常
                     }
-                    currentTime=System.currentTimeMillis()-currentTime;
+                    currentTime = System.currentTimeMillis() - currentTime;
 
                 }
 
                 //redisLockUtil.unlock(lock);
-                return order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData,currentTime);
+                return order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData, currentTime);
             }
         } catch (Exception e) {
             if (isDownGeneral) {
                 currentTime = System.currentTimeMillis();
                 currentTime = System.currentTimeMillis();
                 dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
-                currentTime=System.currentTimeMillis()-currentTime;
-                log.debug("redis 修改库存 异常 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("redis 修改库存 异常 -> time:" + (currentTime) + "毫秒");
             }
             e.printStackTrace();
             log.error("Kylin Order Pay Error = " + e.getMessage());
@@ -314,7 +325,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
     }
 
-    private ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, KylinTicketTimesVo ticketTimesData,Long currentTime) {
+    private ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, KylinTicketTimesVo ticketTimesData, Long currentTime) {
         LinkedList<String> sqls = new LinkedList<>();
         String source = CurrentUtil.getCliSource() == null ? "" : CurrentUtil.getCliSource();
         String version = CurrentUtil.getCliVersion() == null ? "" : CurrentUtil.getCliVersion();
@@ -364,8 +375,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderTickets.setExpressAddress(addressesVo.getAddress());
             orderTickets.setExpressPhone(addressesVo.getPhone());
             orderTickets.setGetTicketType("express");
-            currentTime=System.currentTimeMillis()-currentTime;
-            log.debug("feign 获取入场人 -> time:"+(currentTime)+"毫秒");
+            currentTime = System.currentTimeMillis() - currentTime;
+            log.debug("feign 获取入场人 -> time:" + (currentTime) + "毫秒");
         } else {
             orderTickets.setExpressContacts("");
             orderTickets.setExpressAddress("");
@@ -455,12 +466,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
                 currentTime = System.currentTimeMillis();
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
-                currentTime=System.currentTimeMillis()-currentTime;
-                log.debug("mongo 添加入场人 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("mongo 添加入场人 -> time:" + (currentTime) + "毫秒");
                 currentTime = System.currentTimeMillis();
                 dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
-                currentTime=System.currentTimeMillis()-currentTime;
-                log.debug("redis 修改 限购 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("redis 修改 限购 -> time:" + (currentTime) + "毫秒");
             }
         } else {
             for (int i = 0; i < payOrderParam.getNumber(); i++) {
@@ -497,12 +508,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
                 currentTime = System.currentTimeMillis();
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
-                currentTime=System.currentTimeMillis()-currentTime;
-                log.debug("mongo 添加入场人 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("mongo 添加入场人 -> time:" + (currentTime) + "毫秒");
                 currentTime = System.currentTimeMillis();
                 dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
-                currentTime=System.currentTimeMillis()-currentTime;
-                log.debug("redis 修改限购 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("redis 修改限购 -> time:" + (currentTime) + "毫秒");
             }
         }
         // 调用支付
@@ -535,41 +546,42 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
 
         currentTime = System.currentTimeMillis();
-//        String returnData = HttpUtil.post(payUrl + payOrderParam.getDeviceFrom() + "/" + payOrderParam.getPayType(), httpData);
-        currentTime=System.currentTimeMillis()-currentTime;
-        log.debug("调用 PHP 支付 -> time:"+(currentTime)+"毫秒");
-        PayResultVo payResultVo = null;
-        try {
-             payResultVo = JsonUtils.fromJson("{\n" +
-                    "    \"code\": \"20210618130049218267704668657P\",\n" +
-                    "    \"order_code\": \"T7774750254320448484\",\n" +
-                    "    \"status\": null,\n" +
-                    "    \"order_id\": \"77747502543208448\",\n" +
-                    "    \"showUrl\": \"http://devm.zhengzai.tv/#/ticket/purchase/detail?id=5936241&amp;type=purchase&amp;performance_id=5936241&amp;ticket_id=10981&amp;amount=1&amp;products_array=&amp;amount_array=&amp;express=077747502543208448\",\n" +
-                    "    \"returnUrl\": \"http://devm.zhengzai.tv/#/order/status?order_type=ticket&amp;order_id=77747502543208448\",\n" +
-                    "    \"price\": 0.01,\n" +
-                    "    \"pay_data\": {\n" +
-                    "      \"packages\": null,\n" +
-                    "      \"partnerid\": null,\n" +
-                    "      \"prepayid\": null,\n" +
-                    "      \"sign\": null,\n" +
-                    "      \"mweb_url\": null,\n" +
-                    "      \"paySign\": null,\n" +
-                    "      \"signType\": null,\n" +
-                    "      \"redirect_url\": \"https://openapi.alipay.com/gateway.do?alipay_sdk=lokielse%2Fomnipay-alipay&app_id=2019082866535131&biz_content=%7B%22product_code%22%3A%22QUICK_WAP_PAY%22%2C%22total_amount%22%3A%220.01%22%2C%22subject%22%3A%2206%5Cu670830%5Cu65e5%5Cu5355%5Cu65e5%5Cu7968%5Cu80e1%5Cu5927%5Cu7f8e%5Cu5e76%5Cu53d1%5Cu4e0b%5Cu5355%22%2C%22body%22%3A%22%5Cu80e1%5Cu5927%5Cu7f8e%5Cu5e76%5Cu53d1%5Cu4e0b%5Cu5355%5Cu5355%5Cu65e5%5Cu796806%5Cu670830%5Cu65e5%22%2C%22out_trade_no%22%3A%2220210618130049218267704668657P%22%2C%22time_expire%22%3A%222021-06-18+13%3A06%22%2C%22quit_url%22%3A%22http%3A%5C%2F%5C%2Fdevm.zhengzai.tv%5C%2F%23%5C%2Fticket%5C%2Fpurchase%5C%2Fdetail%3Fid%3D5936241%26amp%3Btype%3Dpurchase%26amp%3Bperformance_id%3D5936241%26amp%3Bticket_id%3D10981%26amp%3Bamount%3D1%26amp%3Bproducts_array%3D%26amp%3Bamount_array%3D%26amp%3Bexpress%3D077747502543208448%22%7D&charset=utf-8&format=JSON&method=alipay.trade.wap.pay&notify_url=http%3A%2F%2Ftestpay.zhengzai.tv%2Fnotify%2Fwap%2Falipay%2F1&return_url=http%3A%2F%2Fdevm.zhengzai.tv%2F%23%2Forder%2Fstatus%3Forder_type%3Dticket%26amp%3Border_id%3D77747502543208448&sign_type=RSA2&timestamp=2021-06-18+13%3A00%3A49&version=1.0&sign=UaHmNdI1cXjjSkR4gwrnELSWXqb1Icg1uCOe0vEo5yHCqWOy4JZCZbjCR1xOHQKowSMBAr6U2XLtMAaNXr6mX%2B%2F5IiaChsD4IPoODNT7F4GckVcqP3GkdLZTro%2FGmBau6VoYw1uVpyutQTJsjEU1fQ%2F5KDAKLvg0XG%2F1D%2BXb%2Bv6LdLDvehCEPzy4W%2BCT0qPANU4ysgZkt9hP1ljH61%2FBWiDnfz%2BOdust4KBoJYQzNWO3XSwvc17OxdGHn8EBmYRJz6sr1nt0i2h4BGQtjrOHRB3dToVkxrlsHtbrOmiCdRFH6utSVA8UjeKtlEB%2FH%2BkQfVxPkpOicTjkokhDNK6svg%3D%3D\",\n" +
-                    "      \"order_str\": null,\n" +
-                    "      \"appId\": null,\n" +
-                    "      \"appid\": null,\n" +
-                    "      \"nonceStr\": null,\n" +
-                    "      \"noncestr\": null,\n" +
-                    "      \"timeStamp\": null,\n" +
-                    "      \"timestamp\": null,\n" +
-                    "      \"package\": null\n" +
-                    "    }\n" +
-                    "  }", PayResultVo.class);
-        }catch (Exception e){
-            payResultVo = new PayResultVo();
-        }
+        String returnData = HttpUtil.post(payUrl + payOrderParam.getDeviceFrom() + "/" + payOrderParam.getPayType(), httpData);
+        currentTime = System.currentTimeMillis() - currentTime;
+        log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒");
+        PayResultVo payResultVo =  JsonUtils.fromJson(returnData, PayResultVo.class);
+//        PayResultVo payResultVo = null;
+//        try {
+//            payResultVo = JsonUtils.fromJson("{\n" +
+//                    "    \"code\": \"20210618130049218267704668657P\",\n" +
+//                    "    \"order_code\": \"T7774750254320448484\",\n" +
+//                    "    \"status\": null,\n" +
+//                    "    \"order_id\": \"77747502543208448\",\n" +
+//                    "    \"showUrl\": \"http://devm.zhengzai.tv/#/ticket/purchase/detail?id=5936241&amp;type=purchase&amp;performance_id=5936241&amp;ticket_id=10981&amp;amount=1&amp;products_array=&amp;amount_array=&amp;express=077747502543208448\",\n" +
+//                    "    \"returnUrl\": \"http://devm.zhengzai.tv/#/order/status?order_type=ticket&amp;order_id=77747502543208448\",\n" +
+//                    "    \"price\": 0.01,\n" +
+//                    "    \"pay_data\": {\n" +
+//                    "      \"packages\": null,\n" +
+//                    "      \"partnerid\": null,\n" +
+//                    "      \"prepayid\": null,\n" +
+//                    "      \"sign\": null,\n" +
+//                    "      \"mweb_url\": null,\n" +
+//                    "      \"paySign\": null,\n" +
+//                    "      \"signType\": null,\n" +
+//                    "      \"redirect_url\": \"https://openapi.alipay.com/gateway.do?alipay_sdk=lokielse%2Fomnipay-alipay&app_id=2019082866535131&biz_content=%7B%22product_code%22%3A%22QUICK_WAP_PAY%22%2C%22total_amount%22%3A%220.01%22%2C%22subject%22%3A%2206%5Cu670830%5Cu65e5%5Cu5355%5Cu65e5%5Cu7968%5Cu80e1%5Cu5927%5Cu7f8e%5Cu5e76%5Cu53d1%5Cu4e0b%5Cu5355%22%2C%22body%22%3A%22%5Cu80e1%5Cu5927%5Cu7f8e%5Cu5e76%5Cu53d1%5Cu4e0b%5Cu5355%5Cu5355%5Cu65e5%5Cu796806%5Cu670830%5Cu65e5%22%2C%22out_trade_no%22%3A%2220210618130049218267704668657P%22%2C%22time_expire%22%3A%222021-06-18+13%3A06%22%2C%22quit_url%22%3A%22http%3A%5C%2F%5C%2Fdevm.zhengzai.tv%5C%2F%23%5C%2Fticket%5C%2Fpurchase%5C%2Fdetail%3Fid%3D5936241%26amp%3Btype%3Dpurchase%26amp%3Bperformance_id%3D5936241%26amp%3Bticket_id%3D10981%26amp%3Bamount%3D1%26amp%3Bproducts_array%3D%26amp%3Bamount_array%3D%26amp%3Bexpress%3D077747502543208448%22%7D&charset=utf-8&format=JSON&method=alipay.trade.wap.pay&notify_url=http%3A%2F%2Ftestpay.zhengzai.tv%2Fnotify%2Fwap%2Falipay%2F1&return_url=http%3A%2F%2Fdevm.zhengzai.tv%2F%23%2Forder%2Fstatus%3Forder_type%3Dticket%26amp%3Border_id%3D77747502543208448&sign_type=RSA2&timestamp=2021-06-18+13%3A00%3A49&version=1.0&sign=UaHmNdI1cXjjSkR4gwrnELSWXqb1Icg1uCOe0vEo5yHCqWOy4JZCZbjCR1xOHQKowSMBAr6U2XLtMAaNXr6mX%2B%2F5IiaChsD4IPoODNT7F4GckVcqP3GkdLZTro%2FGmBau6VoYw1uVpyutQTJsjEU1fQ%2F5KDAKLvg0XG%2F1D%2BXb%2Bv6LdLDvehCEPzy4W%2BCT0qPANU4ysgZkt9hP1ljH61%2FBWiDnfz%2BOdust4KBoJYQzNWO3XSwvc17OxdGHn8EBmYRJz6sr1nt0i2h4BGQtjrOHRB3dToVkxrlsHtbrOmiCdRFH6utSVA8UjeKtlEB%2FH%2BkQfVxPkpOicTjkokhDNK6svg%3D%3D\",\n" +
+//                    "      \"order_str\": null,\n" +
+//                    "      \"appId\": null,\n" +
+//                    "      \"appid\": null,\n" +
+//                    "      \"nonceStr\": null,\n" +
+//                    "      \"noncestr\": null,\n" +
+//                    "      \"timeStamp\": null,\n" +
+//                    "      \"timestamp\": null,\n" +
+//                    "      \"package\": null\n" +
+//                    "    }\n" +
+//                    "  }", PayResultVo.class);
+//        } catch (Exception e) {
+//            payResultVo = new PayResultVo();
+//        }
         payResultVo.setOrder_id(orderTicketId);
         payResultVo.setPrice(orderTickets.getPriceActual());
         orderTickets.setPayCode(payResultVo.getCode());
@@ -595,21 +607,21 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
         currentTime = System.currentTimeMillis();
         mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
-        currentTime=System.currentTimeMillis()-currentTime;
-        log.debug("mongo  添加 订单 -> time:"+(currentTime)+"毫秒");
+        currentTime = System.currentTimeMillis() - currentTime;
+        log.debug("mongo  添加 订单 -> time:" + (currentTime) + "毫秒");
 
         currentTime = System.currentTimeMillis();
         mongoVoUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId());
-        currentTime=System.currentTimeMillis()-currentTime;
-        log.debug("redis 修改订单列表 -> time:"+(currentTime)+"毫秒");
+        currentTime = System.currentTimeMillis() - currentTime;
+        log.debug("redis 修改订单列表 -> time:" + (currentTime) + "毫秒");
 
         // 执行sql
         String sqlData = SqlMapping.gets(sqls, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataA);
         currentTime = System.currentTimeMillis();
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE, MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
                 sqlData);
-        currentTime=System.currentTimeMillis()-currentTime;
-        log.debug("MQ 发送 -> time:"+(currentTime)+"毫秒");
+        currentTime = System.currentTimeMillis() - currentTime;
+        log.debug("MQ 发送 -> time:" + (currentTime) + "毫秒");
         return ResponseDto.success(payResultVo);
     }
 
@@ -620,7 +632,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             checkOrderTime(uid);
             //检查订单时间 是否关闭
             KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(payAgainParam.getOrderId());
-            if(!orderTicketData.getUserId().equals(uid)){
+            if (!orderTicketData.getUserId().equals(uid)) {
                 return null;
             }
             if (orderTicketData == null) {
@@ -704,13 +716,13 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime));
                 sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain"));
                 LinkedList<Object[]> sqlsDataB = new LinkedList<>();
-                sqlsDataB.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
+                sqlsDataB.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
                 sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain"));
                 LinkedList<Object[]> sqlsDataC = new LinkedList<>();
-                sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
+                sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
-                String sqlData = SqlMapping.gets(sqls, sqlsDataA,sqlsDataB, sqlsDataC);
-                rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN, MQConst.ROUTING_KEY_SQL_ORDER_AGAIN,sqlData);
+                String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC);
+                rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN, MQConst.ROUTING_KEY_SQL_ORDER_AGAIN, sqlData);
                 return ResponseDto.success(payResultVo);
             }
             return ResponseDto.failure("未选择支付方式");
@@ -780,7 +792,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
         LinkedList<Object[]> sqlsDataC = new LinkedList<>();
-        sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
+        sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
         KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
         orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
@@ -818,7 +830,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
 
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
-                SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC,sqlsDataD));
+                SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD));
 
         //生成vo redis
         mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId());
@@ -913,7 +925,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             String uid = CurrentUtil.getCurrentUid();
             checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
-            if(!orderTicketVo.getUserId().equals(uid)){
+            if (!orderTicketVo.getUserId().equals(uid)) {
                 return null;
             }
             if (null != orderTicketVo) {
@@ -991,6 +1003,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     public boolean checkOrderTime(String userId) {
         List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
         LinkedList<String> sqls = new LinkedList<>();
+        HashMap<String, Integer> map2 = new HashMap<>();
         for (OrderScriptDto item : dtoData) {
             String lock = "order_lock:" + item.getOrderCode();
 //            if (!redisLockUtil.tryLock(lock, 30, 240)) {
@@ -1004,7 +1017,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             Query.query(Criteria.where("orderTicketsId").is(item.getOrderTicketsId())),
                             KylinOrderTicketVo.class,
                             KylinOrderTicketVo.class.getSimpleName());
-                    if(vo.getStatus()!=0){
+                    if (vo.getStatus() != 0) {
                         continue;
                     }
 
@@ -1023,16 +1036,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     map.put("status", KylinTableStatusConst.ORDER_STATUS2);
                     map.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
                     map.put("changeDate", now);
-                    Document doc = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
+                    mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                             Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
-                            new BasicDBObject("$set", mongoConverter.convertToMongoType(map)),
-                            new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
+                            new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
                     );
 
                     LocalDateTime strTime = vo.getChangeDate();
 
                     dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
-                    dataUtils.changeSurplusGeneral(item.getTicketId(), item.getNumber());
+                    map2.put(vo.getTicketId(), map2.get(vo.getTicketId()) == null ? vo.getNumber() : map2.get(vo.getTicketId()) + vo.getNumber());
                     mongoVoUtils.resetOrderListVo(item.getUserId(), 2, item.getOrderTicketsId());
 
                     List<KylinOrderTicketEntities> entities = entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
@@ -1051,9 +1063,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                     sqls.add(SqlMapping.get("kylin_order_ticket_relation.close"));
                     LinkedList<Object[]> sqlsDataC = new LinkedList<>();
-                    sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
+                    sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
-                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, SqlMapping.gets(sqls, sqlsDataA, sqlsDataB,sqlsDataC));
+                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
 
                 } catch (Exception e) {
                     //redisLockUtil.unlock(lock);
@@ -1064,6 +1076,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 //redisLockUtil.unlock(lock);
             }
         }
+
+
+        for (Map.Entry<String, Integer> entry : map2.entrySet()) {
+            dataUtils.changeSurplusGeneral(entry.getKey(), entry.getValue());
+        }
+
         return true;
     }
 
@@ -1071,7 +1089,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     public ResponseDto<Integer> checkOrderResult(String orderId) {
         String uid = CurrentUtil.getCurrentUid();
         KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId);
-        if(!orderTicketData.getUserId().equals(uid)){
+        if (!orderTicketData.getUserId().equals(uid)) {
             return null;
         }
         if (orderTicketData == null) {