| @@ -531,10 +531,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| private List<WxCardSpendVo> handleToCardSpendVoList(List<WxCardSpend> list,TenantEntity tenantEntity) { | private List<WxCardSpendVo> handleToCardSpendVoList(List<WxCardSpend> list,TenantEntity tenantEntity) { | ||||
| List<WxCardSpendVo> retList = new ArrayList<WxCardSpendVo>(); | |||||
| if (null != list && list.size() > 0 ){ | if (null != list && list.size() > 0 ){ | ||||
| List<Long> merchantIdList = new ArrayList<Long>(); | List<Long> merchantIdList = new ArrayList<Long>(); | ||||
| List<Long> cardInfoIdList = new ArrayList<Long>(); | List<Long> cardInfoIdList = new ArrayList<Long>(); | ||||
| List<Long> merchantSubsidyOrderIdList = new ArrayList<Long>(); | |||||
| // List<Long> merchantSubsidyOrderIdList = new ArrayList<Long>(); | |||||
| List<Long> userIdList = new ArrayList<Long>(); | List<Long> userIdList = new ArrayList<Long>(); | ||||
| List<Long> couponIdList = new ArrayList<Long>(); | List<Long> couponIdList = new ArrayList<Long>(); | ||||
| for (int i = 0 ; i < list.size(); i++ ){ | 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()))) { | if (null != _wcs.getCardId() && (!cardInfoIdList.contains(_wcs.getCardId()))) { | ||||
| cardInfoIdList.add(_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()))) { | if (null != _wcs.getOwnerId() && (!userIdList.contains(_wcs.getOwnerId()))) { | ||||
| userIdList.add(_wcs.getOwnerId()) ; | userIdList.add(_wcs.getOwnerId()) ; | ||||
| } | } | ||||
| @@ -555,8 +556,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| Map<Long,WxMerchant> merchantMap = getMerchantMap(merchantIdList, tenantEntity); | Map<Long,WxMerchant> merchantMap = getMerchantMap(merchantIdList, tenantEntity); | ||||
| Map<Long,Long> cardCouponIdMap = new HashMap<Long,Long>(); | Map<Long,Long> cardCouponIdMap = new HashMap<Long,Long>(); | ||||
| Map<Long,WxCardInfo> cardInfoMap = new HashMap<Long,WxCardInfo>(); | Map<Long,WxCardInfo> cardInfoMap = new HashMap<Long,WxCardInfo>(); | ||||
| if (cardInfoIdList.size() > 0 ){ | if (cardInfoIdList.size() > 0 ){ | ||||
| @@ -578,11 +578,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| Map<Long,WxCoupon> couponMap = getCouponMap(couponIdList, tenantEntity); | Map<Long,WxCoupon> couponMap = getCouponMap(couponIdList, tenantEntity); | ||||
| Map<Long,WxMerchantSubsidy> orderSubsidyMap = getOrderSubsidyMap(merchantSubsidyOrderIdList, tenantEntity); | |||||
| // Map<Long,WxMerchantSubsidy> orderSubsidyMap = getOrderSubsidyMap(merchantSubsidyOrderIdList, tenantEntity); | |||||
| Map<Long,WxCUserBasicInfo> userMap = getUserMap(userIdList, tenantEntity); | Map<Long,WxCUserBasicInfo> userMap = getUserMap(userIdList, tenantEntity); | ||||
| List<WxCardSpendVo> retList = new ArrayList<WxCardSpendVo>(); | |||||
| for (int i = 0 ; i < list.size(); i++ ){ | for (int i = 0 ; i < list.size(); i++ ){ | ||||
| WxCardSpend _wcs = list.get(i); | WxCardSpend _wcs = list.get(i); | ||||
| WxCardSpendVo vo = new WxCardSpendVo(); | WxCardSpendVo vo = new WxCardSpendVo(); | ||||
| @@ -608,14 +608,14 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| vo.setWxCardInfo(cardInfo); | 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()) { | if (null != _wcs.getOwnerId()) { | ||||
| WxCUserBasicInfo user = userMap.get(_wcs.getOwnerId()); | WxCUserBasicInfo user = userMap.get(_wcs.getOwnerId()); | ||||
| if (null != user) { | if (null != user) { | ||||
| @@ -632,7 +632,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| return retList; | return retList; | ||||
| } | } | ||||
| return null; | |||||
| return retList; | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -692,7 +692,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| record.setMerchantIdList(merchantIds); | 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); | WxCardInfo cardInfo = wxCardInfoService.getByCouponPasswordId(record.getCardId(), record); | ||||
| if(cardInfo == null){ | if(cardInfo == null){ | ||||
| record.setId(-999L); | record.setId(-999L); | ||||