From 05871da3aad152d6dcc7a0aeedfd35ccec780adf Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 15 Mar 2023 21:40:23 +0800 Subject: [PATCH] //card --- .../service/impl/WxCardSpendServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 6f85d9ad7..88894e555 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -531,10 +531,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } private List handleToCardSpendVoList(List list,TenantEntity tenantEntity) { + List retList = new ArrayList(); if (null != list && list.size() > 0 ){ List merchantIdList = new ArrayList(); List cardInfoIdList = new ArrayList(); - List merchantSubsidyOrderIdList = new ArrayList(); +// List merchantSubsidyOrderIdList = new ArrayList(); List userIdList = new ArrayList(); List couponIdList = new ArrayList(); for (int i = 0 ; i < list.size(); i++ ){ @@ -545,9 +546,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { if (null != _wcs.getCardId() && (!cardInfoIdList.contains(_wcs.getCardId()))) { cardInfoIdList.add(_wcs.getCardId()) ; } - if (null != _wcs.getOrderId() && (!merchantSubsidyOrderIdList.contains(_wcs.getOrderId()))) { - merchantSubsidyOrderIdList.add(_wcs.getOrderId()) ; - } +// if (null != _wcs.getOrderId() && (!merchantSubsidyOrderIdList.contains(_wcs.getOrderId()))) { +// merchantSubsidyOrderIdList.add(_wcs.getOrderId()) ; +// } if (null != _wcs.getOwnerId() && (!userIdList.contains(_wcs.getOwnerId()))) { userIdList.add(_wcs.getOwnerId()) ; } @@ -555,8 +556,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } Map merchantMap = getMerchantMap(merchantIdList, tenantEntity); - - + Map cardCouponIdMap = new HashMap(); Map cardInfoMap = new HashMap(); if (cardInfoIdList.size() > 0 ){ @@ -578,11 +578,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { Map couponMap = getCouponMap(couponIdList, tenantEntity); - Map orderSubsidyMap = getOrderSubsidyMap(merchantSubsidyOrderIdList, tenantEntity); +// Map orderSubsidyMap = getOrderSubsidyMap(merchantSubsidyOrderIdList, tenantEntity); Map userMap = getUserMap(userIdList, tenantEntity); - List retList = new ArrayList(); + for (int i = 0 ; i < list.size(); i++ ){ WxCardSpend _wcs = list.get(i); WxCardSpendVo vo = new WxCardSpendVo(); @@ -608,14 +608,14 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { vo.setWxCardInfo(cardInfo); } } - if (null != _wcs.getOrderId()) { - WxMerchantSubsidy subsidy = orderSubsidyMap.get(_wcs.getOrderId()); - if (null != subsidy) { - vo.setSubsidy(subsidy.getSubsidy()); - vo.setRealSubsidy(subsidy.getRealSubsidy()); - vo.setStatus(subsidy.getStatus()); - } - } +// if (null != _wcs.getOrderId()) { +// WxMerchantSubsidy subsidy = orderSubsidyMap.get(_wcs.getOrderId()); +// if (null != subsidy) { +// vo.setSubsidy(subsidy.getSubsidy()); +// vo.setRealSubsidy(subsidy.getRealSubsidy()); +// vo.setStatus(subsidy.getStatus()); +// } +// } if (null != _wcs.getOwnerId()) { WxCUserBasicInfo user = userMap.get(_wcs.getOwnerId()); if (null != user) { @@ -632,7 +632,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } return retList; } - return null; + return retList; } @Override @@ -692,7 +692,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { record.setMerchantIdList(merchantIds); } } - if(EnumCardInfoType.CARD.equals(record.getCardType()) && record.getCardId() != null){ + if(EnumCardInfoType.CARD.getCode().equals(record.getCardType()) && record.getCardId() != null){ WxCardInfo cardInfo = wxCardInfoService.getByCouponPasswordId(record.getCardId(), record); if(cardInfo == null){ record.setId(-999L);