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

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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundBatchAdminController.java

@@ -105,6 +105,7 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
                 return error(res.getMessage());
             }
         } catch (Exception e) {
+            logger.info("refundBatchApplyException", e);
             return error(e.getMessage());
         }
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -21,14 +21,14 @@
 <!--                    </li>-->
                     <li id="li-tab-6"><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a>
                     </li>
+                    <li id="li-tab-7"><a data-toggle="tab" href="#tab-7" aria-expanded="false" onclick="transferInfo()">转赠配置</a>
+                    </li>
                     <li id="li-tab-3"><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a>
                     </li>
                     <li id="li-tab-4"><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
                     </li>
                     <li id="li-tab-5"><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
                     </li>
-                    <li id="li-tab-7"><a data-toggle="tab" href="#tab-7" aria-expanded="false" onclick="transferInfo()">转赠配置</a>
-                    </li>
                 </ul>
                 <div class="tab-content">
                     <div id="tab-1" class="tab-pane">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/applyView.html

@@ -63,7 +63,7 @@
                             $.modal.loading("正在查询订单，请稍后...");
                         },
                         success: function (result) {
-                            if (result.status > 0) {
+                            if (result.code > 0) {
                                 $.modal.closeLoading();
                                 layer.msg(result.msg);
                                 return false;

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

@@ -114,7 +114,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         if (thisOrderStatus != KylinTableStatusConst.ORDER_STATUS1 && thisOrderStatus != KylinTableStatusConst.ORDER_STATUS3 && thisOrderStatus != KylinTableStatusConst.ORDER_STATUS6) {
             return ResponseDto.failure("当前订单状态不支持退款申请");
         }
-        if (orderStatus.getTransferStatus() != 0 || orderStatus.getTransferStatus() != 5) {
+        if (!(orderStatus.getTransferStatus() == 0 || orderStatus.getTransferStatus() == 5)) {
             return ResponseDto.failure("当前转增状态不可退款");
         }
         // 订单支付状态需为已支付
@@ -422,7 +422,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             KylinOrderTicketStatus kylinOrderTicketStatus = kylinOrderTicketStatusMapper.selectOne(
                     Wrappers.lambdaQuery(KylinOrderTicketStatus.class).eq(KylinOrderTicketStatus::getOrderId, kylinOrderTickets.getOrderTicketsId())
             );
-            if (kylinOrderTicketStatus.getTransferStatus() != 0 || kylinOrderTicketStatus.getTransferStatus() != 5) {
+            if (!(kylinOrderTicketStatus.getTransferStatus() == 0 || kylinOrderTicketStatus.getTransferStatus() == 5)) {
                 return AjaxResult.error("当前转增状态不可退款");
             }
             BigDecimal oldPriceExpress = kylinOrderTickets.getPriceExpress();

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

@@ -21,6 +21,7 @@ import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -42,6 +43,7 @@ import java.util.List;
  * @since 2021-05-25 11:26 上午
  */
 @Service
+@Slf4j
 public class KylinRefundPerformancesAdminServiceImpl {
 
     @Autowired
@@ -69,7 +71,7 @@ public class KylinRefundPerformancesAdminServiceImpl {
         HashMap<String, Object> orderStatisAlipay = kylinOrderTicketsMapper.getPerformanceRefundOrderStatis(targetId, paymentTypeAlipay);
         String[] paymentTypeWepay = {"APPWEPAY", "APPLETWEPAY", "WAPWEPAY", "JSWEPAY", "wepay"};
         HashMap<String, Object> orderStatisWepay = kylinOrderTicketsMapper.getPerformanceRefundOrderStatis(targetId, paymentTypeWepay);
-        BigDecimal totalPriceRefundAlipay = new BigDecimal(0);
+        BigDecimal totalPriceRefundAlipay = new BigDecimal(0.0);
         Integer totalRefundNumberAlipay = 0;
         BigDecimal totalPriceRefundWepay = new BigDecimal(0);
         Integer totalRefundNumberWepay = 0;
@@ -78,14 +80,19 @@ public class KylinRefundPerformancesAdminServiceImpl {
                 totalPriceRefundAlipay = (BigDecimal) orderStatisAlipay.get("total_price_refund");
                 Long totalRefundNumberAlipayBigDecimal = (Long) orderStatisAlipay.get("total_refund_number");
                 totalRefundNumberAlipay = totalRefundNumberAlipayBigDecimal.intValue();
+                if (null == totalPriceRefundAlipay) {
+                    totalPriceRefundAlipay = new BigDecimal(0);
+                }
             }
 
             if (null != orderStatisWepay) {
                 totalPriceRefundWepay = (BigDecimal) orderStatisWepay.get("total_price_refund");
                 Long totalRefundNumberWepayBigDecimal = (Long) orderStatisWepay.get("total_refund_number");
                 totalRefundNumberWepay = totalRefundNumberWepayBigDecimal.intValue();
+                if (null == totalPriceRefundWepay) {
+                    totalPriceRefundWepay = new BigDecimal(0);
+                }
             }
-
             if (totalPriceRefundAlipay.compareTo(BigDecimal.ZERO) <= 0 && totalPriceRefundWepay.compareTo(BigDecimal.ZERO) <= 0) {
                 return ResponseDto.failure("演出退款金额为0，无需退款");
             }

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

@@ -249,6 +249,7 @@ public class PerformanceVoUtils {
             KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
             BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
 
+            performances.setDetails(performanceUpdateMisVo.getDetails());
             performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
             performances.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
             performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getCreatedAt())));
@@ -348,6 +349,7 @@ public class PerformanceVoUtils {
                     BeanUtils.copyProperties(kylinTicketPartnerVo, tickets);
                     KylinTicketStatus ticketStatus = new KylinTicketStatus();
                     BeanUtils.copyProperties(kylinTicketPartnerVo, ticketStatus);
+                    ticketStatus.setStatus(null);
                     KylinTicketRelations ticketRelations = new KylinTicketRelations();
                     BeanUtils.copyProperties(kylinTicketPartnerVo, ticketRelations);
 

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

@@ -446,57 +446,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 return "申请金额不得小于0";
             }
 
-            // 临时手续费
-            if (orderTicketVo.getPerformanceId().equals("245383231370444809122956")) {
-                // 手续费比例
-                float chargesNum = 0.0f;
-                // 票种演出开始时间
-                String useStart = orderTicketVo.getUseStart();
-                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                LocalDateTime useStartD = LocalDateTime.parse(useStart, df);
-                // 3、15天之前的时间
-                LocalDateTime useStartD15Before = useStartD.minusDays(15);
-                LocalDateTime useStartD3Before = useStartD.minusDays(3);
-                // 当前时间
-                LocalDateTime nowTime = LocalDateTime.now();
-
-                if (useStartD15Before.isAfter(nowTime)) { // 15天以前的时间大于当前时间 距离演出开始日期>15天
-                    chargesNum = 0.1f;
-                    log.info("距离演出开始日期>15天");
-                    log.info("票种演出开始时间 {}", useStartD);
-                    log.info("15天之前的时间 {}", useStartD15Before);
-                    log.info("3天之前的时间 {}", useStartD3Before);
-                    log.info("当前时间 {}", nowTime);
-                    log.info("手续费比例 {}", chargesNum);
-                } else if (useStartD3Before.isAfter(nowTime)) { // 3天以前的时间大于当前时间 距离演出开始日期>3天-15天 含15天
-                    chargesNum = 0.5f;
-                    log.info("距离演出开始日期3-15天");
-                    log.info("票种演出开始时间 {}", useStartD);
-                    log.info("15天之前的时间 {}", useStartD15Before);
-                    log.info("3天之前的时间 {}", useStartD3Before);
-                    log.info("当前时间 {}", nowTime);
-                    log.info("手续费比例 {}", chargesNum);
-                } else { // 三天以内 <=3
-                    log.info("距离演出开始日期<=3");
-                    log.info("票种演出开始时间 {}", useStartD);
-                    log.info("15天之前的时间 {}", useStartD15Before);
-                    log.info("3天之前的时间 {}", useStartD3Before);
-                    log.info("当前时间 {}", nowTime);
-                    log.info("手续费比例 {}", chargesNum);
-                    return "当前日期不支持退票";
-                }
-                BigDecimal multiply = refundSinglePrice.multiply(BigDecimal.valueOf(chargesNum));
-                log.info("multiply {}", multiply);
-                refundSinglePrice = refundSinglePrice.subtract(multiply);
-                log.info("去除手续费申请金额 {}", refundSinglePrice);
-                if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
-                    return "申请金额不得小于0";
-//                    return "去除手续费申请金额不得小于0";
-                }
-            } else {
-                log.info("演出id1111 {}", orderTicketVo.getPerformanceId());
-            }
-            // 临时手续费 end
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
             String result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
@@ -754,6 +703,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
             //生成被转赠订单独立redis
             orderTicketVo.setOrderTicketsId(IDGenerator.nextSnowId());
+            orderTicketVo.setQrCode(IDGenerator.ticketQrCode(orderTicketVo.getOrderTicketsId()));
             orderTicketVo.setTransferId(orderId);
             orderTicketVo.setTransferStatus(4);
             orderTicketVo.setUserId(transferUid);
@@ -1001,7 +951,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             for (int i = 0; i < orderTicketVo.getEntitiesVoList().size(); i++) {
                 KylinOrderTicketEntitiesVo entitiesVo = orderTicketVo.getEntitiesVoList().get(i);
                 String orderTicketEntitiesId = entitiesVo.getOrderTicketEntitiesId();
-                orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
+                orderTicketEntities.setOrderTicketEntitiesId(IDGenerator.nextSnowId());
                 orderTicketEntities.setOrderId(orderTicketId);
                 orderTicketEntities.setTicketId(ticketData.getTicketsId());
                 orderTicketEntities.setUserId(uid);

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

@@ -184,7 +184,7 @@ public class OrderUtils {
     public List<AdamEntersVo> getEnters(String entersIds, String uid) {
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
-        String returnVo = HttpUtil.get("https://testadam.zhengzai.tv" + "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
+        String returnVo = HttpUtil.get(adamUrl + "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
         ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
         });
         return ResponseVo.getData();

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

@@ -151,6 +151,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             return performanceId;
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "createStep1", step1Param, e));
             return null;
         }
     }
@@ -203,6 +204,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             return performanceId;
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "updateStep1", step1Param, e));
             return null;
         }
     }
@@ -314,6 +316,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, e));
             return ResponseDto.failure(ErrorMapping.get(20115));
         }
     }
@@ -445,6 +448,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0", "updateStep2", step2Param, e));
             return ResponseDto.failure(ErrorMapping.get(20115));
         }
     }
@@ -528,7 +532,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             log.info(UserPathDto.setPartnerData("0", "onLinePerformance", "performancesId=" + performancesId, "上线成功"));
             return ResponseDto.success("上线成功");
         } catch (Exception e) {
-            log.debug("上线失败", e);
+            log.info(UserPathDto.setPartnerData("0", "onLinePerformance", "performancesId=" + performancesId, e));
             return ResponseDto.failure(ErrorMapping.get(20108));
         }
     }
@@ -553,7 +557,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 return ResponseDto.failure(ErrorMapping.get(20111));
             }
         } catch (Exception e) {
-            log.debug("下线失败", e);
+            log.info(UserPathDto.setPartnerData("0", "outLinePerformance", "outLinePerformance=" + performancesId, e));
             return ResponseDto.failure(ErrorMapping.get(20109));
         }
     }
@@ -590,6 +594,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             return performancePartnerVo.getPerformancesId();
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0", "copyPerformance", "performancesId=" + performancesId, e));
             return null;
         }
     }
@@ -681,6 +686,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0", "withdraw", performancesId, e));
             return ResponseDto.failure(ErrorMapping.get(20117));
         }
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java

@@ -123,6 +123,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
 
             return ResponseDto.success(kylinTicketTimesPartnerVo);
         } catch (Exception e) {
+            log.info(UserPathDto.setPartnerData("0","createTimes", createTicketTimesParam,e));
             return ResponseDto.failure(ErrorMapping.get(20105));
         }
     }
@@ -162,6 +163,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             );
             return ResponseDto.success(kylinTicketTimesPartnerVo);
         } catch (Exception e) {
+            log.info(UserPathDto.setPartnerData("0","addNewTimes", createTicketTimesParam,e));
             return ResponseDto.failure(ErrorMapping.get(20101));
         }
     }
@@ -204,6 +206,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
                 return ResponseDto.success();
             }
         } catch (Exception e) {
+            log.info(UserPathDto.setPartnerData("0","deleteTimes", "ticketTimesId="+ticketTimesId,e));
             return ResponseDto.failure(ErrorMapping.get(20102));
         }
     }
@@ -249,6 +252,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             return ResponseDto.success(JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class));
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0","changeTimes", createTicketTimesParam,e));
             return ResponseDto.failure(ErrorMapping.get(20103));
         }
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketsPartnerServiceImpl.java

@@ -144,6 +144,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
 
             return ResponseDto.success(kylinTicketPartnerVo);
         } catch (Exception e) {
+            log.info(UserPathDto.setPartnerData("0","createTicket", ticketCreateParam,e));
             return ResponseDto.failure(ErrorMapping.get(20105));
         }
     }
@@ -197,6 +198,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
 
             return ResponseDto.success(kylinTicketPartnerVo);
         } catch (Exception e) {
+            log.info(UserPathDto.setPartnerData("0","addNewTicket", ticketCreateParam,e));
             return ResponseDto.failure(ErrorMapping.get(20101));
         }
     }
@@ -250,6 +252,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             return ResponseDto.success(kylinTicketPartnerVoData);
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0","updateTicket", ticketCreateParam,e));
             return ResponseDto.failure(ErrorMapping.get(20103));
         }
     }
@@ -295,6 +298,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0","deleteTicket", "ticketsId="+ticketsId,e));
             return ResponseDto.failure(ErrorMapping.get(20102));
         }
     }
@@ -321,6 +325,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             return ResponseDto.success(kylinTicketPartnerVo);
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0","deleteTicket", "performanceId="+performanceId+",ticketsId="+ticketsId,e));
             return ResponseDto.failure(ErrorMapping.get(20107));
         }
     }
@@ -389,6 +394,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0","onLine", "performancesId="+performancesId+",ticketsId="+ticketsId,"上线失败"));
             return ResponseDto.failure(ErrorMapping.get(20108));
         }
     }
@@ -421,6 +427,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info(UserPathDto.setPartnerData("0","outLine", "performancesId="+performancesId+",ticketsId="+ticketsId,"下线失败"));
             return ResponseDto.failure(ErrorMapping.get(20109));
         }
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

@@ -221,6 +221,7 @@ public class PerformanceVoTask {
             floatList.sort(Comparator.naturalOrder());
             StringList.sort(Comparator.naturalOrder());
 
+            kylinPerformanceMisVo.setDetails(performanceData.getDetails());
             kylinPerformanceMisVo.setPrice(floatList.get(0) + "起");
             kylinPerformanceMisVo.setStopSellTime(StringList.get(0));
             kylinPerformanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
@@ -385,41 +386,41 @@ public class PerformanceVoTask {
         KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId);
         KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId);
         if (!misVo.getTitle().equals(mongoVo.getTitle())) {
-            log.debug("NEED CHANGE TITLE");
+            log.info("performanceId = "+performanceId+" NEED CHANGE TITLE");
             return true;
         } if (!misVo.getImgPoster().equals(mongoVo.getImgPoster())) {
-            log.debug("NEED CHANGE IMGPOSTER");
+            log.info("performanceId = "+performanceId+" NEED CHANGE IMGPOSTER");
             return true;
         } else if (!misVo.getType().equals(mongoVo.getType())) {
-            log.debug("NEED CHANGE TYPE");
+            log.info("performanceId = "+performanceId+" NEED CHANGE TYPE");
             return true;
         } else if (!misVo.getTimeStart().equals(mongoVo.getTimeStart())) {
-            log.debug("NEED CHANGE TIMESTART");
+            log.info("performanceId = "+performanceId+" NEED CHANGE TIMESTART");
             return true;
         } else if (!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())) {
-            log.debug("NEED CHANGE TIMEEND");
+            log.info("performanceId = "+performanceId+" NEED CHANGE TIMEEND");
             return true;
         } else if (!misVo.getFieldId().equals(mongoVo.getFieldId())) {
-            log.debug("NEED CHANGE FIELDID");
+            log.info("performanceId = "+performanceId+" NEED CHANGE FIELDID");
             return true;
         } else if (!misVo.getNotice().equals(mongoVo.getNotice())) {
-            log.debug("NEED CHANGE NOTICE");
+            log.info("performanceId = "+performanceId+" NEED CHANGE NOTICE");
             return true;
-        } else if (!misVo.getDetails().equals(mongoVo.getDetails())) {
-            log.debug("NEED CHANGE DETAILS");
+        } else if (!misVo.getDetails().replace("'","").equals(mongoVo.getDetails().replace("'",""))) {
+            log.info("performanceId = "+performanceId+" NEED CHANGE DETAILS");
             return true;
         } else if (!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())) {
-            log.debug("NEED CHANGE APPROVALURL");
+            log.info("performanceId = "+performanceId+" NEED CHANGE APPROVALURL");
             return true;
         } else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
-            log.debug("NEED CHANGE PAYCOUTDOWN");
+            log.info("performanceId = "+performanceId+" NEED CHANGE PAYCOUTDOWN");
             return true;
         }
 
         boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is(-1).and("performancesId").is(performanceId)),
                 KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
         if (exists) {
-            log.debug("NEED CHANGE NEW TIMES");
+            log.info("performanceId = "+performanceId+" NEED CHANGE NEW TIMES");
             return true;
         }
 
@@ -428,27 +429,25 @@ public class PerformanceVoTask {
             KylinTicketTimesVo timesVo = mongoVo.getTicketTimeList().get(i);
 
             if(!times.getUseStart().equals(timesVo.getUseStart())){
-                log.debug("NEED CHANGE TIMES USE_START");
+                log.info("performanceId = "+performanceId+" NEED CHANGE TIMES USE_START");
                 return true;
             }
 
             if(!times.getUseEnd().equals(timesVo.getUseEnd())){
-                log.debug("NEED CHANGE TIMES USE_END");
+                log.info("performanceId = "+performanceId+" NEED CHANGE TIMES USE_END");
                 return true;
             }
 
             boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is(-2).and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
             if (exists2) {
-                log.debug("NEED CHANGE NEW TICKET");
+                log.info("performanceId = "+performanceId+" NEED CHANGE NEW TICKET");
                 return true;
             }
             for (KylinTicketPartnerVo ticketPartnerVo : times.getTicket()) {
                 for (KylinTicketVo ticketVo : timesVo.getTicketList()) {
                     if (ticketVo.getTicketsId().equals(ticketPartnerVo.getTicketsId())) {
                         if (!ticketVo.getTitle().equals(ticketPartnerVo.getTitle())) {
-                            log.debug("NEED CHANGE TICKET TITLE");
-                            log.debug("ticketVo.getTitle() = " + ticketVo.getTitle());
-                            log.debug("ticketPartnerVo.getTitle() = " + ticketPartnerVo.getTitle());
+                            log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET TITLE");
                             return true;
                         }
 //                        else if (!ticketVo.getQrCodeShowTime().equals(ticketPartnerVo.getQrCodeShowTime())) {
@@ -456,20 +455,14 @@ public class PerformanceVoTask {
 //                            return true;
 //                    }
                         else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) {
-                            log.debug("NEED CHANGE TICKET DESCRIBEELECTRONIC");
-                            log.debug("ticketVo.getDescribeElectronic() =" + ticketVo.getDescribeElectronic());
-                            log.debug("ticketPartnerVo.getDescribeElectronic() =" + ticketPartnerVo.getDescribeElectronic());
+                            log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET DESCRIBEELECTRONIC");
                             return true;
                         } else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribeExpress())) {
-                            log.debug("NEED CHANGE TICKET DESCRIBEELEXPRESS");
-                            log.debug("ticketVo.getDescribeExpress() =" + ticketVo.getDescribeExpress());
-                            log.debug("ticketPartnerVo.getDescribeExpress() =" + ticketPartnerVo.getDescribeExpress());
+                            log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET DESCRIBEELEXPRESS");
                             return true;
                         }
                         if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) {
-                            log.debug("NEED CHANGE TICKET DESCRIBES");
-                            log.debug("ticketVo.getDescribes() =" + ticketVo.getDescribes());
-                            log.debug("ticketPartnerVo.getDescribes() =" + ticketPartnerVo.getDescribes());
+                            log.info("performanceId = "+performanceId+" NEED CHANGE TICKET DESCRIBES");
                             return true;
                         }
                         break;