diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java index 10972de1d..e5bdfcc27 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java @@ -1,5 +1,6 @@ package com.iformall.mapper; +import java.math.BigDecimal; import java.util.*; import org.apache.ibatis.annotations.Param; @@ -25,6 +26,6 @@ public interface WxMerchantSubsidyMapper extends CommonMapper> sumByMerchantId(WxMerchantSubsidy wxMerchantSubsidy); - Map sum(WxMerchantSubsidy wxMerchantSubsidy); + Map sum(WxMerchantSubsidy wxMerchantSubsidy); } 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 7f593cacf..58656bfc7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.reflect.InvocationTargetException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -640,13 +641,13 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { Map merchantMap = this.getMerchantMap(merchantIdList, record); WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList); List> merchantSubsidyMap = wxMerchantSubsidyMapper.sumByMerchantId(sq); - Map> msmap = new HashMap>(); + Map> msmap = new HashMap>(); if (null != merchantSubsidyMap && merchantSubsidyMap.size() > 0 ) { for (int i = 0 ; i < merchantSubsidyMap.size(); i++) { Map result = merchantSubsidyMap.get(i) ; - Map submap = new HashMap(); - submap.put("sum_subsidy", (Integer)result.get("sum_subsidy")); - submap.put("sum_real_subsidy", (Integer)result.get("sum_real_subsidy")); + Map submap = new HashMap(); + submap.put("sum_subsidy", (BigDecimal)result.get("sum_subsidy")); + submap.put("sum_real_subsidy", (BigDecimal)result.get("sum_real_subsidy")); msmap.put((Long)result.get("merchant_id"), submap) ; } } @@ -661,7 +662,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { if (null != merchant) { result.put("merchantName", merchant.getName()); } - Map busmap = msmap.get(merchantId); + Map busmap = msmap.get(merchantId); if (null != busmap) { result.put("sum_subsidy", (null == busmap.get("sum_subsidy"))?0:busmap.get("sum_subsidy")); result.put("sum_real_subsidy", (null == busmap.get("sum_real_subsidy")?0:busmap.get("sum_real_subsidy"))); @@ -693,7 +694,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { handleQueryParam(record); List merchantIdList = wxCardSpendMapper.getMerchantIdList(record); WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList); - Map submap = wxMerchantSubsidyMapper.sum(sq); + Map submap = wxMerchantSubsidyMapper.sum(sq); List> resultList = wxCardSpendMapper.sumCardSpendVoForOwner(record); if (null != resultList && resultList.size() > 0 ) { for (int i = 0 ; i < resultList.size(); i++) {