Merge branch 'dev' into test

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

@@ -233,9 +233,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                 }
 
 
-                if (item.getStatus() == 4) {
+                if (item.getIsPayment() == 3) {
                     taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
-                } else if(item.getStatus() == 0){
+                } else if(item.getIsPayment() == 1){
                     log.info("FOREACH STEP 3 ");
                     list2.add(obj3);
                     obj3.setUserName(item.getEnterName());//用户名 入场人姓名

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderPushDamaiDto.java

@@ -21,6 +21,7 @@ public class OrderPushDamaiDto {
     String enterMobile;
     String timePay;
     String timeId;
+    Integer isPayment;
     String ticketId;
     Integer isMember;
     String orderTicketEntitiesId;

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

@@ -30,6 +30,7 @@
         <result column="order_tickets_id" property="orderTicketsId"/>
         <result column="mid" property="mid"/>
         <result column="status" property="status"/>
+        <result column="is_payment" property="isPayment"/>
         <result column="enter_name" property="enterName"/>
         <result column="enter_id_code" property="enterIdCode"/>
         <result column="enter_mobile" property="enterMobile"/>
@@ -232,6 +233,7 @@
                enter_name,
                enter_id_code,
                ote.status,
+               ote.is_payment,
                enter_type,
                enter_mobile,
                time_pay,
@@ -245,8 +247,7 @@
                  LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id
-        WHERE ots.pay_status = 1
-          AND ote.is_payment = 1
+        WHERE  ots.pay_status = 1
           AND kys.sync_damai = 1
           AND ote.ticket_id = ${ticketsId}
     </select>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java

@@ -245,6 +245,13 @@ public class AdamMemberOrderController {
     @GetMapping("info/{orderNo}")
     public ResponseDto<AdamMemberOrderVo> getMemberOrder(@NotBlank(message = "订单号不能为空") @PathVariable String orderNo) {
         AdamMemberOrderVo mOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo);
+
+        if (null == mOrderVo) {
+            List<AdamMemberOrderVo> memberOrderVos = adamRdmService.getMemberOrderVosByUid(CurrentUtil.getCurrentUid());
+
+            mOrderVo = adamRdmService.getMemberOrderVoByOrderNo(memberOrderVos, orderNo);
+        }
+
         if (null != mOrderVo) {
             AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(mOrderVo.getMemberId());
             mOrderVo.setMemberNotes(memberVo.getNotes());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -207,10 +207,7 @@ public class AdamRdmService {
 
     public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(List<AdamThirdPartInfoVo> vos, String platform) {
         if (!CollectionUtils.isEmpty(vos)) {
-            Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny();
-            if (any.isPresent()) {
-                return any.get();
-            }
+            return vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny().orElse(null);
         }
         return null;
     }
@@ -220,10 +217,7 @@ public class AdamRdmService {
         if (!CollectionUtils.isEmpty(vos)) {
 //            for (AdamThirdPartInfoVo r : vos)
 //                if (platform.equals(r.getPlatform())) return r;
-            Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny();
-            if (any.isPresent()) {
-                return any.get();
-            }
+            return vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny().orElse(null);
         }
         return null;
     }
@@ -273,7 +267,10 @@ public class AdamRdmService {
     }
 
     public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) {
-        return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
+        if (CollectionUtils.isEmpty(vos)) {
+            return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
+        }
+        return null;
     }
 
     public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
@@ -330,7 +327,10 @@ public class AdamRdmService {
     }
 
     public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) {
-        return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
+        if (CollectionUtils.isEmpty(vos)) {
+            return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
+        }
+        return null;
     }
 
     public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) {
@@ -459,10 +459,7 @@ public class AdamRdmService {
 //                    return r;
 //                }
 //            }
-            Optional<AdamMemberPriceVo> any = vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny();
-            if (any.isPresent()) {
-                return any.get();
-            }
+            return vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny().orElse(null);
         }
         return null;
     }
@@ -532,6 +529,13 @@ public class AdamRdmService {
         return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos);
     }
 
+    public AdamMemberOrderVo getMemberOrderVoByOrderNo(List<AdamMemberOrderVo> vos, String orderNo) {
+        if (!CollectionUtils.isEmpty(vos)) {
+            return vos.stream().filter(r -> r.getOrderNo().equals(orderNo)).findAny().orElse(null);
+        }
+        return null;
+    }
+
     public void delMemberOrderVoByUid(String uid) {
         redisUtil.del(AdamRedisConst.INFO_MEMBER_ORDER + uid);
     }