Просмотр исходного кода

fix card

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
74dae1ccbd
2 измененных файлов: 9 добавлений и 7 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java
  2. +7
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.mapper; package com.iformall.mapper;


import java.math.BigDecimal;
import java.util.*; import java.util.*;


import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -25,6 +26,6 @@ public interface WxMerchantSubsidyMapper extends CommonMapper<WxMerchantSubsidy,
List<Map<String,Object>> sumByMerchantId(WxMerchantSubsidy wxMerchantSubsidy); List<Map<String,Object>> sumByMerchantId(WxMerchantSubsidy wxMerchantSubsidy);
Map<String,Integer> sum(WxMerchantSubsidy wxMerchantSubsidy);
Map<String,BigDecimal> sum(WxMerchantSubsidy wxMerchantSubsidy);
} }

+ 7
- 6
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 javax.servlet.http.HttpServletResponse;


import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@@ -640,13 +641,13 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
Map<Long,WxMerchant> merchantMap = this.getMerchantMap(merchantIdList, record); Map<Long,WxMerchant> merchantMap = this.getMerchantMap(merchantIdList, record);
WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList); WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList);
List<Map<String,Object>> merchantSubsidyMap = wxMerchantSubsidyMapper.sumByMerchantId(sq); List<Map<String,Object>> merchantSubsidyMap = wxMerchantSubsidyMapper.sumByMerchantId(sq);
Map<Long,Map<String,Integer>> msmap = new HashMap<Long,Map<String,Integer>>();
Map<Long,Map<String,BigDecimal>> msmap = new HashMap<Long,Map<String,BigDecimal>>();
if (null != merchantSubsidyMap && merchantSubsidyMap.size() > 0 ) { if (null != merchantSubsidyMap && merchantSubsidyMap.size() > 0 ) {
for (int i = 0 ; i < merchantSubsidyMap.size(); i++) { for (int i = 0 ; i < merchantSubsidyMap.size(); i++) {
Map<String,Object> result = merchantSubsidyMap.get(i) ; Map<String,Object> result = merchantSubsidyMap.get(i) ;
Map<String,Integer> submap = new HashMap<String,Integer>();
submap.put("sum_subsidy", (Integer)result.get("sum_subsidy"));
submap.put("sum_real_subsidy", (Integer)result.get("sum_real_subsidy"));
Map<String,BigDecimal> submap = new HashMap<String,BigDecimal>();
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) ; msmap.put((Long)result.get("merchant_id"), submap) ;
} }
} }
@@ -661,7 +662,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
if (null != merchant) { if (null != merchant) {
result.put("merchantName", merchant.getName()); result.put("merchantName", merchant.getName());
} }
Map<String,Integer> busmap = msmap.get(merchantId);
Map<String,BigDecimal> busmap = msmap.get(merchantId);
if (null != busmap) { if (null != busmap) {
result.put("sum_subsidy", (null == busmap.get("sum_subsidy"))?0:busmap.get("sum_subsidy")); 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"))); 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); handleQueryParam(record);
List<Long> merchantIdList = wxCardSpendMapper.getMerchantIdList(record); List<Long> merchantIdList = wxCardSpendMapper.getMerchantIdList(record);
WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList); WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList);
Map<String,Integer> submap = wxMerchantSubsidyMapper.sum(sq);
Map<String,BigDecimal> submap = wxMerchantSubsidyMapper.sum(sq);
List<Map<String, Object>> resultList = wxCardSpendMapper.sumCardSpendVoForOwner(record); List<Map<String, Object>> resultList = wxCardSpendMapper.sumCardSpendVoForOwner(record);
if (null != resultList && resultList.size() > 0 ) { if (null != resultList && resultList.size() > 0 ) {
for (int i = 0 ; i < resultList.size(); i++) { for (int i = 0 ; i < resultList.size(); i++) {


Загрузка…
Отмена
Сохранить