|
|
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.vo.WxCardSpendVo; |
|
|
import com.iformall.domain.vo.WxCardSpendVo; |
|
|
|
|
|
import com.iformall.enums.EnumMerchantSubsidySource; |
|
|
import com.iformall.service.WxCardSpendService; |
|
|
import com.iformall.service.WxCardSpendService; |
|
|
import com.iformall.service.WxMerchantService; |
|
|
import com.iformall.service.WxMerchantService; |
|
|
import com.iformall.service.WxOrderService; |
|
|
import com.iformall.service.WxOrderService; |
|
|
@@ -17,6 +18,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.ArrayList; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
@@ -50,6 +52,10 @@ public class WxCardPayController extends BaseController { |
|
|
WxMerchantBUser user = getLoginBUser(); |
|
|
WxMerchantBUser user = getLoginBUser(); |
|
|
wxCardSpendVo.updateTenantInfo(user); |
|
|
wxCardSpendVo.updateTenantInfo(user); |
|
|
wxCardSpendVo.setMerchantId(user.getMerchantId()); |
|
|
wxCardSpendVo.setMerchantId(user.getMerchantId()); |
|
|
|
|
|
List<Integer> sources = new ArrayList<Integer>(); |
|
|
|
|
|
sources.add(EnumMerchantSubsidySource.CARD.getCode()); |
|
|
|
|
|
wxCardSpendVo.setSources(sources); |
|
|
|
|
|
wxCardSpendVo.setCardSpendListShow(1); |
|
|
final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); |
|
|
final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
@@ -63,6 +69,10 @@ public class WxCardPayController extends BaseController { |
|
|
WxMerchantBUser user = getLoginBUser(); |
|
|
WxMerchantBUser user = getLoginBUser(); |
|
|
wxCardSpend.updateTenantInfo(user); |
|
|
wxCardSpend.updateTenantInfo(user); |
|
|
wxCardSpend.setMerchantId(user.getMerchantId()); |
|
|
wxCardSpend.setMerchantId(user.getMerchantId()); |
|
|
|
|
|
List<Integer> sources = new ArrayList<Integer>(); |
|
|
|
|
|
sources.add(EnumMerchantSubsidySource.CARD.getCode()); |
|
|
|
|
|
wxCardSpend.setSources(sources); |
|
|
|
|
|
wxCardSpend.setCardSpendListShow(1); |
|
|
final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); |
|
|
final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); |
|
|
return new ResultData(mapList); |
|
|
return new ResultData(mapList); |
|
|
} |
|
|
} |
|
|
|