修改 支付回调 取消 发送短信

修改第三方 判断是否需要审核的逻辑

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

@@ -787,7 +787,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
         KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
 
-        if(orderTicketData.getStatus()==0){
+        if(orderTicketData.getStatus()==2){
+            orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
+        }else if(orderTicketData.getStatus()==3 || orderTicketData.getStatus()==4){
+            log.error("订单号位 {} 的订单正在退款 或者已退款",syncOrderParam.getOrder_code());
+        }else{
             orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
             orderTickets.setPaymentType(syncOrderParam.getPayment_type());
             orderTickets.setPayCode(syncOrderParam.getCode());
@@ -877,12 +881,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             } else if (orderTicketData.getGetTicketType().equals("electronic")) {
                 configVo.setId(ticketData.getIsShowCode() == 1 ? "SMS_171358560" : "SMS_181500419");
             }
-            otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1);
+//            otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1);
 
             // 大麦回调
             sycDamaiOrder(orderTickets.getOrderTicketsId());
-        }else{
-             orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
         }
         redisLockUtil.unlock(lock);
         return "success";

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

@@ -372,12 +372,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     KylinPerformances performances = new KylinPerformances();
                     performances.setAuditTime(LocalDateTime.now());
+                    performances.setNoticeImage(kylinPerformanceMisVo.getNoticeImage());
                     performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
                     KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
                     performanceStatus.setAuditStatus((int) map.get("auditStatus"));
+                    performanceStatus.setIsTrueName(step2Param.getIsTrueName());
+                    performanceStatus.setLimitCount(step2Param.getLimitCount());
                     performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
 
-                    //提示：票种价格、售票时间、购票限制 直接生效
+                    //提示：票种价格、售票时间、票种购票限制 直接生效 (演出购票限制，购票须知 演出是否实名 票种缺货登记 票种是否电子票 票种是否快递票 票种最低购买张数 票种是否显示二维码)
                     List<TicketTimesTicketCreatePartnerVo> timeList = kylinPerformanceMisVo.getTicketTimes();
                     for (TicketTimesTicketCreatePartnerVo timesItem : timeList) {
                         List<KylinTicketPartnerVo> ticketList = timesItem.getTicket();
@@ -398,6 +401,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                             inventory.setTotalGeneral(ticketItem.getTotalGeneral());
                             inventory.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());
                             inventory.setLimitCount(ticketItem.getLimitCount());
+                            inventory.setIsLackRegister(ticketItem.getIsLackRegister());
+                            inventory.setIsExpress(ticketItem.getIsExpress());
+                            inventory.setIsElectronic(ticketItem.getIsElectronic());
+                            inventory.setCounts(ticketItem.getCounts());
+                            inventory.setIsShowCode(ticketItem.getIsShowCode());
+
                             //修改 mysql 售卖时间
                             KylinTickets ticketSellTime = new KylinTickets();
                             ticketSellTime.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEnd()));

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

@@ -398,10 +398,6 @@ public class PerformanceVoTask {
             return true;
         } else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
             return true;
-        } else if (!misVo.getLimitCount().equals(mongoVo.getLimitCount())) {
-            return true;
-        } else if (!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())) {
-            return true;
         }
 
         boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is(-1).and("performancesId").is(performanceId)),
@@ -412,10 +408,29 @@ public class PerformanceVoTask {
 
         for (int i = 0; i < misVo.getTicketTimes().size(); i++) {
             TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
+            KylinTicketTimesVo timesVo = mongoVo.getTicketTimeList().get(i);
             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;
             }
+            for (KylinTicketPartnerVo ticketPartnerVo : times.getTicket()){
+                for (KylinTicketVo ticketVo : timesVo.getTicketList()){
+                    if(ticketVo.getTicketsId().equals(ticketPartnerVo.getTicketsId())){
+                        if (!ticketVo.getTitle().equals(ticketPartnerVo.getTitle())) {
+                            return true;
+                        }else if (!ticketVo.getQrCodeShowTime().equals(ticketPartnerVo.getQrCodeShowTime())) {
+                            return true;
+                        }else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) {
+                            return true;
+                        }else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribesExpress())) {
+                            return true;
+                        }if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) {
+                            return true;
+                        }
+                        break;
+                    }
+                }
+            }
         }
         return false;
     }