Explorar el Código

fix bug

release_toaliyun_real
xiaohanzi hace 5 años
padre
commit
097b332e43
Se han modificado 2 ficheros con 16 adiciones y 0 borrados
  1. +10
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java
  2. +6
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java

+ 10
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java Ver fichero

@@ -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);
} }


+ 6
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java Ver fichero

@@ -2,6 +2,7 @@ package com.iformall.controller;




import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;


@@ -33,6 +34,7 @@ import com.iformall.domain.po.WxOrder;
import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardSpendVo;
import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumCreditLockedStatus;
import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumMerchantStatus;
import com.iformall.enums.EnumMerchantSubsidySource;
import com.iformall.enums.EnumPayWay; import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserBasicInfoService;
@@ -214,6 +216,10 @@ public class WxCardPayController extends BaseController {
if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo();
wxCardSpend.updateTenantInfo(getTenantInfo()); wxCardSpend.updateTenantInfo(getTenantInfo());
wxCardSpend.setOwnerId(cUserId); wxCardSpend.setOwnerId(cUserId);
List<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpend.setSources(sources);
wxCardSpend.setCardSpendListShow(1);
final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


Cargando…
Cancelar
Guardar