脚本增加锁逻辑

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ liquidnet:
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level-root: info
+    level-root: debug
   mysql:
     master:
       urlHostAndPort: 39.106.122.201:3308

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

@@ -39,6 +39,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -201,7 +202,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
         List<PerformanceAdminListDao> newList = new ArrayList();
         try {
-            List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(BeanUtil.convertBeanToMap(performanceAdminListParam));
+            Map<String ,Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
+            List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
             for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
                 newList.add(item);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -254,7 +254,7 @@
                 AND ps.STATUS = #{status}
             </if>
             <if test="status=='-2'">
-                AND ps.STATUS >= 3 or ps.STATUS = 1
+                AND (ps.STATUS >= 3 or ps.STATUS = 1)
             </if>
             <if test="auditStatus!='-2'">
                 AND ps.audit_status = #{auditStatus}

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

@@ -297,7 +297,7 @@ public class PerformanceVoTask {
 
                 ticketTimesMapper.delete(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimes.getTicketTimesId()));
                 ticketTimesMapper.insert(ticketTimes);
-                ticketTimeRelationMapper.delete(new UpdateWrapper<KylinTicketTimeRelation>().eq("ticket_time_relation_id", ticketTimeRelation.getTimesId()));
+                ticketTimeRelationMapper.delete(new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimeRelation.getTimesId()));
                 ticketTimeRelationMapper.insert(ticketTimeRelation);
 
                 //修改票