|
|
@@ -5,12 +5,14 @@ import com.iformall.annotation.SystemControllerLog; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.domain.dto.WxOrderReportDto; |
|
|
import com.iformall.domain.dto.WxOrderReportDto; |
|
|
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
import com.iformall.domain.vo.WxMerchantMicroPayVo; |
|
|
import com.iformall.domain.vo.WxMerchantMicroPayVo; |
|
|
import com.iformall.enums.EnumOrderStatus; |
|
|
import com.iformall.enums.EnumOrderStatus; |
|
|
import com.iformall.enums.EnumOrderType; |
|
|
import com.iformall.enums.EnumOrderType; |
|
|
import com.iformall.service.MarkingDataReportService; |
|
|
import com.iformall.service.MarkingDataReportService; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
@@ -31,8 +33,13 @@ public class WxMerchantMicroPayController extends BaseController { |
|
|
@SystemControllerLog(description = "收银台-近30日刷卡列表") |
|
|
@SystemControllerLog(description = "收银台-近30日刷卡列表") |
|
|
public ResultData listMonth() { |
|
|
public ResultData listMonth() { |
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); |
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); |
|
|
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
|
|
if(StringUtils.isBlank(tenantEntity.getTenantId())){ |
|
|
|
|
|
//todo 集团版查询数据待重构 |
|
|
|
|
|
return new ResultData("集团版查询数据待重构"); |
|
|
|
|
|
} |
|
|
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); |
|
|
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); |
|
|
wxOrderReportDto.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
|
|
|
wxOrderReportDto.updateTenantInfo(tenantEntity); |
|
|
wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); |
|
|
wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); |
|
|
wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); |
|
|
return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); |
|
|
@@ -44,8 +51,13 @@ public class WxMerchantMicroPayController extends BaseController { |
|
|
@SystemControllerLog(description = "收银台-近30日刷卡列表详情") |
|
|
@SystemControllerLog(description = "收银台-近30日刷卡列表详情") |
|
|
public ResultData detail(@RequestParam Long merchantId) { |
|
|
public ResultData detail(@RequestParam Long merchantId) { |
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); |
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); |
|
|
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
|
|
if(StringUtils.isBlank(tenantEntity.getTenantId())){ |
|
|
|
|
|
//todo 集团版查询数据待重构 |
|
|
|
|
|
return new ResultData("集团版查询数据待重构"); |
|
|
|
|
|
} |
|
|
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); |
|
|
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); |
|
|
wxOrderReportDto.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
|
|
|
wxOrderReportDto.updateTenantInfo(tenantEntity); |
|
|
wxOrderReportDto.setMerchantId(merchantId); |
|
|
wxOrderReportDto.setMerchantId(merchantId); |
|
|
return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); |
|
|
return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); |
|
|
} |
|
|
} |
|
|
@@ -55,9 +67,14 @@ public class WxMerchantMicroPayController extends BaseController { |
|
|
@SystemControllerLog(description = "收银台-获得昨日刷卡列表") |
|
|
@SystemControllerLog(description = "收银台-获得昨日刷卡列表") |
|
|
public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) { |
|
|
public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) { |
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); |
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); |
|
|
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
|
|
if(StringUtils.isBlank(tenantEntity.getTenantId())){ |
|
|
|
|
|
//todo 集团版查询数据待重构 |
|
|
|
|
|
return new ResultData("集团版查询数据待重构"); |
|
|
|
|
|
} |
|
|
if (wxOrderReportDto == null) |
|
|
if (wxOrderReportDto == null) |
|
|
wxOrderReportDto = new WxOrderReportDto(); |
|
|
wxOrderReportDto = new WxOrderReportDto(); |
|
|
wxOrderReportDto.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
|
|
|
wxOrderReportDto.updateTenantInfo(tenantEntity); |
|
|
final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); |
|
|
final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
|