diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 6bac177c4..bbc8c14ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -108,10 +110,10 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpendVo.setSources(sources); - wxCardSpendVo.setCardSpendListShow(1); + //List sources = new ArrayList(); + //sources.add(EnumMerchantSubsidySource.CARD.getCode()); + //wxCardSpendVo.setSources(sources); + // wxCardSpendVo.setCardSpendListShow(1); wxCardSpendVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); @@ -125,11 +127,11 @@ public class WxCardPayController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } wxCardSpend.updateTenantInfo(getTenantInfo()); - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpend.setSources(sources); - wxCardSpend.setCardSpendListShow(1); - final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); +// List sources = new ArrayList(); +// sources.add(EnumMerchantSubsidySource.CARD.getCode()); +// wxCardSpend.setSources(sources); +// wxCardSpend.setCardSpendListShow(1); + final Map mapList = wxCardSpendService.sumCardSpend(wxCardSpend); return new ResultData(mapList); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 08cdd0bcc..105db9882 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -89,10 +89,10 @@ public class WxCardPayController extends BaseController { WxMerchantBUser user = getLoginBUser(); wxCardSpendVo.updateTenantInfo(user); wxCardSpendVo.setMerchantId(user.getMerchantId()); - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpendVo.setSources(sources); - wxCardSpendVo.setCardSpendListShow(1); +// List sources = new ArrayList(); +// sources.add(EnumMerchantSubsidySource.CARD.getCode()); +// wxCardSpendVo.setSources(sources); +// wxCardSpendVo.setCardSpendListShow(1); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } @@ -106,11 +106,11 @@ public class WxCardPayController extends BaseController { WxMerchantBUser user = getLoginBUser(); wxCardSpend.updateTenantInfo(user); wxCardSpend.setMerchantId(user.getMerchantId()); - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpend.setSources(sources); - wxCardSpend.setCardSpendListShow(1); - final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); +// List sources = new ArrayList(); +// sources.add(EnumMerchantSubsidySource.CARD.getCode()); +// wxCardSpend.setSources(sources); +// wxCardSpend.setCardSpendListShow(1); + final Map mapList = wxCardSpendService.sumCardSpend(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 7d716a2a0..afa220d75 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -1,5 +1,6 @@ package com.iformall.mapper; +import java.math.BigDecimal; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCardSpend; @@ -17,9 +18,7 @@ public interface WxCardSpendMapper extends CommonMapper { List getMerchantIdList(WxCardSpend wxCardSpend); - List> sumCardSpendVoForMerchant(WxCardSpendVo wxCardSpend); - - List> sumCardSpendVoForOwner(WxCardSpendVo wxCardSpend); + Map sumCardSpend(WxCardSpendVo wxCardSpend); /** * POS diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index 6aad1ce79..d2c363619 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -11,6 +11,8 @@ import com.iformall.exception.MallinkException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -46,15 +48,7 @@ public interface WxCardSpendService { * @param record * @return */ - List> sumCardSpendForMerchant(WxCardSpendVo record); - - /** - * 根据实体SUM - * - * @param record - * @return - */ - List> sumCardSpendForOwner(WxCardSpendVo record); + Map sumCardSpend(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 6ad5d1418..87aa77064 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -607,19 +607,19 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } } } - if (null != record.getStatus() || null != record.getSources() || null != record.getCardSpendListShow()) { - WxMerchantSubsidy subq = new WxMerchantSubsidy(); - subq.updateTenantInfo(record); - subq.setStatus(record.getStatus()); - subq.setSourceList(record.getSources()); - subq.setCardSpendListShow(record.getCardSpendListShow()); - List orderList = wxMerchantSubsidyMapper.findOrderIdList(subq); - if (null == orderList || orderList.size() <=0 ){ - record.setId(-999L); - }else { - record.setOrderIdList(orderList); - } - } +// if (null != record.getStatus() || null != record.getSources() || null != record.getCardSpendListShow()) { +// WxMerchantSubsidy subq = new WxMerchantSubsidy(); +// subq.updateTenantInfo(record); +// subq.setStatus(record.getStatus()); +// subq.setSourceList(record.getSources()); +// subq.setCardSpendListShow(record.getCardSpendListShow()); +// List orderList = wxMerchantSubsidyMapper.findOrderIdList(subq); +// if (null == orderList || orderList.size() <=0 ){ +// record.setId(-999L); +// }else { +// record.setOrderIdList(orderList); +// } +// } if (StringUtils.isNotBlank(record.getOuPhone())) { WxCUserBasicInfo uq = new WxCUserBasicInfo(); @@ -635,46 +635,25 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } @Override - public List> sumCardSpendForMerchant(WxCardSpendVo record) { + public Map sumCardSpend(WxCardSpendVo record) { handleQueryParam(record); - List merchantIdList = wxCardSpendMapper.getMerchantIdList(record); - Map merchantMap = this.getMerchantMap(merchantIdList, record); - WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList); - List> merchantSubsidyMap = wxMerchantSubsidyMapper.sumByMerchantId(sq); - 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", (BigDecimal)result.get("sum_subsidy")); - submap.put("sum_real_subsidy", (BigDecimal)result.get("sum_real_subsidy")); - msmap.put((Long)result.get("merchant_id"), submap) ; - } - } + //补贴暂时不算 +// List merchantIdList = wxCardSpendMapper.getMerchantIdList(record); +// Map merchantMap = this.getMerchantMap(merchantIdList, record); +// WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList); +// List> merchantSubsidyMap = wxMerchantSubsidyMapper.sumByMerchantId(sq); +// 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", (BigDecimal)result.get("sum_subsidy")); +// submap.put("sum_real_subsidy", (BigDecimal)result.get("sum_real_subsidy")); +// msmap.put((Long)result.get("merchant_id"), submap) ; +// } +// } - List> resultList = wxCardSpendMapper.sumCardSpendVoForMerchant(record); - if (null != resultList && resultList.size() > 0 ) { - for (int i = 0 ; i < resultList.size(); i++) { - Map result = resultList.get(i); - Long merchantId = (Long)result.get("merchant_id") ; - if (null != merchantId) { - WxMerchant merchant = merchantMap.get(merchantId); - if (null != merchant) { - result.put("merchantName", merchant.getName()); - } - 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"))); - }else { - result.put("sum_subsidy", 0); - result.put("sum_real_subsidy", 0); - } - } - } - } - - return resultList; + return wxCardSpendMapper.sumCardSpend(record); } private WxMerchantSubsidy getWxMerchantSubsidyQuery(WxCardSpendVo record,List merchantIdList) { @@ -689,28 +668,6 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { return sq; } - @Override - public List> sumCardSpendForOwner(WxCardSpendVo record) { - handleQueryParam(record); - List merchantIdList = wxCardSpendMapper.getMerchantIdList(record); - WxMerchantSubsidy sq = getWxMerchantSubsidyQuery(record,merchantIdList); - Map submap = wxMerchantSubsidyMapper.sum(sq); - List> resultList = wxCardSpendMapper.sumCardSpendVoForOwner(record); - if (null != resultList && resultList.size() > 0 ) { - for (int i = 0 ; i < resultList.size(); i++) { - Map result = resultList.get(i); - if (null != submap) { - result.put("sum_subsidy", (null == submap.get("sum_subsidy"))?0:submap.get("sum_subsidy")); - result.put("sum_real_subsidy", (null == submap.get("sum_real_subsidy")?0:submap.get("sum_real_subsidy"))); - }else { - result.put("sum_subsidy", 0); - result.put("sum_real_subsidy", 0); - } - } - } - return resultList; - } - @Override public WxCardSpend getById(Long id) { return wxCardSpendMapper.selectById(id); diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 4d1d338f7..ed33ba1e8 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -263,32 +263,15 @@ - + select IFNULL(SUM(cs.`deduction_amount`),0) as sum_deduction_amount, IFNULL(SUM(cs.`payment`),0) as sum_payment, IFNULL(SUM(cs.`real_payment`),0) as sum_real_payment from wx_card_spend cs - group by cs.merchant_id - -