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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html

@@ -39,7 +39,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">购买人手机号：</label>
                 <div class="col-sm-8">
-                    <input name="memberName" th:field="*{adamMemberOrderVo.memberName}" class="form-control" type="text" readonly>
+                    <input name="memberName" th:field="*{adamUser.mobile}" class="form-control" type="text" readonly>
                 </div>
             </div>
             <div class="form-group">

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

@@ -155,6 +155,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 //redisLockUtil.unlock(lock);
                 return ResponseDto.failure("参数错误");//参数错误List<AdamEntersVo> entersVoList
             }
+            if (payOrderParam.getNumber()%ticketData.getCounts()!=0) {
+                //redisLockUtil.unlock(lock);
+                return ResponseDto.failure("数量错误");//参数错误List<AdamEntersVo> entersVoList
+            }
             //判断代理
             if (!checkAgent(payOrderParam.getAgentId(), ticketData)) {
                 //redisLockUtil.unlock(lock);
@@ -549,7 +553,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         httpData.add("client_ip", CurrentUtil.getCliIpAddr());
         httpData.add("notify_url", synUrl);
         httpData.add("create_date", orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        httpData.add("expire_time", (orderTickets.getPayCountdownMinute() + 1) + "");
+        httpData.add("expire_time", (orderTickets.getPayCountdownMinute()) + "");
 
         if (payOrderParam.getDeviceFrom().equals("js") || payOrderParam.getDeviceFrom().equals("applet")) {
             httpData.add("open_id", payOrderParam.getOpenId());

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

@@ -399,14 +399,15 @@ public class PerformanceVoTask {
             return true;
         }
 
-        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is("-1").and("performancesId").is(performanceId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is(-1).and("performancesId").is(performanceId)),
+                KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
         if (exists) {
             return true;
         }
 
         for (int i = 0; i < misVo.getTicketTimes().size(); i++) {
             TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
-            boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is("-2").and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
+            boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is(-2).and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
             if (exists2) {
                 return true;
             }