diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 07e506404..582e236ce 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -113,8 +113,8 @@ public class WxCardPayController extends BaseController { } MallUserInfo user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); - return new ResultData(map); + final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); + return new ResultData(mapList); } @ApiOperation("交易流水导出") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 9905ba768..04c569770 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -62,7 +63,7 @@ public class WxCardPayController extends BaseController { WxMerchantBUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); wxCardSpend.setMerchantId(user.getMerchantId()); - final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); - return new ResultData(map); + final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); + return new ResultData(mapList); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 668c99134..e122846c4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.util.List; import java.util.Map; /** @@ -162,7 +163,7 @@ public class WxCardPayController extends BaseController { WxCUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); wxCardSpend.setOwnerId(user.getId()); - final Map map = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); - return new ResultData(map); + final List> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); + return new ResultData(mapList); } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java index c0d666a18..8d8e92759 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -13,9 +13,9 @@ public interface WxCardSpendMapper extends CommonMapper { List findCardSpendVoList(WxCardSpend wxCardSpend); - Map sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); + List> sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); - Map sumCardSpendVoForOwner(WxCardSpend wxCardSpend); + List> sumCardSpendVoForOwner(WxCardSpend wxCardSpend); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index f71e0c672..4d259b410 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -7,6 +7,7 @@ import com.iformall.domain.vo.WxCardSpendVo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; public interface WxCardSpendService { @@ -42,7 +43,7 @@ public interface WxCardSpendService { * @param record * @return */ - Map sumCardSpendForMerchant(WxCardSpendVo record); + List> sumCardSpendForMerchant(WxCardSpendVo record); /** * 根据实体SUM @@ -50,7 +51,7 @@ public interface WxCardSpendService { * @param record * @return */ - Map sumCardSpendForOwner(WxCardSpendVo record); + List> sumCardSpendForOwner(WxCardSpendVo record); /** * 根据Id获得实体 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 ded1a1a2c..167edc19a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -248,12 +248,12 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } @Override - public Map sumCardSpendForMerchant(WxCardSpendVo record) { + public List> sumCardSpendForMerchant(WxCardSpendVo record) { return wxCardSpendMapper.sumCardSpendVoForMerchant(record); } @Override - public Map sumCardSpendForOwner(WxCardSpendVo record) { + public List> sumCardSpendForOwner(WxCardSpendVo record) { return wxCardSpendMapper.sumCardSpendVoForOwner(record); }