快递下单

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

@@ -205,7 +205,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
         // 无 performancesId 则 创建
         if (!step2Param.getPerformancesId().isEmpty()) { // 获取 create 数据 status = 0 或 无数据 创建
             KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(step2Param.getPerformancesId());
-            if (vo == null || vo.getAppStatus() == 0 || vo.getAppStatus() == 4) {
+            if (vo == null || vo.getAppStatus() == 0 || vo.getAppStatus() == 4 || (vo.getAppStatus() == 1 || vo.getAuditStatus() == 0)) {
                 result = createStep2(step2Param);
                 log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, result));
             } else if (vo.getAppStatus() == 1 || vo.getAppStatus() == 3 || vo.getAppStatus() == 6 || vo.getAppStatus() == 7 || vo.getAppStatus() == 8 || vo.getAppStatus() == 9) {// 修改
@@ -284,8 +284,8 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                     mapSql.put("rejectTxt", "");
                     mapSql.put("status", 1);
                     mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    performanceUtils.submitVo(performanceId);
                     performanceUtils.createPerformanceMySql(performanceId, mapSql, kylinPerformanceMisVo, createdAt);
+                    performanceUtils.submitVo(performanceId);
                     queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_TICKET_UPDATE.getKey(),
                             SqlMapping.get("kylin_performances.auditTime",
                                     now, performanceId, now, now

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java

@@ -622,8 +622,8 @@ public class PerformanceUtils {
 
     public KylinPerformanceVo submitVo(String performanceId) {
         try {
+            mongoMerchantUtils.delPerformanceVo(performanceId);
             KylinPerformanceVo voData = new KylinPerformanceVo();
-
             //演出数据
             PerformancePartnerVo p = mongoMerchantUtils.getPerformancePartnerVo(performanceId);
             //场地相关数据
@@ -691,8 +691,8 @@ public class PerformanceUtils {
                             price = kylinTicketVo.getPrice();
                         }
                     }
-                    LocalDateTime tTimeStart = LocalDateTime.parse(t.getTimeStart(),DTF_YMD_HMS);
-                    LocalDateTime tTimeEnd = LocalDateTime.parse(t.getTimeEnd(),DTF_YMD_HMS);
+                    LocalDateTime tTimeStart = LocalDateTime.parse(t.getTimeStart(), DTF_YMD_HMS);
+                    LocalDateTime tTimeEnd = LocalDateTime.parse(t.getTimeEnd(), DTF_YMD_HMS);
                     if (stopSellTime == null || stopSellTime.isBefore(tTimeEnd)) {
                         stopSellTime = tTimeEnd;
                     }