Merge branch 'dev' into test

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

@@ -82,7 +82,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             adminUpush.setPushedBy(authId);
             adminUpush.setPushedName(authName);
             if (adminUpush.getPushTime().isEmpty()) {
-                adminUpush.setPushTime(null);
+                adminUpush.setPushTime(DateUtil.getNowTime());
             }
             adminUpushMapper.insert(adminUpush);
 

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

@@ -244,7 +244,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             log.info(UserPathDto.setData("订单详情", orderId, vo));
             return vo;
         } catch (Exception e) {
-            log.info("DETAIL ERROR = ",e);
             return null;
         }
     }
@@ -466,7 +465,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     orderObject
             );
             dataUtils.delOrderTicketRedis(orderTicketsId);
-            log.info("orderTicketVo.getUserId() = "+ orderTicketVo.getUserId());
             orderUtils.resetOrderListVo(orderTicketVo.getUserId(), 2, orderTicketsId, null);
 
             // 入场人

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

@@ -33,7 +33,6 @@ public class OrderUtils {
         }
         BeanUtils.copyProperties(data, voItem);
         List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
-        log.info("STEP0 = "+redisData.size());
         if (type == 1) {
             redisVo.add(voItem);
             if (redisData.size() > 0) {
@@ -46,7 +45,6 @@ public class OrderUtils {
         redisVo.addAll(redisData);
         switch (type) {
             case 1:
-                log.info("STEP1 = "+redisVo.size());
                 for (int i = 0; i < redisVo.size(); i++) {
                     if (i == 40) {
                         break;
@@ -63,20 +61,16 @@ public class OrderUtils {
                 dataUtils.setOrderList(userId, vo);
                 return true;
             case 2:
-                log.info("STEP1 = "+redisVo.size());
                 for (int i = 0; i < redisVo.size(); i++) {
                     if (i == 40) {
                         break;
                     }
                     if (redisVo.get(i).getOrderTicketsId().equals(orderId)) {
                         vo.add(voItem);
-                        log.info("STEP3 = "+vo.size());
                     } else {
                         vo.add(redisVo.get(i));
-                        log.info("STEP4 = "+vo.size());
                     }
                 }
-                log.info("STEP2 = "+vo.size());
                 dataUtils.setOrderList(userId, vo);
                 return true;
             default:

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

@@ -599,9 +599,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             String uid = CurrentUtil.getCurrentUid();
             //检查订单时间 是否关闭
             KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(payAgainParam.getOrderId());
-            log.info("data  uid = "+orderTicketData.getUserId());
-            log.info("param uid = "+uid);
-            log.info("param data = "+orderTicketData);
             if (!orderTicketData.getUserId().equals(uid)) {
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
@@ -716,7 +713,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             return ResponseDto.failure(ErrorMapping.get("20029"));
         } catch (Exception e) {
-            log.info("PAY AGAIN = ",e);
             return ResponseDto.failure(ErrorMapping.get("20028"));
         }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/basicServices/AdminUpushServiceImpl.java

@@ -63,10 +63,12 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
 
             if (!CollectionUtils.isEmpty(msgList)) {
                 for (AdminUpushVo info : msgList) {
+                    if (!info.getImg().isEmpty()) {
                         String img = imgUrl + info.getImg();
                         info.setImg(img);
                     }
                 }
+            }
 
             voPageInfo = PageInfo.of(msgList);
             voPageInfo.setTotal(count);