Merge branch 'pre' into 'master'

Pre

See merge request !20

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

@@ -654,17 +654,20 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         //找到所有ticketId
         List<TicketTimesTicketCreatePartnerVo> timesVoList = vo.getTicketTimes();
         for (TicketTimesTicketCreatePartnerVo timesVo : timesVoList) {
+            for (KylinTicketPartnerVo ticketVo : timesVo.getTicket()){
                 List<String> orderTicketRedisIdList = new ArrayList<>();
                 List<String> userRedisIdList = new ArrayList<>();
                 List<String> orderTicketIdList = new ArrayList<>();
-            List<OrderIdsDao> orderIdsDaoList = kylinOrderTicketsMapper.getOrderUserIdByTimesId(timesVo.getTicketTimesId());
+                log.info("修改场次相关 mysql ticketId -> " + ticketVo.getTicketsId());
+                List<OrderIdsDao> orderIdsDaoList = kylinOrderTicketsMapper.getOrderUserIdByTimesId(ticketVo.getTicketsId());
+                log.info("修改场次相关 mysql data -> " + orderIdsDaoList.size());
                 for (OrderIdsDao item : orderIdsDaoList) {
                     orderTicketRedisIdList.add(KylinRedisConst.ORDER + item.getOrderTicketsId());
                     userRedisIdList.add(KylinRedisConst.ORDER_LIST + item.getUserId());
                     orderTicketIdList.add(item.getOrderTicketsId());
                 }
                 HashMap<String, Object> mapMongo = new HashMap<>();
-            mapMongo.put("useStart", timesVo.getUseStart());
+                mapMongo.put("useStart", ticketVo.getUseStart());
                 long time1 = System.currentTimeMillis();
                 mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateMany(
                         Query.query(Criteria.where("orderTicketsId").in(orderTicketIdList)).getQueryObject(),
@@ -677,4 +680,5 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 log.debug("修改场次相关 redis time -> " + (System.currentTimeMillis() - time1) + " ms ");
             }
         }
+    }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java

@@ -35,6 +35,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
 
     List<KylinOrderTickets> getCanPlaceOrderList(@Param("performanceId") String performanceId, @Param("mid") int mid, @Param("limitNum") int limitNum);
 
-    List<OrderIdsDao> getOrderUserIdByTimesId(@Param("timeId") String timeId);
+    List<OrderIdsDao> getOrderUserIdByTimesId(@Param("ticketId") String ticketId);
 
 }

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

@@ -344,6 +344,6 @@
 
     <select id="getOrderUserIdByTimesId" resultType="com.liquidnet.service.kylin.dao.OrderIdsDao">
         select order_tickets_id,user_id from kylin_order_tickets as kot left join kylin_order_ticket_relations as kotr on kotr.order_id = kot.order_tickets_id
-        where time_id =#{timeId}
+        where ticket_id =#{ticketId}
     </select>
 </mapper>

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

@@ -240,7 +240,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             ticketMap.put("useEnd",kylinTicketTimesPartnerVo.getUseEnd());
             ticketMap.put("useStart",kylinTicketTimesPartnerVo.getUseStart());
             BasicDBObject ticketObject = ObjectUtil.cloneBasicDBObject().append("$set", ticketMap);
-            mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
+            mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany(
                     Query.query(Criteria.where("timesId").is(createTicketTimesParam.getTicketTimesId())).getQueryObject(),
                     ticketObject
             );
@@ -248,6 +248,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             log.info(UserPathDto.setPartnerData("0","changeTimes", createTicketTimesParam,JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class)));
             return ResponseDto.success(JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class));
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20103));
         }
     }

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

@@ -387,6 +387,9 @@ public class PerformanceVoTask {
         if (!misVo.getTitle().equals(mongoVo.getTitle())) {
             log.debug("NEED CHANGE TITLE");
             return true;
+        } if (!misVo.getImgPoster().equals(mongoVo.getImgPoster())) {
+            log.debug("NEED CHANGE IMGPOSTER");
+            return true;
         } else if (!misVo.getType().equals(mongoVo.getType())) {
             log.debug("NEED CHANGE TYPE");
             return true;