winter il y a 1 an
Parent
révision
8ffefad5b5
3 fichiers modifiés avec 0 ajouts et 239 suppressions
  1. +0
    -124
      yqzjAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java
  2. +0
    -73
      yqzjAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java
  3. +0
    -42
      yqzjService/src/main/java/com/iformall/service/MarkingDataReportService.java

+ 0
- 124
yqzjAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java Voir le fichier

@@ -1,124 +0,0 @@
package com.iformall.controller.market;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.MarkingCouponDataReportDto;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.service.MarkingDataReportService;
import com.iformall.service.WxMallService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
* Created by syf on 2018/8/29.
*/
@RestController
@RequestMapping("markingDataReport")
@Api(description = "营销报表接口")
public class MarkingDataReportController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private MarkingDataReportService markingDataReportService;
@Autowired
private WxMallService wxMallService;

@TenantIgnore
@ApiOperation("查询券数据")
@GetMapping("/couponData")
@SystemControllerLog(description = "券数据-查询券数据")
public ResultData findCouponData() {
logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponData");
return new ResultData(markingDataReportService.getCouponData(getTenantInfo()));
}

@TenantIgnore
@ApiOperation("查询券数据列表")
@GetMapping("/couponDataList")
@SystemControllerLog(description = "券数据-查询券数据列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData findCouponDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponDataList");
return new ResultData(markingDataReportService.getCouponDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize));
}

@TenantIgnore
@ApiOperation("查询场景投放券数据")
@GetMapping("/sceneData")
@SystemControllerLog(description = "券数据-查询场景投放券数据")
public ResultData findSceneData() {
logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneData");
return new ResultData(markingDataReportService.getSceneData(getTenantInfo()));
}

@TenantIgnore
@ApiOperation("查询场景营销数据列表")
@GetMapping("/sceneDataList")
@SystemControllerLog(description = "券数据-查询场景营销数据列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData findSceneDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneDataList");
return new ResultData(markingDataReportService.getSceneDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize));
}

@TenantIgnore
@ApiOperation("查询触达用户数数据")
@GetMapping("/touchUsersData")
@SystemControllerLog(description = "券数据-查询触达用户数数据")
public ResultData touchUsersData() {
logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersData");
return new ResultData(markingDataReportService.getTouchUsersReportData(getTenantInfo()));
}

@TenantIgnore
@ApiOperation("查询触达用户数数据列表")
@GetMapping("/touchUsersDataList")
@SystemControllerLog(description = "券数据-查询触达用户数数据列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData touchUsersDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersDataList");
TenantEntity tenantInfo = getTenantInfo();
//List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantInfo);
//markingCouponDataReportDto.setTenantEntitys(tenantEntitys);
markingCouponDataReportDto.updateTenantInfo(tenantInfo);
markingCouponDataReportDto.setTenantEntity(tenantInfo);
return new ResultData(markingDataReportService.getTouchUsersReportList(markingCouponDataReportDto, pageNum, pageSize));
}

@TenantIgnore
@ApiOperation("触达用户数数据导出")
@GetMapping("/exportTouchUsersData")
@SystemControllerLog(description = "券数据-触达用户数数据导出")
public void exportTouchUsersData(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, HttpServletRequest request, HttpServletResponse response) {
TenantEntity tenantInfo = getTenantInfo();
//List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantInfo);
//markingCouponDataReportDto.setTenantEntitys(tenantEntitys);
markingCouponDataReportDto.updateTenantInfo(tenantInfo);
markingCouponDataReportDto.setTenantEntity(tenantInfo);
markingDataReportService.exportTouchUsersData(request, response, markingCouponDataReportDto);
}


}

+ 0
- 73
yqzjAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java Voir le fichier

@@ -1,73 +0,0 @@
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxOrderReportDto;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxMerchantMicroPayVo;
import com.iformall.enums.EnumOrderStatus;
import com.iformall.enums.EnumOrderType;
import com.iformall.service.MarkingDataReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


@RestController
@RequestMapping("wxMerchantMicroPay")
@Api(description = "B端收银台相关接口")
public class WxMerchantMicroPayController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private MarkingDataReportService markingDataReportService;

@TenantIgnore
@ApiOperation("获得商场近30日刷卡")
@GetMapping("/listMonth")
@SystemControllerLog(description = "收银台-近30日刷卡列表")
public ResultData listMonth() {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth");
TenantEntity tenantEntity = getTenantInfo();
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();
wxOrderReportDto.updateTenantInfo(tenantEntity);
wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode());
wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto));
}

@TenantIgnore
@ApiOperation("获商户得近30日刷卡")
@GetMapping("/detail")
@SystemControllerLog(description = "收银台-近30日刷卡列表详情")
public ResultData detail(@RequestParam Long merchantId) {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail");
TenantEntity tenantEntity = getTenantInfo();
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();
wxOrderReportDto.updateTenantInfo(tenantEntity);
wxOrderReportDto.setMerchantId(merchantId);
return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto));
}

@TenantIgnore
@ApiOperation("获得昨日刷卡列表")
@GetMapping("/listYesterday")
@SystemControllerLog(description = "收银台-获得昨日刷卡列表")
public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday");
TenantEntity tenantEntity = getTenantInfo();
if (wxOrderReportDto == null)
wxOrderReportDto = new WxOrderReportDto();
wxOrderReportDto.updateTenantInfo(tenantEntity);
final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize);
return new ResultData(page);
}

}

+ 0
- 42
yqzjService/src/main/java/com/iformall/service/MarkingDataReportService.java Voir le fichier

@@ -1,42 +0,0 @@
package com.iformall.service;

import com.github.pagehelper.PageInfo;
import com.iformall.domain.dto.MarkingCouponDataReportDto;
import com.iformall.domain.dto.WxOrderReportDto;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**
* Created by syf on 2018/8/28.
*/
public interface MarkingDataReportService {
Map<String,Object> getCouponData(TenantEntity tenantEntity);

Map<String,Object> getSceneData(TenantEntity tenantEntity);

Map<String,Object> getSceneDataHistory(TenantEntity tenantEntity, String startDate, String endDate);

PageInfo<MarkingCouponDataReportVo> getCouponDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize);

PageInfo<MarkingSceneDataVo> getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize);

PageInfo<TouchUsersReportVo> getTouchUsersReportList(MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize);

List<TouchUsersReportVo> getTouchUsersReportData(TenantEntity tenantEntity);



Map<String, Object> listOrderReportByDate(WxOrderReportDto wxOrderReportDto);

List<WxOrderReportVo> listMicroPayOrderReportByDateAndMerchant(WxOrderReportDto wxOrderReportDto);

PageInfo<WxMerchantMicroPayVo> listMerchantMicroPayOrderReportByDate(WxOrderReportDto wxOrderReportDto,Integer pageNum, Integer pageSize);

void exportTouchUsersData(HttpServletRequest request, HttpServletResponse response, MarkingCouponDataReportDto markingCouponDataReportDto);

}

Chargement…
Annuler
Enregistrer