Merge branch 'bugfix/20240130-filterMemberSvcCord-wsc' into qa

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -151,7 +151,7 @@ public class OrderVerifyHandle {
         }
         //美团规定，一分钟内不能出餐
         if (Objects.equals(OrderClientType.MEITUAN.getIndex().toString(), orderBean.getOrderClient()) && orderBean.getGmtAccept() != null) {
-            if (orderBean.getGmtAccept() - new Date().getTime() < 60 * 1000) {
+            if (new Date().getTime() - orderBean.getGmtAccept() < 60 * 1000) {
                 return ResponseUtil.error(ResponseResult.DONE_FAIL_ONE_MINUTE);
             }
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1438,12 +1438,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 BaseResponse<List<SvcCardDetailsResponse>> details = svcAppClient.details(req);
                 cardCodes = details.getResult().stream().filter(item -> item.getCardState().equals(2)).map(SvcCardDetailsResponse::getCardCode).collect(toList());
             }
-            SVCCardAmountRequest svcCardAmountRequest = new SVCCardAmountRequest();
-            svcCardAmountRequest.setCardCodes(cardCodes);
-            svcCardAmountRequest.setPartnerId(partnerId);
-            BaseResponse<SVCCardAmountResponse> svcCardAmountResponseBaseResponse = svcAppClient.batchQueryCardAmount(svcCardAmountRequest);
-            List<CardSimpleInfo> cardSimpleInfos = svcCardAmountResponseBaseResponse.getResult().getCardSimpleInfos();
-            List<GetMemberInfoResponseVo.Card> cards = cardSimpleInfos.stream().map(each -> convert2MemberSvcCard(each)).collect(toList());
+            List<GetMemberInfoResponseVo.Card> cards = Collections.emptyList();
+            if (CollectionUtils.isNotEmpty(cardCodes)){
+                SVCCardAmountRequest svcCardAmountRequest = new SVCCardAmountRequest();
+                svcCardAmountRequest.setCardCodes(cardCodes);
+                svcCardAmountRequest.setPartnerId(partnerId);
+                BaseResponse<SVCCardAmountResponse> svcCardAmountResponseBaseResponse = svcAppClient.batchQueryCardAmount(svcCardAmountRequest);
+                List<CardSimpleInfo> cardSimpleInfos = svcCardAmountResponseBaseResponse.getResult().getCardSimpleInfos();
+                cards = cardSimpleInfos.stream().map(this::convert2MemberSvcCard).collect(toList());
+            }
             responseData.setCards(cards);
         }
         return ResponseUtil.success(responseData);