|
|
|
@@ -8,6 +8,7 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.MallUserInfo; |
|
|
|
import com.iformall.domain.po.WxCreditHistory; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.WxCreditHistoryVo; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxCreditHistoryService; |
|
|
|
@@ -42,7 +43,12 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); |
|
|
|
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); |
|
|
|
wxCreditHistory.updateTenantInfo(getTenantInfo()); |
|
|
|
TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
}else{ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
final PageInfo<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
@@ -111,7 +117,13 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
@GetMapping("exportData") |
|
|
|
@SystemControllerLog(description = "积分历史-导出数据") |
|
|
|
public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
wxCreditHistory.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxCreditHistory.updateTenantInfo(getTenantInfo()); |
|
|
|
TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
}else{ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
wxCreditHistoryService.exportData(request, response, wxCreditHistory); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -120,7 +132,13 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
@SystemControllerLog(description = "积分历史-积分统计概览") |
|
|
|
public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); |
|
|
|
wxCreditHistory.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxCreditHistory.updateTenantInfo(getTenantInfo()); |
|
|
|
TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
}else{ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
return wxCreditHistoryService.getCreditSummary(wxCreditHistory); |
|
|
|
} |
|
|
|
|
|
|
|
|