fix:去除MONGO后会员订单详情查取调整;

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);
     }