From 097b332e431dad2e2d2248859a140fdfb4670d5d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 5 Nov 2020 17:30:23 +0800 Subject: [PATCH] fix bug --- .../com/iformall/controller/WxCardPayController.java | 10 ++++++++++ .../com/iformall/controller/WxCardPayController.java | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 4474aaa46..8c5bda4fd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCardSpendVo; +import com.iformall.enums.EnumMerchantSubsidySource; import com.iformall.service.WxCardSpendService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxOrderService; @@ -17,6 +18,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -50,6 +52,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); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } @@ -63,6 +69,10 @@ 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); 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 ec71846c6..7ecbf1a61 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,6 +34,7 @@ import com.iformall.domain.po.WxOrder; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumMerchantSubsidySource; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; import com.iformall.service.WxCUserBasicInfoService; @@ -214,6 +216,10 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); wxCardSpend.updateTenantInfo(getTenantInfo()); wxCardSpend.setOwnerId(cUserId); + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpend.setSources(sources); + wxCardSpend.setCardSpendListShow(1); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); }