| @@ -113,8 +113,8 @@ public class WxCardPayController extends BaseController { | |||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxCardSpend.setTenantId(user.getTenantId()); | wxCardSpend.setTenantId(user.getTenantId()); | ||||
| final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(map); | |||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(mapList); | |||||
| } | } | ||||
| @ApiOperation("交易流水导出") | @ApiOperation("交易流水导出") | ||||
| @@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| /** | /** | ||||
| @@ -62,7 +63,7 @@ public class WxCardPayController extends BaseController { | |||||
| WxMerchantBUser user = getUser(); | WxMerchantBUser user = getUser(); | ||||
| wxCardSpend.setTenantId(user.getTenantId()); | wxCardSpend.setTenantId(user.getTenantId()); | ||||
| wxCardSpend.setMerchantId(user.getMerchantId()); | wxCardSpend.setMerchantId(user.getMerchantId()); | ||||
| final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(map); | |||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(mapList); | |||||
| } | } | ||||
| } | } | ||||
| @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| /** | /** | ||||
| @@ -162,7 +163,7 @@ public class WxCardPayController extends BaseController { | |||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| wxCardSpend.setTenantId(user.getTenantId()); | wxCardSpend.setTenantId(user.getTenantId()); | ||||
| wxCardSpend.setOwnerId(user.getId()); | wxCardSpend.setOwnerId(user.getId()); | ||||
| final Map map = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | |||||
| return new ResultData(map); | |||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | |||||
| return new ResultData(mapList); | |||||
| } | } | ||||
| } | } | ||||
| @@ -13,9 +13,9 @@ public interface WxCardSpendMapper extends CommonMapper<WxCardSpend, Long> { | |||||
| List<WxCardSpendVo> findCardSpendVoList(WxCardSpend wxCardSpend); | List<WxCardSpendVo> findCardSpendVoList(WxCardSpend wxCardSpend); | ||||
| Map sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); | |||||
| List<Map<String,Object>> sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); | |||||
| Map sumCardSpendVoForOwner(WxCardSpend wxCardSpend); | |||||
| List<Map<String,Object>> sumCardSpendVoForOwner(WxCardSpend wxCardSpend); | |||||
| @@ -7,6 +7,7 @@ import com.iformall.domain.vo.WxCardSpendVo; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| public interface WxCardSpendService { | public interface WxCardSpendService { | ||||
| @@ -42,7 +43,7 @@ public interface WxCardSpendService { | |||||
| * @param record | * @param record | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| Map<String, Object> sumCardSpendForMerchant(WxCardSpendVo record); | |||||
| List<Map<String, Object>> sumCardSpendForMerchant(WxCardSpendVo record); | |||||
| /** | /** | ||||
| * 根据实体SUM | * 根据实体SUM | ||||
| @@ -50,7 +51,7 @@ public interface WxCardSpendService { | |||||
| * @param record | * @param record | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| Map<String, Object> sumCardSpendForOwner(WxCardSpendVo record); | |||||
| List<Map<String, Object>> sumCardSpendForOwner(WxCardSpendVo record); | |||||
| /** | /** | ||||
| * 根据Id获得实体 | * 根据Id获得实体 | ||||
| @@ -248,12 +248,12 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<String, Object> sumCardSpendForMerchant(WxCardSpendVo record) { | |||||
| public List<Map<String, Object>> sumCardSpendForMerchant(WxCardSpendVo record) { | |||||
| return wxCardSpendMapper.sumCardSpendVoForMerchant(record); | return wxCardSpendMapper.sumCardSpendVoForMerchant(record); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<String, Object> sumCardSpendForOwner(WxCardSpendVo record) { | |||||
| public List<Map<String, Object>> sumCardSpendForOwner(WxCardSpendVo record) { | |||||
| return wxCardSpendMapper.sumCardSpendVoForOwner(record); | return wxCardSpendMapper.sumCardSpendVoForOwner(record); | ||||
| } | } | ||||