账户管理-当前账户状态
This commit is contained in:
gaowdong
parent
a305147524
commit
bfab0a154d
|
|
@ -2,6 +2,7 @@ package com.bonus.canteen.core.account.v3.api.vo;
|
|||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.bonus.canteen.core.account.v3.api.dto.AccStatisticsSumDTO;
|
||||
import com.bonus.canteen.core.account.v3.extension.ThirdAccountExtensionService;
|
||||
import com.bonus.canteen.core.account.v3.extension.dto.ThirdAccountSupportDTO;
|
||||
import com.bonus.canteen.core.account.v3.extension.dto.ThirdBalanceDTO;
|
||||
|
|
@ -84,6 +85,10 @@ public class AccInfoServiceV3Api {
|
|||
}
|
||||
}
|
||||
|
||||
public AccStatisticsSumVO accStatisticsSum(AccStatisticsSumDTO accStatisticsSumDTO) {
|
||||
return this.accInfoService.accStatisticsSum(accStatisticsSumDTO);
|
||||
}
|
||||
|
||||
// public ThirdBalanceVO queryThirdAccountInfo(MachineAccountInfoV3DTO macQueryParams) {
|
||||
// CustAccTemp custAccTempAccount = this.custAccTempService.checkAndGetAccountInfo(macQueryParams);
|
||||
// ThirdAccountSupportDTO thirdAccountSupportDTO = LeBeanUtil.copyCreateProperties(macQueryParams, ThirdAccountSupportDTO.class);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
package com.bonus.canteen.core.account.v3.api.vo;
|
||||
|
||||
public class AccStatisticsSumVO {
|
||||
private AccCountStatisticsVO accCountStatisticsVO;
|
||||
private AccCardStatisticsVO accCardStatisticsVO;
|
||||
|
||||
public AccCountStatisticsVO getAccCountStatisticsVO() {
|
||||
return this.accCountStatisticsVO;
|
||||
}
|
||||
|
||||
public AccCardStatisticsVO getAccCardStatisticsVO() {
|
||||
return this.accCardStatisticsVO;
|
||||
}
|
||||
|
||||
public AccStatisticsSumVO setAccCountStatisticsVO(final AccCountStatisticsVO accCountStatisticsVO) {
|
||||
this.accCountStatisticsVO = accCountStatisticsVO;
|
||||
return this;
|
||||
}
|
||||
|
||||
public AccStatisticsSumVO setAccCardStatisticsVO(final AccCardStatisticsVO accCardStatisticsVO) {
|
||||
this.accCardStatisticsVO = accCardStatisticsVO;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getAccCountStatisticsVO());
|
||||
return "AccStatisticsSumVO(accCountStatisticsVO=" + var10000 + ", accCardStatisticsVO=" + String.valueOf(this.getAccCardStatisticsVO()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
package com.bonus.canteen.core.account.v3.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.bonus.canteen.core.account.v3.api.dto.AccStatisticsSumDTO;
|
||||
import com.bonus.canteen.core.account.v3.api.vo.AccInfoDetailVO;
|
||||
import com.bonus.canteen.core.account.v3.api.vo.AccStatisticsSumVO;
|
||||
import com.bonus.canteen.core.account.v3.po.AccInfoAddPO;
|
||||
import com.bonus.canteen.core.account.v3.po.AccInfoUpdatePO;
|
||||
import com.bonus.canteen.core.account.v3.web.dto.*;
|
||||
|
|
@ -51,4 +53,5 @@ public interface AccInfoService {
|
|||
Page<AccExistFrozenListVO> queryFrozenAccPage(Page<?> page, AccExistFrozenPageDTO pageDTO);
|
||||
|
||||
List<AccInfoVO> queryAccBaseInfoList(List<Long> custIdList);
|
||||
AccStatisticsSumVO accStatisticsSum(AccStatisticsSumDTO accStatisticsSumDTO);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,17 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bonus.canteen.core.account.v3.api.dto.AccStatisticsSumDTO;
|
||||
import com.bonus.canteen.core.account.v3.api.vo.AccCardStatisticsVO;
|
||||
import com.bonus.canteen.core.account.v3.api.vo.AccCountStatisticsVO;
|
||||
import com.bonus.canteen.core.account.v3.api.vo.AccStatisticsSumVO;
|
||||
import com.bonus.canteen.core.account.v3.model.AccWalletInfo;
|
||||
import com.bonus.canteen.core.account.v3.po.AccInfoAddPO;
|
||||
import com.bonus.canteen.core.account.v3.service.AccOperationRecordService;
|
||||
import com.bonus.canteen.core.account.v3.web.dto.*;
|
||||
import com.bonus.canteen.core.account.v3.web.vo.*;
|
||||
import com.bonus.canteen.core.auth.api.MgrAuthApi;
|
||||
import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
|
||||
import com.bonus.canteen.core.common.page.PageVO;
|
||||
import com.bonus.canteen.core.customer.v4.web.model.AccCard;
|
||||
import com.bonus.common.core.exception.ServiceException;
|
||||
|
|
@ -84,6 +90,9 @@ public class AccInfoServiceImpl extends ServiceImpl<AccInfoMapper, AccInfo> impl
|
|||
@Autowired
|
||||
@Lazy
|
||||
private AccOperationRecordService accOperationRecordService;
|
||||
@Autowired
|
||||
@Lazy
|
||||
private MgrAuthApi mgrAuthApi;
|
||||
|
||||
@Override
|
||||
public AccInfoDetailVO getAccInfoDetail(AccInfoDetailDTO content) {
|
||||
|
|
@ -365,5 +374,18 @@ public class AccInfoServiceImpl extends ServiceImpl<AccInfoMapper, AccInfo> impl
|
|||
public List<AccInfoVO> queryAccBaseInfoList(List<Long> custIdList) {
|
||||
return ((AccInfoMapper)this.baseMapper).queryAccBaseInfoList(custIdList);
|
||||
}
|
||||
public AccStatisticsSumVO accStatisticsSum(AccStatisticsSumDTO accStatisticsSumDTO) {
|
||||
MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
CompletableFuture<AccCountStatisticsVO> accCountFuture = CompletableFuture.supplyAsync(() -> {
|
||||
return ((AccInfoMapper)this.baseMapper).accCountStatistics(accStatisticsSumDTO, authPO);
|
||||
}, this.asyncTaskExecutor);
|
||||
CompletableFuture<AccCardStatisticsVO> accCardFuture = CompletableFuture.supplyAsync(() -> {
|
||||
return ((AccInfoMapper)this.baseMapper).accCardStatistics(accStatisticsSumDTO, authPO);
|
||||
}, this.asyncTaskExecutor);
|
||||
CompletableFuture<AccStatisticsSumVO> result = accCountFuture.thenCombine(accCardFuture, (accCount, accCard) -> {
|
||||
return (new AccStatisticsSumVO()).setAccCountStatisticsVO(accCount).setAccCardStatisticsVO(accCard);
|
||||
});
|
||||
return (AccStatisticsSumVO)result.join();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,88 @@
|
|||
package com.bonus.canteen.core.account.v3.web.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.bonus.canteen.core.account.v3.service.AccFrozenService;
|
||||
import com.bonus.canteen.core.account.v3.service.AccInfoService;
|
||||
import com.bonus.canteen.core.account.v3.service.AccTradeService;
|
||||
import com.bonus.canteen.core.account.v3.web.dto.*;
|
||||
import com.bonus.canteen.core.account.v3.web.vo.AccExistFrozenListVO;
|
||||
import com.bonus.canteen.core.account.v3.web.vo.AccFrozenPageSumVO;
|
||||
import com.bonus.canteen.core.account.v3.web.vo.AccUnFrozenPageSumVO;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.aspectj.weaver.loadtime.Aj;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
@RestController
|
||||
@RequestMapping({"/api/v3/acc/frozen"})
|
||||
@Api(
|
||||
value = "ly-账户余额冻结解冻v3",
|
||||
tags = {"ly-账户余额冻结解冻v3"}
|
||||
)
|
||||
public class AccFrozenController {
|
||||
private static final Logger log = LoggerFactory.getLogger(AccFrozenController.class);
|
||||
@Autowired
|
||||
private AccFrozenService accFrozenService;
|
||||
@Autowired
|
||||
@Lazy
|
||||
private AccTradeService accTradeService;
|
||||
@Autowired
|
||||
@Lazy
|
||||
private AccInfoService accInfoService;
|
||||
|
||||
@PostMapping({"/single/frozen"})
|
||||
@ApiOperation("钱包单人冻结")
|
||||
public AjaxResult singleAccFrozen(@RequestBody @Valid AccFrozenDTO request) {
|
||||
this.accFrozenService.singleAccFrozen(request);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@PostMapping({"/batch/frozen"})
|
||||
@ApiOperation("钱包批量冻结")
|
||||
public AjaxResult batchFrozenAccUpdate(@RequestBody @Valid AccFrozenBatchDTO request) {
|
||||
this.accFrozenService.batchFrozenAccUpdate(request);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@PostMapping({"/single/unfrozen"})
|
||||
@ApiOperation("钱包单人解冻")
|
||||
public AjaxResult singleAccUnFrozen(@RequestBody @Valid AccUnFreezeDTO request) {
|
||||
this.accFrozenService.singleAccUnFrozen(request);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@PostMapping({"/batch/unfrozen"})
|
||||
@ApiOperation("钱包批量解冻")
|
||||
public AjaxResult batchUnFrozenAccUpdate(@RequestBody @Valid AccUnFrozenBatchDTO request) {
|
||||
this.accFrozenService.batchUnFrozenAccUpdate(request);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@PostMapping({"/page/frozen"})
|
||||
@ApiOperation("冻结明细")
|
||||
public AjaxResult queryAccFrozenPage(@RequestBody AccFrozenPageDTO request) {
|
||||
return AjaxResult.success(this.accFrozenService.queryAccFrozenPage(request));
|
||||
}
|
||||
|
||||
@PostMapping({"/page/unfrozen"})
|
||||
@ApiOperation("解冻明细")
|
||||
public AjaxResult queryAccUnFrozenPage(@RequestBody AccFrozenPageDTO request) {
|
||||
return AjaxResult.success(this.accFrozenService.queryAccUnFrozenPage(request));
|
||||
}
|
||||
|
||||
@ApiOperation("查询存在冻结余额的人员列表")
|
||||
@PostMapping({"/cust/list"})
|
||||
public AjaxResult custListFrozen(@RequestBody AccExistFrozenPageDTO request) {
|
||||
return AjaxResult.success(this.accFrozenService.queryFrozenAccPage(request));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package com.bonus.canteen.core.marketing.coupon.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
|
||||
public class CouponDateSumDto {
|
||||
private LocalDate date;
|
||||
private BigDecimal balance;
|
||||
|
||||
public LocalDate getDate() {
|
||||
return this.date;
|
||||
}
|
||||
|
||||
public BigDecimal getBalance() {
|
||||
return this.balance;
|
||||
}
|
||||
|
||||
public void setDate(final LocalDate date) {
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public void setBalance(final BigDecimal balance) {
|
||||
this.balance = balance;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getDate());
|
||||
return "CouponDateSumDto(date=" + var10000 + ", balance=" + String.valueOf(this.getBalance()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.bonus.canteen.core.marketing.coupon.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.bonus.canteen.core.marketing.coupon.dto.CouponDateSumDto;
|
||||
import com.bonus.canteen.core.marketing.coupon.model.MktCouponDailyBalance;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface MktCouDailyBalanceMapper extends BaseMapper<MktCouponDailyBalance> {
|
||||
// List<CouponDateSumDto> calStartAndEnd(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
|
||||
}
|
||||
|
|
@ -3,6 +3,10 @@ package com.bonus.canteen.core.marketing.coupon.mapper;
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.bonus.canteen.core.marketing.coupon.model.MktCoupon;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@Mapper
|
||||
public interface MktCouponMapper extends BaseMapper<MktCoupon> {
|
||||
|
|
@ -35,7 +39,7 @@ public interface MktCouponMapper extends BaseMapper<MktCoupon> {
|
|||
// List<CouponCountDto> getCouponCountByFixedAndCustId(@Param("fixedId") Long fixedId, @Param("custIds") List<Long> custIds, @Param("now") String now);
|
||||
//
|
||||
// BigDecimal calculateDailyBalance();
|
||||
//
|
||||
|
||||
// BigDecimal calCouTotalAmout(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
|
||||
//
|
||||
// BigDecimal calOverdue(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,71 @@
|
|||
package com.bonus.canteen.core.marketing.coupon.model;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@TableName("mkt_coupon_daily_balance")
|
||||
@ApiModel("餐券每日余额表")
|
||||
public class MktCouponDailyBalance {
|
||||
@TableId
|
||||
@ApiModelProperty("主键自增")
|
||||
private Long id;
|
||||
@ApiModelProperty("当天日期")
|
||||
private LocalDate date;
|
||||
@ApiModelProperty("餐券余额")
|
||||
private BigDecimal balance;
|
||||
@ApiModelProperty("创建时间")
|
||||
private LocalDateTime crtime;
|
||||
@ApiModelProperty("更新时间")
|
||||
private LocalDateTime uptime;
|
||||
|
||||
public Long getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public LocalDate getDate() {
|
||||
return this.date;
|
||||
}
|
||||
|
||||
public BigDecimal getBalance() {
|
||||
return this.balance;
|
||||
}
|
||||
|
||||
public LocalDateTime getCrtime() {
|
||||
return this.crtime;
|
||||
}
|
||||
|
||||
public LocalDateTime getUptime() {
|
||||
return this.uptime;
|
||||
}
|
||||
|
||||
public void setId(final Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public void setDate(final LocalDate date) {
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public void setBalance(final BigDecimal balance) {
|
||||
this.balance = balance;
|
||||
}
|
||||
|
||||
public void setCrtime(final LocalDateTime crtime) {
|
||||
this.crtime = crtime;
|
||||
}
|
||||
|
||||
public void setUptime(final LocalDateTime uptime) {
|
||||
this.uptime = uptime;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
Long var10000 = this.getId();
|
||||
return "MktCouponDailyBalance(id=" + var10000 + ", date=" + String.valueOf(this.getDate()) + ", balance=" + String.valueOf(this.getBalance()) + ", crtime=" + String.valueOf(this.getCrtime()) + ", uptime=" + String.valueOf(this.getUptime()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@ import com.bonus.canteen.core.marketing.coupon.model.MktCoupon;
|
|||
import com.bonus.canteen.core.marketing.coupon.model.MktCouponMacPayModel;
|
||||
import com.bonus.canteen.core.marketing.coupon.model.MktCouponPayModel;
|
||||
import com.bonus.canteen.core.marketing.coupon.param.MktCouponMobileUsableParam;
|
||||
import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMetrics;
|
||||
import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMobileUsableVO;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -15,5 +16,6 @@ public interface MktCouponService extends IService<MktCoupon> {
|
|||
List<MktCouponMobileUsableVO> listElecMobileUsable(MktCouponMobileUsableParam param);
|
||||
|
||||
MktCouponPayModel getCouponAmountForMacPay(MktCouponMacPayModel macPayModel);
|
||||
// MktCouponMetrics getCouponReport(LocalDate startDate, LocalDate endDate);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bonus.canteen.core.marketing.coupon.dto.CouponDateSumDto;
|
||||
import com.bonus.canteen.core.marketing.coupon.mapper.MktCouDailyBalanceMapper;
|
||||
import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMetrics;
|
||||
import com.bonus.common.core.exception.ServiceException;
|
||||
import com.bonus.canteen.core.allocation.canteen.mapper.AllocCanteenMapper;
|
||||
import com.bonus.canteen.core.marketing.coupon.constants.MktCouponStateEnum;
|
||||
|
|
@ -50,6 +53,10 @@ public class MktCouponServiceImpl extends ServiceImpl<MktCouponMapper, MktCoupon
|
|||
@Autowired
|
||||
@Lazy
|
||||
private AllocCanteenMapper allocCanteenMapper;
|
||||
// @Resource
|
||||
// private MktCouponMapper mktCouponMapper;
|
||||
// @Resource
|
||||
// private MktCouDailyBalanceMapper mktCouDailyBalanceMapper;
|
||||
|
||||
public List<MktCoupon> listUsableElecCouponByCustId(Long custId) {
|
||||
List<MktCoupon> couponList = this.list(Wrappers
|
||||
|
|
@ -264,5 +271,28 @@ public class MktCouponServiceImpl extends ServiceImpl<MktCouponMapper, MktCoupon
|
|||
}
|
||||
}
|
||||
}
|
||||
// public MktCouponMetrics getCouponReport(LocalDate startDate, LocalDate endDate) {
|
||||
// MktCouponMetrics mktCouponMetrics = new MktCouponMetrics();
|
||||
// BigDecimal totalCouponGrant = this.mktCouponMapper.calCouTotalAmout(startDate, endDate);
|
||||
// BigDecimal couponExpired = this.mktCouponMapper.calOverdue(startDate, endDate);
|
||||
// List<CouponDateSumDto> dailyBalances = this.mktCouDailyBalanceMapper.calStartAndEnd(startDate, endDate);
|
||||
// Iterator var7 = dailyBalances.iterator();
|
||||
//
|
||||
// while(var7.hasNext()) {
|
||||
// CouponDateSumDto dailyBalance = (CouponDateSumDto)var7.next();
|
||||
// BigDecimal balance = dailyBalance.getBalance();
|
||||
// if (dailyBalance.getDate().equals(startDate)) {
|
||||
// mktCouponMetrics.setBeginCoupon(balance);
|
||||
// }
|
||||
//
|
||||
// if (dailyBalance.getDate().equals(endDate)) {
|
||||
// mktCouponMetrics.setEndCoupon(balance);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// mktCouponMetrics.setTotalCouponGrant(totalCouponGrant);
|
||||
// mktCouponMetrics.setCouponExpired(couponExpired);
|
||||
// return mktCouponMetrics;
|
||||
// }
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
package com.bonus.canteen.core.marketing.coupon.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class MktCouponMetrics {
|
||||
@ApiModelProperty("餐券发放总额")
|
||||
private BigDecimal totalCouponGrant;
|
||||
@ApiModelProperty("餐券过期总额")
|
||||
private BigDecimal couponExpired;
|
||||
@ApiModelProperty("开始的余额")
|
||||
private BigDecimal beginCoupon;
|
||||
@ApiModelProperty("结束的余额")
|
||||
private BigDecimal endCoupon;
|
||||
|
||||
public MktCouponMetrics() {
|
||||
this.totalCouponGrant = BigDecimal.ZERO;
|
||||
this.couponExpired = BigDecimal.ZERO;
|
||||
this.beginCoupon = BigDecimal.ZERO;
|
||||
this.endCoupon = BigDecimal.ZERO;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalCouponGrant() {
|
||||
return this.totalCouponGrant;
|
||||
}
|
||||
|
||||
public BigDecimal getCouponExpired() {
|
||||
return this.couponExpired;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginCoupon() {
|
||||
return this.beginCoupon;
|
||||
}
|
||||
|
||||
public BigDecimal getEndCoupon() {
|
||||
return this.endCoupon;
|
||||
}
|
||||
|
||||
public void setTotalCouponGrant(final BigDecimal totalCouponGrant) {
|
||||
this.totalCouponGrant = totalCouponGrant;
|
||||
}
|
||||
|
||||
public void setCouponExpired(final BigDecimal couponExpired) {
|
||||
this.couponExpired = couponExpired;
|
||||
}
|
||||
|
||||
public void setBeginCoupon(final BigDecimal beginCoupon) {
|
||||
this.beginCoupon = beginCoupon;
|
||||
}
|
||||
|
||||
public void setEndCoupon(final BigDecimal endCoupon) {
|
||||
this.endCoupon = endCoupon;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getTotalCouponGrant());
|
||||
return "MktCouponMetrics(totalCouponGrant=" + var10000 + ", couponExpired=" + String.valueOf(this.getCouponExpired()) + ", beginCoupon=" + String.valueOf(this.getBeginCoupon()) + ", endCoupon=" + String.valueOf(this.getEndCoupon()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,10 @@ import com.bonus.canteen.core.report.statistics.account.param.*;
|
|||
import com.bonus.canteen.core.report.statistics.account.service.*;
|
||||
import com.bonus.canteen.core.report.statistics.account.vo.*;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportBaseParam;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportFixParam;
|
||||
import com.bonus.canteen.core.report.vo.ReportBaseTotalVO;
|
||||
import com.bonus.common.core.exception.ServiceException;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
@ -30,12 +33,12 @@ import java.util.Optional;
|
|||
public class ReportAccountController {
|
||||
@Autowired
|
||||
private ReportAccountFlowService reportAccountFlowService;
|
||||
// @Autowired
|
||||
// private ReportAccountSummaryService reportAccountSummaryService;
|
||||
@Autowired
|
||||
private ReportAccountSummaryService reportAccountSummaryService;
|
||||
// @Autowired
|
||||
// private ReportAccountOperatorService reportAccountOperatorService;
|
||||
// @Autowired
|
||||
// private ReportAccountFixService reportAccountFixService;
|
||||
@Autowired
|
||||
private ReportAccountFixService reportAccountFixService;
|
||||
@Autowired
|
||||
private ReportAccountConsumeSumTypeService reportAccountConsumeSumTypeService;
|
||||
@Autowired
|
||||
|
|
@ -134,22 +137,21 @@ public class ReportAccountController {
|
|||
// return this.reportAccountFlowService.pageRechargeSourceSummary(param);
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("重新拉取时间段内数据，重新统计")
|
||||
// @PostMapping({"/fix"})
|
||||
// public LeResponse fix(@RequestBody LeRequest<ReportFixParam> request) {
|
||||
// ReportFixParam param = (ReportFixParam)request.getContent();
|
||||
// if (Objects.nonNull(param.getStartDate()) && Objects.nonNull(param.getEndDate())) {
|
||||
// long between = ChronoUnit.DAYS.between(param.getStartDate(), param.getEndDate());
|
||||
// if (between > 31L) {
|
||||
// throw new LeException("重新统计-查询日期范围不能大于31天");
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// Executors.doInTenant(param.getTenantId(), (s) -> {
|
||||
// this.reportAccountFixService.fix(param);
|
||||
// });
|
||||
// return LeResponse.succ("数据重新统计成功");
|
||||
// }
|
||||
@ApiOperation("重新拉取时间段内数据，重新统计")
|
||||
@PostMapping({"/fix"})
|
||||
public AjaxResult fix(@RequestBody ReportFixParam param) {
|
||||
if (Objects.nonNull(param.getStartDate()) && Objects.nonNull(param.getEndDate())) {
|
||||
long between = ChronoUnit.DAYS.between(param.getStartDate(), param.getEndDate());
|
||||
if (between > 31L) {
|
||||
throw new ServiceException("重新统计-查询日期范围不能大于31天");
|
||||
}
|
||||
}
|
||||
|
||||
Executors.doInTenant(param.getTenantId(), (s) -> {
|
||||
this.reportAccountFixService.fix(param);
|
||||
});
|
||||
return AjaxResult.success("数据重新统计成功");
|
||||
}
|
||||
//
|
||||
// /** @deprecated */
|
||||
// @ApiOperation("账户汇总表")
|
||||
|
|
@ -158,12 +160,12 @@ public class ReportAccountController {
|
|||
// public ReportAccountSummaryVO queryAccountSummary(@RequestBody @Valid LeRequest<ReportBaseParam> request) {
|
||||
// return this.reportAccountSummaryService.pageAccountSummary((ReportBaseParam)request.getContent());
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("账户数据总表/当前账户状态")
|
||||
// @PostMapping({"/data/total"})
|
||||
// public ReportAccountDataSumVO queryAccountDataSummary(@RequestBody @Valid LeRequest<ReportBaseParam> request) {
|
||||
// return this.reportAccountSummaryService.queryAccountDataSummary((ReportBaseParam)request.getContent());
|
||||
// }
|
||||
|
||||
@ApiOperation("账户数据总表/当前账户状态")
|
||||
@PostMapping({"/data/total"})
|
||||
public ReportAccountDataSumVO queryAccountDataSummary(@RequestBody @Valid ReportBaseParam request) {
|
||||
return this.reportAccountSummaryService.queryAccountDataSummary(request);
|
||||
}
|
||||
|
||||
@ApiOperation("用户个人消费钱包汇总")
|
||||
@PostMapping({"/wallet/consume/page"})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.bonus.canteen.core.report.statistics.account.model.ReportAccCardSummaryTask;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataCardNumParam;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataNumParam;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportBaseParam;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface ReportAccCardSummaryTaskMapper extends BaseMapper<ReportAccCardSummaryTask> {
|
||||
ReportAccountDataNumParam queryAccountDataNumSum(@Param("param") ReportBaseParam param);
|
||||
|
||||
ReportAccountDataCardNumParam queryAccountDataCardNumSum(@Param("param") ReportBaseParam param);
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
|
||||
import com.bonus.canteen.core.report.statistics.account.model.ReportAccountSummary;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportBaseParam;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface ReportAccountSummaryMapper extends BaseMapper<ReportAccountSummary> {
|
||||
// List<Long> listCustSummaryId(@Param("param") ReportAccountSummaryCustParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// List<ReportAccountSummaryCustVO> listCustSummary(@Param("param") ReportAccountSummaryCustParam param);
|
||||
//
|
||||
// ReportAccountSummaryCustVO getCustSummaryTotal(@Param("param") ReportAccountSummaryCustParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// List<ReportAccountSummaryTypeVO> listTypeSummary(@Param("param") ReportAccountSummaryTypeParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportAccountSummaryTypeVO getTypeSummaryTotal(@Param("param") ReportAccountSummaryTypeParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// List<ReportAccountSummaryOrganizationVO> listOrganizationSummary(@Param("param") ReportAccountSummaryOrganizationParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportAccountSummaryOrganizationVO getOrganizationSummaryTotal(@Param("param") ReportAccountSummaryOrganizationParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
|
||||
void initByPayTime(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
|
||||
//
|
||||
// List<ReportAccountSummary> selectAccountBal(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
|
||||
//
|
||||
// void updateAccountSummaryBal(@Param("list") List<ReportAccountSummary> reportAccountSummaryList);
|
||||
//
|
||||
// ReportAccountBalancePO queryAccountBalance(@Param("param") ReportBaseParam param);
|
||||
//
|
||||
// ReportAccountDepositPO queryAccountDeposit(@Param("param") ReportBaseParam param);
|
||||
//
|
||||
// ReportAccountConsumPO queryAccountConsum(@Param("param") ReportBaseParam param);
|
||||
//
|
||||
// List<ReportAccountSummaryDetailPO> queryAccountPayChannelSummary(@Param("param") ReportBaseParam param);
|
||||
//
|
||||
// ReportAccountSummaryDetailPO queryAccountWithdrawCash(@Param("param") ReportBaseParam param);
|
||||
//
|
||||
// ReportAccountSummaryDetailPO queryAccountSubsidy(@Param("param") ReportBaseParam param);
|
||||
//
|
||||
// ReportAccountSummaryDetailPO queryAccountChangeCard(@Param("param") ReportBaseParam param);
|
||||
}
|
||||
|
|
@ -0,0 +1,167 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.model;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@TableName("report_acc_card_summary_task")
|
||||
@ApiModel("定时汇总每日账户数持卡数")
|
||||
public class ReportAccCardSummaryTask {
|
||||
@ApiModelProperty("统计日期")
|
||||
private LocalDate statisticDate;
|
||||
@ApiModelProperty("组织id")
|
||||
private Long orgId;
|
||||
@ApiModelProperty("统计类型 1-账户数 2-持卡数")
|
||||
private Integer sumType;
|
||||
@ApiModelProperty("期初账户/持卡数")
|
||||
private Integer beginNum;
|
||||
@ApiModelProperty("期末账户/持卡数")
|
||||
private Integer endNum;
|
||||
@ApiModelProperty("正常账户/持卡数")
|
||||
private Integer endNormalNum;
|
||||
@ApiModelProperty("停用账户数")
|
||||
private Integer endDeactivatedNum;
|
||||
@ApiModelProperty("过期账户数")
|
||||
private Integer endOverdueNum;
|
||||
@ApiModelProperty("总挂失卡")
|
||||
private Integer endLossCardNum;
|
||||
@ApiModelProperty("本期开户/开卡")
|
||||
private Integer openAccountNum;
|
||||
@ApiModelProperty("本期销户")
|
||||
private Integer logoutNum;
|
||||
@ApiModelProperty("本期挂失卡")
|
||||
private Integer lossCardNum;
|
||||
|
||||
public LocalDate getStatisticDate() {
|
||||
return this.statisticDate;
|
||||
}
|
||||
|
||||
public Long getOrgId() {
|
||||
return this.orgId;
|
||||
}
|
||||
|
||||
public Integer getSumType() {
|
||||
return this.sumType;
|
||||
}
|
||||
|
||||
public Integer getBeginNum() {
|
||||
return this.beginNum;
|
||||
}
|
||||
|
||||
public Integer getEndNum() {
|
||||
return this.endNum;
|
||||
}
|
||||
|
||||
public Integer getEndNormalNum() {
|
||||
return this.endNormalNum;
|
||||
}
|
||||
|
||||
public Integer getEndDeactivatedNum() {
|
||||
return this.endDeactivatedNum;
|
||||
}
|
||||
|
||||
public Integer getEndOverdueNum() {
|
||||
return this.endOverdueNum;
|
||||
}
|
||||
|
||||
public Integer getEndLossCardNum() {
|
||||
return this.endLossCardNum;
|
||||
}
|
||||
|
||||
public Integer getOpenAccountNum() {
|
||||
return this.openAccountNum;
|
||||
}
|
||||
|
||||
public Integer getLogoutNum() {
|
||||
return this.logoutNum;
|
||||
}
|
||||
|
||||
public Integer getLossCardNum() {
|
||||
return this.lossCardNum;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setStatisticDate(final LocalDate statisticDate) {
|
||||
this.statisticDate = statisticDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setOrgId(final Long orgId) {
|
||||
this.orgId = orgId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setSumType(final Integer sumType) {
|
||||
this.sumType = sumType;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setBeginNum(final Integer beginNum) {
|
||||
this.beginNum = beginNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setEndNum(final Integer endNum) {
|
||||
this.endNum = endNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setEndNormalNum(final Integer endNormalNum) {
|
||||
this.endNormalNum = endNormalNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setEndDeactivatedNum(final Integer endDeactivatedNum) {
|
||||
this.endDeactivatedNum = endDeactivatedNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setEndOverdueNum(final Integer endOverdueNum) {
|
||||
this.endOverdueNum = endOverdueNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setEndLossCardNum(final Integer endLossCardNum) {
|
||||
this.endLossCardNum = endLossCardNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setOpenAccountNum(final Integer openAccountNum) {
|
||||
this.openAccountNum = openAccountNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setLogoutNum(final Integer logoutNum) {
|
||||
this.logoutNum = logoutNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask setLossCardNum(final Integer lossCardNum) {
|
||||
this.lossCardNum = lossCardNum;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getStatisticDate());
|
||||
return "ReportAccCardSummaryTask(statisticDate=" + var10000 + ", orgId=" + this.getOrgId() + ", sumType=" + this.getSumType() + ", beginNum=" + this.getBeginNum() + ", endNum=" + this.getEndNum() + ", endNormalNum=" + this.getEndNormalNum() + ", endDeactivatedNum=" + this.getEndDeactivatedNum() + ", endOverdueNum=" + this.getEndOverdueNum() + ", endLossCardNum=" + this.getEndLossCardNum() + ", openAccountNum=" + this.getOpenAccountNum() + ", logoutNum=" + this.getLogoutNum() + ", lossCardNum=" + this.getLossCardNum() + ")";
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask(final LocalDate statisticDate, final Long orgId, final Integer sumType, final Integer beginNum, final Integer endNum, final Integer endNormalNum, final Integer endDeactivatedNum, final Integer endOverdueNum, final Integer endLossCardNum, final Integer openAccountNum, final Integer logoutNum, final Integer lossCardNum) {
|
||||
this.statisticDate = statisticDate;
|
||||
this.orgId = orgId;
|
||||
this.sumType = sumType;
|
||||
this.beginNum = beginNum;
|
||||
this.endNum = endNum;
|
||||
this.endNormalNum = endNormalNum;
|
||||
this.endDeactivatedNum = endDeactivatedNum;
|
||||
this.endOverdueNum = endOverdueNum;
|
||||
this.endLossCardNum = endLossCardNum;
|
||||
this.openAccountNum = openAccountNum;
|
||||
this.logoutNum = logoutNum;
|
||||
this.lossCardNum = lossCardNum;
|
||||
}
|
||||
|
||||
public ReportAccCardSummaryTask() {
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,482 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.model;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@TableName("report_account_summary")
|
||||
@ApiModel("用户账户日结表")
|
||||
public class ReportAccountSummary {
|
||||
@ApiModelProperty("统计日期")
|
||||
private LocalDate statisticDate;
|
||||
@ApiModelProperty("人员id")
|
||||
private Long custId;
|
||||
@ApiModelProperty("期初账户余额")
|
||||
private BigDecimal beginAmount;
|
||||
@ApiModelProperty("期末账户余额")
|
||||
private BigDecimal endAmount;
|
||||
@ApiModelProperty("消费金额")
|
||||
private BigDecimal consumeAmount;
|
||||
@ApiModelProperty("消费补扣金额")
|
||||
private BigDecimal consumeRepairAmount;
|
||||
@ApiModelProperty("消费退款金额")
|
||||
private BigDecimal consumeRefundAmount;
|
||||
@ApiModelProperty("充值金额")
|
||||
private BigDecimal rechargeAmount;
|
||||
@ApiModelProperty("充值撤销金额")
|
||||
private BigDecimal rechargeRevokeAmount;
|
||||
@ApiModelProperty("补贴金额")
|
||||
private BigDecimal subsidyAmount;
|
||||
@ApiModelProperty("补贴撤销金额")
|
||||
private BigDecimal subsidyRevokeAmount;
|
||||
@ApiModelProperty("红包金额")
|
||||
private BigDecimal luckAmount;
|
||||
@ApiModelProperty("赠送金额")
|
||||
private BigDecimal giftAmount;
|
||||
@ApiModelProperty("管理费金额")
|
||||
private BigDecimal manageCostAmount;
|
||||
@ApiModelProperty("提现金额")
|
||||
private BigDecimal withdrawAmount;
|
||||
@ApiModelProperty("清空金额")
|
||||
private BigDecimal clearAmount;
|
||||
@ApiModelProperty("结余")
|
||||
private BigDecimal balanceAmount;
|
||||
@ApiModelProperty("微信充值金额")
|
||||
private BigDecimal wechatRechargeAmount;
|
||||
@ApiModelProperty("支付宝充值金额")
|
||||
private BigDecimal alipayRechargeAmount;
|
||||
@ApiModelProperty("现金充值金额")
|
||||
private BigDecimal cashRechargeAmount;
|
||||
@ApiModelProperty("银行充值金额")
|
||||
private BigDecimal bankRechargeAmount;
|
||||
@ApiModelProperty("第三方充值金额")
|
||||
private BigDecimal thirdRechargeAmount;
|
||||
@ApiModelProperty("其他充值金额")
|
||||
private BigDecimal otherRechargeAmount;
|
||||
@ApiModelProperty("微信提现金额")
|
||||
private BigDecimal wechatWithdrawAmount;
|
||||
@ApiModelProperty("支付宝提现金额")
|
||||
private BigDecimal alipayWithdrawAmount;
|
||||
@ApiModelProperty("现金提现金额")
|
||||
private BigDecimal cashWithdrawAmount;
|
||||
@ApiModelProperty("银行提现金额")
|
||||
private BigDecimal bankWithdrawAmount;
|
||||
@ApiModelProperty("销户清空金额")
|
||||
private BigDecimal cancelClearAmount;
|
||||
@ApiModelProperty("个人钱包余额")
|
||||
private BigDecimal walletBal;
|
||||
@ApiModelProperty("补贴钱包余额")
|
||||
private BigDecimal subsidyBal;
|
||||
@ApiModelProperty("红包余额")
|
||||
private BigDecimal luckBal;
|
||||
@ApiModelProperty("个人钱包冻结金额")
|
||||
private BigDecimal frozenWallet;
|
||||
@ApiModelProperty("补贴钱包冻结金额")
|
||||
private BigDecimal frozenSubsidy;
|
||||
|
||||
public LocalDate getStatisticDate() {
|
||||
return this.statisticDate;
|
||||
}
|
||||
|
||||
public Long getCustId() {
|
||||
return this.custId;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginAmount() {
|
||||
return this.beginAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getEndAmount() {
|
||||
return this.endAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getConsumeAmount() {
|
||||
return this.consumeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getConsumeRepairAmount() {
|
||||
return this.consumeRepairAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getConsumeRefundAmount() {
|
||||
return this.consumeRefundAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getRechargeAmount() {
|
||||
return this.rechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getRechargeRevokeAmount() {
|
||||
return this.rechargeRevokeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyAmount() {
|
||||
return this.subsidyAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyRevokeAmount() {
|
||||
return this.subsidyRevokeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getLuckAmount() {
|
||||
return this.luckAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getGiftAmount() {
|
||||
return this.giftAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getManageCostAmount() {
|
||||
return this.manageCostAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getWithdrawAmount() {
|
||||
return this.withdrawAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getClearAmount() {
|
||||
return this.clearAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getBalanceAmount() {
|
||||
return this.balanceAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getWechatRechargeAmount() {
|
||||
return this.wechatRechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayRechargeAmount() {
|
||||
return this.alipayRechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getCashRechargeAmount() {
|
||||
return this.cashRechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getBankRechargeAmount() {
|
||||
return this.bankRechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getThirdRechargeAmount() {
|
||||
return this.thirdRechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getOtherRechargeAmount() {
|
||||
return this.otherRechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getWechatWithdrawAmount() {
|
||||
return this.wechatWithdrawAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayWithdrawAmount() {
|
||||
return this.alipayWithdrawAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getCashWithdrawAmount() {
|
||||
return this.cashWithdrawAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getBankWithdrawAmount() {
|
||||
return this.bankWithdrawAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getCancelClearAmount() {
|
||||
return this.cancelClearAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getWalletBal() {
|
||||
return this.walletBal;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyBal() {
|
||||
return this.subsidyBal;
|
||||
}
|
||||
|
||||
public BigDecimal getLuckBal() {
|
||||
return this.luckBal;
|
||||
}
|
||||
|
||||
public BigDecimal getFrozenWallet() {
|
||||
return this.frozenWallet;
|
||||
}
|
||||
|
||||
public BigDecimal getFrozenSubsidy() {
|
||||
return this.frozenSubsidy;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setStatisticDate(final LocalDate statisticDate) {
|
||||
this.statisticDate = statisticDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setCustId(final Long custId) {
|
||||
this.custId = custId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setBeginAmount(final BigDecimal beginAmount) {
|
||||
this.beginAmount = beginAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setEndAmount(final BigDecimal endAmount) {
|
||||
this.endAmount = endAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setConsumeAmount(final BigDecimal consumeAmount) {
|
||||
this.consumeAmount = consumeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setConsumeRepairAmount(final BigDecimal consumeRepairAmount) {
|
||||
this.consumeRepairAmount = consumeRepairAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setConsumeRefundAmount(final BigDecimal consumeRefundAmount) {
|
||||
this.consumeRefundAmount = consumeRefundAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setRechargeAmount(final BigDecimal rechargeAmount) {
|
||||
this.rechargeAmount = rechargeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setRechargeRevokeAmount(final BigDecimal rechargeRevokeAmount) {
|
||||
this.rechargeRevokeAmount = rechargeRevokeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setSubsidyAmount(final BigDecimal subsidyAmount) {
|
||||
this.subsidyAmount = subsidyAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setSubsidyRevokeAmount(final BigDecimal subsidyRevokeAmount) {
|
||||
this.subsidyRevokeAmount = subsidyRevokeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setLuckAmount(final BigDecimal luckAmount) {
|
||||
this.luckAmount = luckAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setGiftAmount(final BigDecimal giftAmount) {
|
||||
this.giftAmount = giftAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setManageCostAmount(final BigDecimal manageCostAmount) {
|
||||
this.manageCostAmount = manageCostAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setWithdrawAmount(final BigDecimal withdrawAmount) {
|
||||
this.withdrawAmount = withdrawAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setClearAmount(final BigDecimal clearAmount) {
|
||||
this.clearAmount = clearAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setBalanceAmount(final BigDecimal balanceAmount) {
|
||||
this.balanceAmount = balanceAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setWechatRechargeAmount(final BigDecimal wechatRechargeAmount) {
|
||||
this.wechatRechargeAmount = wechatRechargeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setAlipayRechargeAmount(final BigDecimal alipayRechargeAmount) {
|
||||
this.alipayRechargeAmount = alipayRechargeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setCashRechargeAmount(final BigDecimal cashRechargeAmount) {
|
||||
this.cashRechargeAmount = cashRechargeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setBankRechargeAmount(final BigDecimal bankRechargeAmount) {
|
||||
this.bankRechargeAmount = bankRechargeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setThirdRechargeAmount(final BigDecimal thirdRechargeAmount) {
|
||||
this.thirdRechargeAmount = thirdRechargeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setOtherRechargeAmount(final BigDecimal otherRechargeAmount) {
|
||||
this.otherRechargeAmount = otherRechargeAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setWechatWithdrawAmount(final BigDecimal wechatWithdrawAmount) {
|
||||
this.wechatWithdrawAmount = wechatWithdrawAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setAlipayWithdrawAmount(final BigDecimal alipayWithdrawAmount) {
|
||||
this.alipayWithdrawAmount = alipayWithdrawAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setCashWithdrawAmount(final BigDecimal cashWithdrawAmount) {
|
||||
this.cashWithdrawAmount = cashWithdrawAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setBankWithdrawAmount(final BigDecimal bankWithdrawAmount) {
|
||||
this.bankWithdrawAmount = bankWithdrawAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setCancelClearAmount(final BigDecimal cancelClearAmount) {
|
||||
this.cancelClearAmount = cancelClearAmount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setWalletBal(final BigDecimal walletBal) {
|
||||
this.walletBal = walletBal;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setSubsidyBal(final BigDecimal subsidyBal) {
|
||||
this.subsidyBal = subsidyBal;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setLuckBal(final BigDecimal luckBal) {
|
||||
this.luckBal = luckBal;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setFrozenWallet(final BigDecimal frozenWallet) {
|
||||
this.frozenWallet = frozenWallet;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ReportAccountSummary setFrozenSubsidy(final BigDecimal frozenSubsidy) {
|
||||
this.frozenSubsidy = frozenSubsidy;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getStatisticDate());
|
||||
return "ReportAccountSummary(statisticDate=" + var10000 + ", custId=" + this.getCustId() + ", beginAmount=" + String.valueOf(this.getBeginAmount()) + ", endAmount=" + String.valueOf(this.getEndAmount()) + ", consumeAmount=" + String.valueOf(this.getConsumeAmount()) + ", consumeRepairAmount=" + String.valueOf(this.getConsumeRepairAmount()) + ", consumeRefundAmount=" + String.valueOf(this.getConsumeRefundAmount()) + ", rechargeAmount=" + String.valueOf(this.getRechargeAmount()) + ", rechargeRevokeAmount=" + String.valueOf(this.getRechargeRevokeAmount()) + ", subsidyAmount=" + String.valueOf(this.getSubsidyAmount()) + ", subsidyRevokeAmount=" + String.valueOf(this.getSubsidyRevokeAmount()) + ", luckAmount=" + String.valueOf(this.getLuckAmount()) + ", giftAmount=" + String.valueOf(this.getGiftAmount()) + ", manageCostAmount=" + String.valueOf(this.getManageCostAmount()) + ", withdrawAmount=" + String.valueOf(this.getWithdrawAmount()) + ", clearAmount=" + String.valueOf(this.getClearAmount()) + ", balanceAmount=" + String.valueOf(this.getBalanceAmount()) + ", wechatRechargeAmount=" + String.valueOf(this.getWechatRechargeAmount()) + ", alipayRechargeAmount=" + String.valueOf(this.getAlipayRechargeAmount()) + ", cashRechargeAmount=" + String.valueOf(this.getCashRechargeAmount()) + ", bankRechargeAmount=" + String.valueOf(this.getBankRechargeAmount()) + ", thirdRechargeAmount=" + String.valueOf(this.getThirdRechargeAmount()) + ", otherRechargeAmount=" + String.valueOf(this.getOtherRechargeAmount()) + ", wechatWithdrawAmount=" + String.valueOf(this.getWechatWithdrawAmount()) + ", alipayWithdrawAmount=" + String.valueOf(this.getAlipayWithdrawAmount()) + ", cashWithdrawAmount=" + String.valueOf(this.getCashWithdrawAmount()) + ", bankWithdrawAmount=" + String.valueOf(this.getBankWithdrawAmount()) + ", cancelClearAmount=" + String.valueOf(this.getCancelClearAmount()) + ", walletBal=" + String.valueOf(this.getWalletBal()) + ", subsidyBal=" + String.valueOf(this.getSubsidyBal()) + ", luckBal=" + String.valueOf(this.getLuckBal()) + ", frozenWallet=" + String.valueOf(this.getFrozenWallet()) + ", frozenSubsidy=" + String.valueOf(this.getFrozenSubsidy()) + ")";
|
||||
}
|
||||
|
||||
public ReportAccountSummary(final LocalDate statisticDate, final Long custId, final BigDecimal beginAmount, final BigDecimal endAmount, final BigDecimal consumeAmount, final BigDecimal consumeRepairAmount, final BigDecimal consumeRefundAmount, final BigDecimal rechargeAmount, final BigDecimal rechargeRevokeAmount, final BigDecimal subsidyAmount, final BigDecimal subsidyRevokeAmount, final BigDecimal luckAmount, final BigDecimal giftAmount, final BigDecimal manageCostAmount, final BigDecimal withdrawAmount, final BigDecimal clearAmount, final BigDecimal balanceAmount, final BigDecimal wechatRechargeAmount, final BigDecimal alipayRechargeAmount, final BigDecimal cashRechargeAmount, final BigDecimal bankRechargeAmount, final BigDecimal thirdRechargeAmount, final BigDecimal otherRechargeAmount, final BigDecimal wechatWithdrawAmount, final BigDecimal alipayWithdrawAmount, final BigDecimal cashWithdrawAmount, final BigDecimal bankWithdrawAmount, final BigDecimal cancelClearAmount, final BigDecimal walletBal, final BigDecimal subsidyBal, final BigDecimal luckBal, final BigDecimal frozenWallet, final BigDecimal frozenSubsidy) {
|
||||
this.beginAmount = BigDecimal.ZERO;
|
||||
this.endAmount = BigDecimal.ZERO;
|
||||
this.consumeAmount = BigDecimal.ZERO;
|
||||
this.consumeRepairAmount = BigDecimal.ZERO;
|
||||
this.consumeRefundAmount = BigDecimal.ZERO;
|
||||
this.rechargeAmount = BigDecimal.ZERO;
|
||||
this.rechargeRevokeAmount = BigDecimal.ZERO;
|
||||
this.subsidyAmount = BigDecimal.ZERO;
|
||||
this.subsidyRevokeAmount = BigDecimal.ZERO;
|
||||
this.luckAmount = BigDecimal.ZERO;
|
||||
this.giftAmount = BigDecimal.ZERO;
|
||||
this.manageCostAmount = BigDecimal.ZERO;
|
||||
this.withdrawAmount = BigDecimal.ZERO;
|
||||
this.clearAmount = BigDecimal.ZERO;
|
||||
this.balanceAmount = BigDecimal.ZERO;
|
||||
this.wechatRechargeAmount = BigDecimal.ZERO;
|
||||
this.alipayRechargeAmount = BigDecimal.ZERO;
|
||||
this.cashRechargeAmount = BigDecimal.ZERO;
|
||||
this.bankRechargeAmount = BigDecimal.ZERO;
|
||||
this.thirdRechargeAmount = BigDecimal.ZERO;
|
||||
this.otherRechargeAmount = BigDecimal.ZERO;
|
||||
this.wechatWithdrawAmount = BigDecimal.ZERO;
|
||||
this.alipayWithdrawAmount = BigDecimal.ZERO;
|
||||
this.cashWithdrawAmount = BigDecimal.ZERO;
|
||||
this.bankWithdrawAmount = BigDecimal.ZERO;
|
||||
this.cancelClearAmount = BigDecimal.ZERO;
|
||||
this.walletBal = BigDecimal.ZERO;
|
||||
this.subsidyBal = BigDecimal.ZERO;
|
||||
this.luckBal = BigDecimal.ZERO;
|
||||
this.frozenWallet = BigDecimal.ZERO;
|
||||
this.frozenSubsidy = BigDecimal.ZERO;
|
||||
this.statisticDate = statisticDate;
|
||||
this.custId = custId;
|
||||
this.beginAmount = beginAmount;
|
||||
this.endAmount = endAmount;
|
||||
this.consumeAmount = consumeAmount;
|
||||
this.consumeRepairAmount = consumeRepairAmount;
|
||||
this.consumeRefundAmount = consumeRefundAmount;
|
||||
this.rechargeAmount = rechargeAmount;
|
||||
this.rechargeRevokeAmount = rechargeRevokeAmount;
|
||||
this.subsidyAmount = subsidyAmount;
|
||||
this.subsidyRevokeAmount = subsidyRevokeAmount;
|
||||
this.luckAmount = luckAmount;
|
||||
this.giftAmount = giftAmount;
|
||||
this.manageCostAmount = manageCostAmount;
|
||||
this.withdrawAmount = withdrawAmount;
|
||||
this.clearAmount = clearAmount;
|
||||
this.balanceAmount = balanceAmount;
|
||||
this.wechatRechargeAmount = wechatRechargeAmount;
|
||||
this.alipayRechargeAmount = alipayRechargeAmount;
|
||||
this.cashRechargeAmount = cashRechargeAmount;
|
||||
this.bankRechargeAmount = bankRechargeAmount;
|
||||
this.thirdRechargeAmount = thirdRechargeAmount;
|
||||
this.otherRechargeAmount = otherRechargeAmount;
|
||||
this.wechatWithdrawAmount = wechatWithdrawAmount;
|
||||
this.alipayWithdrawAmount = alipayWithdrawAmount;
|
||||
this.cashWithdrawAmount = cashWithdrawAmount;
|
||||
this.bankWithdrawAmount = bankWithdrawAmount;
|
||||
this.cancelClearAmount = cancelClearAmount;
|
||||
this.walletBal = walletBal;
|
||||
this.subsidyBal = subsidyBal;
|
||||
this.luckBal = luckBal;
|
||||
this.frozenWallet = frozenWallet;
|
||||
this.frozenSubsidy = frozenSubsidy;
|
||||
}
|
||||
|
||||
public ReportAccountSummary() {
|
||||
this.beginAmount = BigDecimal.ZERO;
|
||||
this.endAmount = BigDecimal.ZERO;
|
||||
this.consumeAmount = BigDecimal.ZERO;
|
||||
this.consumeRepairAmount = BigDecimal.ZERO;
|
||||
this.consumeRefundAmount = BigDecimal.ZERO;
|
||||
this.rechargeAmount = BigDecimal.ZERO;
|
||||
this.rechargeRevokeAmount = BigDecimal.ZERO;
|
||||
this.subsidyAmount = BigDecimal.ZERO;
|
||||
this.subsidyRevokeAmount = BigDecimal.ZERO;
|
||||
this.luckAmount = BigDecimal.ZERO;
|
||||
this.giftAmount = BigDecimal.ZERO;
|
||||
this.manageCostAmount = BigDecimal.ZERO;
|
||||
this.withdrawAmount = BigDecimal.ZERO;
|
||||
this.clearAmount = BigDecimal.ZERO;
|
||||
this.balanceAmount = BigDecimal.ZERO;
|
||||
this.wechatRechargeAmount = BigDecimal.ZERO;
|
||||
this.alipayRechargeAmount = BigDecimal.ZERO;
|
||||
this.cashRechargeAmount = BigDecimal.ZERO;
|
||||
this.bankRechargeAmount = BigDecimal.ZERO;
|
||||
this.thirdRechargeAmount = BigDecimal.ZERO;
|
||||
this.otherRechargeAmount = BigDecimal.ZERO;
|
||||
this.wechatWithdrawAmount = BigDecimal.ZERO;
|
||||
this.alipayWithdrawAmount = BigDecimal.ZERO;
|
||||
this.cashWithdrawAmount = BigDecimal.ZERO;
|
||||
this.bankWithdrawAmount = BigDecimal.ZERO;
|
||||
this.cancelClearAmount = BigDecimal.ZERO;
|
||||
this.walletBal = BigDecimal.ZERO;
|
||||
this.subsidyBal = BigDecimal.ZERO;
|
||||
this.luckBal = BigDecimal.ZERO;
|
||||
this.frozenWallet = BigDecimal.ZERO;
|
||||
this.frozenSubsidy = BigDecimal.ZERO;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,110 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class ReportAccountDataBalanceParam {
|
||||
private BigDecimal beginAmount;
|
||||
private BigDecimal endAmount;
|
||||
private BigDecimal accountBalChangeAmount;
|
||||
private BigDecimal walletBal;
|
||||
private BigDecimal subsidyBal;
|
||||
private BigDecimal luckBal;
|
||||
private BigDecimal beginFrozenAmount;
|
||||
private BigDecimal endFrozenAmount;
|
||||
private BigDecimal frozenChangeAmount;
|
||||
private BigDecimal frozenWallet;
|
||||
private BigDecimal frozenSubsidy;
|
||||
|
||||
public BigDecimal getBeginAmount() {
|
||||
return this.beginAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getEndAmount() {
|
||||
return this.endAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getAccountBalChangeAmount() {
|
||||
return this.accountBalChangeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getWalletBal() {
|
||||
return this.walletBal;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyBal() {
|
||||
return this.subsidyBal;
|
||||
}
|
||||
|
||||
public BigDecimal getLuckBal() {
|
||||
return this.luckBal;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginFrozenAmount() {
|
||||
return this.beginFrozenAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getEndFrozenAmount() {
|
||||
return this.endFrozenAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getFrozenChangeAmount() {
|
||||
return this.frozenChangeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getFrozenWallet() {
|
||||
return this.frozenWallet;
|
||||
}
|
||||
|
||||
public BigDecimal getFrozenSubsidy() {
|
||||
return this.frozenSubsidy;
|
||||
}
|
||||
|
||||
public void setBeginAmount(final BigDecimal beginAmount) {
|
||||
this.beginAmount = beginAmount;
|
||||
}
|
||||
|
||||
public void setEndAmount(final BigDecimal endAmount) {
|
||||
this.endAmount = endAmount;
|
||||
}
|
||||
|
||||
public void setAccountBalChangeAmount(final BigDecimal accountBalChangeAmount) {
|
||||
this.accountBalChangeAmount = accountBalChangeAmount;
|
||||
}
|
||||
|
||||
public void setWalletBal(final BigDecimal walletBal) {
|
||||
this.walletBal = walletBal;
|
||||
}
|
||||
|
||||
public void setSubsidyBal(final BigDecimal subsidyBal) {
|
||||
this.subsidyBal = subsidyBal;
|
||||
}
|
||||
|
||||
public void setLuckBal(final BigDecimal luckBal) {
|
||||
this.luckBal = luckBal;
|
||||
}
|
||||
|
||||
public void setBeginFrozenAmount(final BigDecimal beginFrozenAmount) {
|
||||
this.beginFrozenAmount = beginFrozenAmount;
|
||||
}
|
||||
|
||||
public void setEndFrozenAmount(final BigDecimal endFrozenAmount) {
|
||||
this.endFrozenAmount = endFrozenAmount;
|
||||
}
|
||||
|
||||
public void setFrozenChangeAmount(final BigDecimal frozenChangeAmount) {
|
||||
this.frozenChangeAmount = frozenChangeAmount;
|
||||
}
|
||||
|
||||
public void setFrozenWallet(final BigDecimal frozenWallet) {
|
||||
this.frozenWallet = frozenWallet;
|
||||
}
|
||||
|
||||
public void setFrozenSubsidy(final BigDecimal frozenSubsidy) {
|
||||
this.frozenSubsidy = frozenSubsidy;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getBeginAmount());
|
||||
return "ReportAccountDataBalanceParam(beginAmount=" + var10000 + ", endAmount=" + String.valueOf(this.getEndAmount()) + ", accountBalChangeAmount=" + String.valueOf(this.getAccountBalChangeAmount()) + ", walletBal=" + String.valueOf(this.getWalletBal()) + ", subsidyBal=" + String.valueOf(this.getSubsidyBal()) + ", luckBal=" + String.valueOf(this.getLuckBal()) + ", beginFrozenAmount=" + String.valueOf(this.getBeginFrozenAmount()) + ", endFrozenAmount=" + String.valueOf(this.getEndFrozenAmount()) + ", frozenChangeAmount=" + String.valueOf(this.getFrozenChangeAmount()) + ", frozenWallet=" + String.valueOf(this.getFrozenWallet()) + ", frozenSubsidy=" + String.valueOf(this.getFrozenSubsidy()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.param;
|
||||
|
||||
public class ReportAccountDataCardNumParam {
|
||||
private Long normalCount;
|
||||
private Long lossCount;
|
||||
private Long endCount;
|
||||
private Long startCount;
|
||||
private Long changeCount;
|
||||
private Long intervalOpenCount;
|
||||
private Long intervalLossCount;
|
||||
|
||||
public Long getNormalCount() {
|
||||
return this.normalCount;
|
||||
}
|
||||
|
||||
public Long getLossCount() {
|
||||
return this.lossCount;
|
||||
}
|
||||
|
||||
public Long getEndCount() {
|
||||
return this.endCount;
|
||||
}
|
||||
|
||||
public Long getStartCount() {
|
||||
return this.startCount;
|
||||
}
|
||||
|
||||
public Long getChangeCount() {
|
||||
return this.changeCount;
|
||||
}
|
||||
|
||||
public Long getIntervalOpenCount() {
|
||||
return this.intervalOpenCount;
|
||||
}
|
||||
|
||||
public Long getIntervalLossCount() {
|
||||
return this.intervalLossCount;
|
||||
}
|
||||
|
||||
public void setNormalCount(final Long normalCount) {
|
||||
this.normalCount = normalCount;
|
||||
}
|
||||
|
||||
public void setLossCount(final Long lossCount) {
|
||||
this.lossCount = lossCount;
|
||||
}
|
||||
|
||||
public void setEndCount(final Long endCount) {
|
||||
this.endCount = endCount;
|
||||
}
|
||||
|
||||
public void setStartCount(final Long startCount) {
|
||||
this.startCount = startCount;
|
||||
}
|
||||
|
||||
public void setChangeCount(final Long changeCount) {
|
||||
this.changeCount = changeCount;
|
||||
}
|
||||
|
||||
public void setIntervalOpenCount(final Long intervalOpenCount) {
|
||||
this.intervalOpenCount = intervalOpenCount;
|
||||
}
|
||||
|
||||
public void setIntervalLossCount(final Long intervalLossCount) {
|
||||
this.intervalLossCount = intervalLossCount;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
Long var10000 = this.getNormalCount();
|
||||
return "ReportAccountDataCardNumParam(normalCount=" + var10000 + ", lossCount=" + this.getLossCount() + ", endCount=" + this.getEndCount() + ", startCount=" + this.getStartCount() + ", changeCount=" + this.getChangeCount() + ", intervalOpenCount=" + this.getIntervalOpenCount() + ", intervalLossCount=" + this.getIntervalLossCount() + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class ReportAccountDataConsumeSumParam {
|
||||
private BigDecimal accountConsume;
|
||||
private BigDecimal consumeRefundAmount;
|
||||
private BigDecimal consumeRepairAmount;
|
||||
private BigDecimal totalConsume;
|
||||
private BigDecimal onlineConsumeAmount;
|
||||
private BigDecimal offlineConsumeAmount;
|
||||
|
||||
public BigDecimal getAccountConsume() {
|
||||
return this.accountConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getConsumeRefundAmount() {
|
||||
return this.consumeRefundAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getConsumeRepairAmount() {
|
||||
return this.consumeRepairAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalConsume() {
|
||||
return this.totalConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getOnlineConsumeAmount() {
|
||||
return this.onlineConsumeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getOfflineConsumeAmount() {
|
||||
return this.offlineConsumeAmount;
|
||||
}
|
||||
|
||||
public void setAccountConsume(final BigDecimal accountConsume) {
|
||||
this.accountConsume = accountConsume;
|
||||
}
|
||||
|
||||
public void setConsumeRefundAmount(final BigDecimal consumeRefundAmount) {
|
||||
this.consumeRefundAmount = consumeRefundAmount;
|
||||
}
|
||||
|
||||
public void setConsumeRepairAmount(final BigDecimal consumeRepairAmount) {
|
||||
this.consumeRepairAmount = consumeRepairAmount;
|
||||
}
|
||||
|
||||
public void setTotalConsume(final BigDecimal totalConsume) {
|
||||
this.totalConsume = totalConsume;
|
||||
}
|
||||
|
||||
public void setOnlineConsumeAmount(final BigDecimal onlineConsumeAmount) {
|
||||
this.onlineConsumeAmount = onlineConsumeAmount;
|
||||
}
|
||||
|
||||
public void setOfflineConsumeAmount(final BigDecimal offlineConsumeAmount) {
|
||||
this.offlineConsumeAmount = offlineConsumeAmount;
|
||||
}
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getAccountConsume());
|
||||
return "ReportAccountDataConsumeSumParam(accountConsume=" + var10000 + ", consumeRefundAmount=" + String.valueOf(this.getConsumeRefundAmount()) + ", consumeRepairAmount=" + String.valueOf(this.getConsumeRepairAmount()) + ", totalConsume=" + String.valueOf(this.getTotalConsume()) + ", onlineConsumeAmount=" + String.valueOf(this.getOnlineConsumeAmount()) + ", offlineConsumeAmount=" + String.valueOf(this.getOfflineConsumeAmount()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class ReportAccountDataDepositSumParam {
|
||||
private BigDecimal beginDepositAmount;
|
||||
private BigDecimal endDepositAmount;
|
||||
private BigDecimal depositChangeAmount;
|
||||
private BigDecimal beginProductCost;
|
||||
private BigDecimal endProductCost;
|
||||
private BigDecimal productCostChange;
|
||||
|
||||
public BigDecimal getBeginDepositAmount() {
|
||||
return this.beginDepositAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getEndDepositAmount() {
|
||||
return this.endDepositAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getDepositChangeAmount() {
|
||||
return this.depositChangeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginProductCost() {
|
||||
return this.beginProductCost;
|
||||
}
|
||||
|
||||
public BigDecimal getEndProductCost() {
|
||||
return this.endProductCost;
|
||||
}
|
||||
|
||||
public BigDecimal getProductCostChange() {
|
||||
return this.productCostChange;
|
||||
}
|
||||
|
||||
public void setBeginDepositAmount(final BigDecimal beginDepositAmount) {
|
||||
this.beginDepositAmount = beginDepositAmount;
|
||||
}
|
||||
|
||||
public void setEndDepositAmount(final BigDecimal endDepositAmount) {
|
||||
this.endDepositAmount = endDepositAmount;
|
||||
}
|
||||
|
||||
public void setDepositChangeAmount(final BigDecimal depositChangeAmount) {
|
||||
this.depositChangeAmount = depositChangeAmount;
|
||||
}
|
||||
|
||||
public void setBeginProductCost(final BigDecimal beginProductCost) {
|
||||
this.beginProductCost = beginProductCost;
|
||||
}
|
||||
|
||||
public void setEndProductCost(final BigDecimal endProductCost) {
|
||||
this.endProductCost = endProductCost;
|
||||
}
|
||||
|
||||
public void setProductCostChange(final BigDecimal productCostChange) {
|
||||
this.productCostChange = productCostChange;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getBeginDepositAmount());
|
||||
return "ReportAccountDataDepositSumParam(beginDepositAmount=" + var10000 + ", endDepositAmount=" + String.valueOf(this.getEndDepositAmount()) + ", depositChangeAmount=" + String.valueOf(this.getDepositChangeAmount()) + ", beginProductCost=" + String.valueOf(this.getBeginProductCost()) + ", endProductCost=" + String.valueOf(this.getEndProductCost()) + ", productCostChange=" + String.valueOf(this.getProductCostChange()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.param;
|
||||
|
||||
public class ReportAccountDataNumParam {
|
||||
private Long normalCount;
|
||||
private Long deactivateCount;
|
||||
private Long expireCount;
|
||||
private Long openCount;
|
||||
private Long closedCount;
|
||||
private Long startCount;
|
||||
private Long endCount;
|
||||
private Long changeCount;
|
||||
|
||||
public Long getNormalCount() {
|
||||
return this.normalCount;
|
||||
}
|
||||
|
||||
public Long getDeactivateCount() {
|
||||
return this.deactivateCount;
|
||||
}
|
||||
|
||||
public Long getExpireCount() {
|
||||
return this.expireCount;
|
||||
}
|
||||
|
||||
public Long getOpenCount() {
|
||||
return this.openCount;
|
||||
}
|
||||
|
||||
public Long getClosedCount() {
|
||||
return this.closedCount;
|
||||
}
|
||||
|
||||
public Long getStartCount() {
|
||||
return this.startCount;
|
||||
}
|
||||
|
||||
public Long getEndCount() {
|
||||
return this.endCount;
|
||||
}
|
||||
|
||||
public Long getChangeCount() {
|
||||
return this.changeCount;
|
||||
}
|
||||
|
||||
public void setNormalCount(final Long normalCount) {
|
||||
this.normalCount = normalCount;
|
||||
}
|
||||
|
||||
public void setDeactivateCount(final Long deactivateCount) {
|
||||
this.deactivateCount = deactivateCount;
|
||||
}
|
||||
|
||||
public void setExpireCount(final Long expireCount) {
|
||||
this.expireCount = expireCount;
|
||||
}
|
||||
|
||||
public void setOpenCount(final Long openCount) {
|
||||
this.openCount = openCount;
|
||||
}
|
||||
|
||||
public void setClosedCount(final Long closedCount) {
|
||||
this.closedCount = closedCount;
|
||||
}
|
||||
|
||||
public void setStartCount(final Long startCount) {
|
||||
this.startCount = startCount;
|
||||
}
|
||||
|
||||
public void setEndCount(final Long endCount) {
|
||||
this.endCount = endCount;
|
||||
}
|
||||
|
||||
public void setChangeCount(final Long changeCount) {
|
||||
this.changeCount = changeCount;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
Long var10000 = this.getNormalCount();
|
||||
return "ReportAccountDataNumParam(normalCount=" + var10000 + ", deactivateCount=" + this.getDeactivateCount() + ", expireCount=" + this.getExpireCount() + ", openCount=" + this.getOpenCount() + ", closedCount=" + this.getClosedCount() + ", startCount=" + this.getStartCount() + ", endCount=" + this.getEndCount() + ", changeCount=" + this.getChangeCount() + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.param;
|
||||
|
||||
public class ReportAccountDataNumSumParam {
|
||||
private ReportAccountDataNumParam reportAccountDataNumParam;
|
||||
private ReportAccountDataCardNumParam reportAccountDataCardNumParam;
|
||||
|
||||
public ReportAccountDataNumSumParam(ReportAccountDataNumParam reportAccountDataNumParam, ReportAccountDataCardNumParam reportAccountDataCardNumParam) {
|
||||
this.reportAccountDataNumParam = reportAccountDataNumParam;
|
||||
this.reportAccountDataCardNumParam = reportAccountDataCardNumParam;
|
||||
}
|
||||
|
||||
public ReportAccountDataNumParam getReportAccountDataNumParam() {
|
||||
return this.reportAccountDataNumParam;
|
||||
}
|
||||
|
||||
public ReportAccountDataCardNumParam getReportAccountDataCardNumParam() {
|
||||
return this.reportAccountDataCardNumParam;
|
||||
}
|
||||
|
||||
public void setReportAccountDataNumParam(final ReportAccountDataNumParam reportAccountDataNumParam) {
|
||||
this.reportAccountDataNumParam = reportAccountDataNumParam;
|
||||
}
|
||||
|
||||
public void setReportAccountDataCardNumParam(final ReportAccountDataCardNumParam reportAccountDataCardNumParam) {
|
||||
this.reportAccountDataCardNumParam = reportAccountDataCardNumParam;
|
||||
}
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getReportAccountDataNumParam());
|
||||
return "ReportAccountDataNumSumParam(reportAccountDataNumParam=" + var10000 + ", reportAccountDataCardNumParam=" + String.valueOf(this.getReportAccountDataCardNumParam()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bonus.canteen.core.report.statistics.account.mapper.ReportAccCardSummaryTaskMapper;
|
||||
import com.bonus.canteen.core.report.statistics.account.model.ReportAccCardSummaryTask;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataCardNumParam;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataNumParam;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportBaseParam;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class ReportAccCardSummaryTaskService extends ServiceImpl<ReportAccCardSummaryTaskMapper, ReportAccCardSummaryTask> {
|
||||
public ReportAccountDataNumParam queryAccountDataNumSum(ReportBaseParam param) {
|
||||
return ((ReportAccCardSummaryTaskMapper)this.baseMapper).queryAccountDataNumSum(param);
|
||||
}
|
||||
|
||||
public ReportAccountDataCardNumParam queryAccountDataCardNumSum(ReportBaseParam param) {
|
||||
return ((ReportAccCardSummaryTaskMapper)this.baseMapper).queryAccountDataCardNumSum(param);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,265 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.service;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bonus.canteen.core.account.v3.api.dto.AccCountDTO;
|
||||
import com.bonus.canteen.core.account.v3.api.dto.AccStatisticsSumDTO;
|
||||
import com.bonus.canteen.core.account.v3.api.vo.*;
|
||||
import com.bonus.canteen.core.account.v3.mq.send.model.RepAccMqModel;
|
||||
import com.bonus.canteen.core.auth.api.MgrAuthApi;
|
||||
import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
|
||||
import com.bonus.canteen.core.common.page.PageVO;
|
||||
import com.bonus.canteen.core.pay.common.constants.PayChannelEnum;
|
||||
import com.bonus.canteen.core.report.statistics.account.mapper.ReportAccountSummaryMapper;
|
||||
import com.bonus.canteen.core.report.statistics.account.model.ReportAccountSummary;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.*;
|
||||
import com.bonus.canteen.core.report.statistics.account.vo.ReportAccountDataSumVO;
|
||||
import com.bonus.canteen.core.report.statistics.config.mq.ReportAccountConsumeService;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.service.ReportRevenueSummaryService;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.vo.ReportSumDepositVO;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.vo.ReportSumRechargeVO;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportBaseParam;
|
||||
import com.bonus.canteen.core.report.vo.ReportBaseTotalVO;
|
||||
import com.bonus.common.core.exception.ServiceException;
|
||||
import com.bonus.common.houqin.i18n.I18n;
|
||||
import com.bonus.common.houqin.utils.LeBeanUtil;
|
||||
import com.github.pagehelper.page.PageMethod;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.task.AsyncTaskExecutor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.lang.invoke.SerializedLambda;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
@Service
|
||||
public class ReportAccountSummaryService extends ServiceImpl<ReportAccountSummaryMapper, ReportAccountSummary> implements ReportAccountConsumeService {
|
||||
private static final Logger log = LoggerFactory.getLogger(ReportAccountSummaryService.class);
|
||||
private static final int ORDER = 13;
|
||||
@Autowired
|
||||
private MgrAuthApi mgrAuthApi;
|
||||
@Autowired
|
||||
private AccInfoServiceV3Api accInfoServiceV3Api;
|
||||
@Autowired
|
||||
private ReportRevenueSummaryService reportRevenueSummaryService;
|
||||
@Autowired
|
||||
private ReportAccCardSummaryTaskService reportAccCardSummaryTaskService;
|
||||
@Resource(
|
||||
name = "yunshitangTaskExecutor"
|
||||
)
|
||||
private AsyncTaskExecutor asyncTaskExecutor;
|
||||
|
||||
public int getOrder() {
|
||||
return 13;
|
||||
}
|
||||
|
||||
// public ReportBaseTotalVO<ReportAccountSummaryCustVO> pageCustSummary(ReportAccountSummaryCustParam param) {
|
||||
// MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
// PageMethod.startPage(param.getPage());
|
||||
// List<Long> custIdList = ((ReportAccountSummaryMapper)this.baseMapper).listCustSummaryId(param, authPO);
|
||||
// if (CollUtil.isEmpty(custIdList)) {
|
||||
// return (new ReportBaseTotalVO()).setResultPage(PageVO.of((List)custIdList, CollUtil.newArrayList(new ReportAccountSummaryCustVO[0]))).setTotalLine(new ReportAccountSummaryCustVO());
|
||||
// } else {
|
||||
// param.setCustIdList(custIdList);
|
||||
// CompletableFuture<List<ReportAccountSummaryCustVO>> listFuture = CompletableFuture.supplyAsync(() -> {
|
||||
// return ((ReportAccountSummaryMapper)this.baseMapper).listCustSummary(param);
|
||||
// }, this.asyncTaskExecutor);
|
||||
// CompletableFuture<ReportAccountSummaryCustVO> totalFuture = CompletableFuture.supplyAsync(() -> {
|
||||
// return (ReportAccountSummaryCustVO)Optional.ofNullable(((ReportAccountSummaryMapper)this.baseMapper).getCustSummaryTotal(param, authPO)).orElse(new ReportAccountSummaryCustVO());
|
||||
// }, this.asyncTaskExecutor);
|
||||
// CompletableFuture<Void> future = CompletableFuture.allOf(listFuture, totalFuture);
|
||||
// future.join();
|
||||
// ReportAccountSummaryCustVO total = (ReportAccountSummaryCustVO)totalFuture.join();
|
||||
// PageVO<ReportAccountSummaryCustVO> pageVO = PageVO.of(custIdList, (List)listFuture.join());
|
||||
// return (new ReportBaseTotalVO()).setResultPage(pageVO).setTotalLine(total);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public ReportBaseTotalVO<ReportAccountSummaryTypeVO> pageTypeSummary(ReportAccountSummaryTypeParam param) {
|
||||
// MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
// CompletableFuture<List<ReportAccountSummaryTypeVO>> listFuture = CompletableFuture.supplyAsync(() -> {
|
||||
// PageMethod.startPage(param.getPage());
|
||||
// return ((ReportAccountSummaryMapper)this.baseMapper).listTypeSummary(param, authPO);
|
||||
// }, this.asyncTaskExecutor);
|
||||
// CompletableFuture<ReportAccountSummaryTypeVO> totalFuture = CompletableFuture.supplyAsync(() -> {
|
||||
// return (ReportAccountSummaryTypeVO)Optional.ofNullable(((ReportAccountSummaryMapper)this.baseMapper).getTypeSummaryTotal(param, authPO)).orElse(new ReportAccountSummaryTypeVO());
|
||||
// }, this.asyncTaskExecutor);
|
||||
// CompletableFuture<Void> future = CompletableFuture.allOf(listFuture, totalFuture);
|
||||
// future.join();
|
||||
// List<ReportAccountSummaryTypeVO> list = (List)listFuture.join();
|
||||
// ReportAccountSummaryTypeVO total = (ReportAccountSummaryTypeVO)totalFuture.join();
|
||||
// return (new ReportBaseTotalVO()).setResultPage(PageVO.of(list)).setTotalLine(total);
|
||||
// }
|
||||
//
|
||||
// public ReportBaseTotalVO<ReportAccountSummaryOrganizationVO> pageOrganizationSummary(ReportAccountSummaryOrganizationParam param) {
|
||||
// MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
// CompletableFuture<List<ReportAccountSummaryOrganizationVO>> listFuture = CompletableFuture.supplyAsync(() -> {
|
||||
// PageMethod.startPage(param.getPage());
|
||||
// return ((ReportAccountSummaryMapper)this.baseMapper).listOrganizationSummary(param, authPO);
|
||||
// }, this.asyncTaskExecutor);
|
||||
// CompletableFuture<ReportAccountSummaryOrganizationVO> totalFuture = CompletableFuture.supplyAsync(() -> {
|
||||
// return (ReportAccountSummaryOrganizationVO)Optional.ofNullable(((ReportAccountSummaryMapper)this.baseMapper).getOrganizationSummaryTotal(param, authPO)).orElse(new ReportAccountSummaryOrganizationVO());
|
||||
// }, this.asyncTaskExecutor);
|
||||
// CompletableFuture<Void> future = CompletableFuture.allOf(listFuture, totalFuture);
|
||||
// future.join();
|
||||
// List<ReportAccountSummaryOrganizationVO> list = (List)listFuture.join();
|
||||
// ReportAccountSummaryOrganizationVO total = (ReportAccountSummaryOrganizationVO)totalFuture.join();
|
||||
// return (new ReportBaseTotalVO()).setResultPage(PageVO.of(list)).setTotalLine(total);
|
||||
// }
|
||||
|
||||
public void consume(RepAccMqModel payload) {
|
||||
log.info("【报表-账户】报表MQ消费-个人日结：开始");
|
||||
log.info("【报表-账户】报表MQ消费-个人日结：结束");
|
||||
}
|
||||
|
||||
public void fix(ReportBaseParam param) {
|
||||
log.info("【报表-账户-修复】报表MQ消费-个人日结：开始");
|
||||
LocalDateTime startTime = param.getStartDate().atStartOfDay();
|
||||
LocalDateTime endTime = param.getEndDate().atTime(23, 59, 59);
|
||||
this.remove(Wrappers.lambdaQuery(ReportAccountSummary.class).between(ReportAccountSummary::getStatisticDate, param.getStartDate(), param.getEndDate()));
|
||||
((ReportAccountSummaryMapper)this.baseMapper).initByPayTime(startTime, endTime);
|
||||
log.info("【报表-账户-修复】报表MQ消费-个人日结：结束");
|
||||
}
|
||||
|
||||
// public ReportAccountSummaryVO pageAccountSummary(ReportBaseParam param) {
|
||||
// ReportAccountSummaryVO reportAccountSummaryVO = new ReportAccountSummaryVO();
|
||||
// LocalDateTime startTime = param.getStartDate().atStartOfDay();
|
||||
// LocalDateTime endTime = param.getEndDate().atTime(23, 59, 59);
|
||||
// this.reportAccountSummaryHead(param, reportAccountSummaryVO, startTime, endTime);
|
||||
// List<ReportAccountSummaryDetailPO> reportAccountSummaryDetailPOList = this.getReportAccountSummaryDetailPOS(param, startTime, endTime);
|
||||
// reportAccountSummaryVO.setReportAccountSummaryDetailPO(reportAccountSummaryDetailPOList);
|
||||
// return reportAccountSummaryVO;
|
||||
// }
|
||||
|
||||
// private void reportAccountSummaryHead(ReportBaseParam param, ReportAccountSummaryVO reportAccountSummaryVO, LocalDateTime startTime, LocalDateTime endTime) {
|
||||
// reportAccountSummaryVO.setBeginAccountNum(this.accInfoServiceV3Api.countAccInfosByTime(startTime));
|
||||
// reportAccountSummaryVO.setEndAccountNum(this.accInfoServiceV3Api.countAccInfosByTime(endTime));
|
||||
// reportAccountSummaryVO.setAccountNumChangeValue(reportAccountSummaryVO.getEndAccountNum() - reportAccountSummaryVO.getBeginAccountNum());
|
||||
// ReportAccountBalancePO reportAccountBalancePO = ((ReportAccountSummaryMapper)this.baseMapper).queryAccountBalance(param);
|
||||
// BeanUtil.copyProperties(reportAccountBalancePO, reportAccountSummaryVO, new String[0]);
|
||||
// ReportAccountDepositPO reportAccountDepositPO = ((ReportAccountSummaryMapper)this.baseMapper).queryAccountDeposit(param);
|
||||
// BeanUtil.copyProperties(reportAccountDepositPO, reportAccountSummaryVO, new String[0]);
|
||||
// }
|
||||
//
|
||||
// private List<ReportAccountSummaryDetailPO> getReportAccountSummaryDetailPOS(ReportBaseParam param, LocalDateTime startTime, LocalDateTime endTime) {
|
||||
// List<ReportAccountSummaryDetailPO> reportAccountSummaryDetailPOList = new ArrayList();
|
||||
// ReportAccountConsumPO reportAccountConsumPO = ((ReportAccountSummaryMapper)this.baseMapper).queryAccountConsum(param);
|
||||
// reportAccountSummaryDetailPOList.add(new ReportAccountSummaryDetailPO("线上消费", reportAccountConsumPO.getOccurNum(), 0L, reportAccountConsumPO.getAccountBalanceChange(), BigDecimal.ZERO, reportAccountConsumPO.getAccountBalanceChange()));
|
||||
// reportAccountSummaryDetailPOList.add(new ReportAccountSummaryDetailPO("线下消费", reportAccountConsumPO.getOfflineOccurNum(), 0L, reportAccountConsumPO.getOfflineAccountBalanceChange(), BigDecimal.ZERO, reportAccountConsumPO.getOfflineAccountBalanceChange()));
|
||||
// List<ReportAccountSummaryDetailPO> list = (List)Optional.ofNullable(((ReportAccountSummaryMapper)this.baseMapper).queryAccountPayChannelSummary(param)).orElse(new ArrayList());
|
||||
// list.forEach((e) -> {
|
||||
// e.setOperationDetails(PayChannelEnum.getDesc(e.getPayChannel()) + "充值");
|
||||
// });
|
||||
// reportAccountSummaryDetailPOList.addAll(list);
|
||||
// ReportAccountSummaryDetailPO withdrawCashPO = ((ReportAccountSummaryMapper)this.baseMapper).queryAccountWithdrawCash(param);
|
||||
// reportAccountSummaryDetailPOList.add(withdrawCashPO);
|
||||
// ReportAccountSummaryDetailPO subsidyPO = ((ReportAccountSummaryMapper)this.baseMapper).queryAccountSubsidy(param);
|
||||
// reportAccountSummaryDetailPOList.add(subsidyPO);
|
||||
// AccCountVO cancelAccCountVO = this.accInfoServiceV3Api.accCountStatistics(new AccCountDTO(startTime, endTime, AccStatusEnum.CANCEL.getKey()));
|
||||
// reportAccountSummaryDetailPOList.add(new ReportAccountSummaryDetailPO("注销", cancelAccCountVO.getAccNums(), cancelAccCountVO.getAccNums(), BigDecimal.ZERO, cancelAccCountVO.getDepositTotal(), BigDecimal.ZERO));
|
||||
// AccCountVO accCountVO = this.accInfoServiceV3Api.accCountStatistics(new AccCountDTO(startTime, endTime, AccStatusEnum.NORMAL.getKey()));
|
||||
// reportAccountSummaryDetailPOList.add(new ReportAccountSummaryDetailPO("开户", accCountVO.getAccNums(), accCountVO.getAccNums(), BigDecimal.ZERO, accCountVO.getDepositTotal(), BigDecimal.ZERO));
|
||||
// ReportAccountSummaryDetailPO changeCardPO = ((ReportAccountSummaryMapper)this.baseMapper).queryAccountChangeCard(param);
|
||||
// reportAccountSummaryDetailPOList.add(changeCardPO);
|
||||
// return reportAccountSummaryDetailPOList;
|
||||
// }
|
||||
|
||||
// public ReportAccountSummaryExportVO exportAccountSummary(ReportBaseParam param) {
|
||||
// ReportAccountSummaryVO reportAccountSummaryVO = new ReportAccountSummaryVO();
|
||||
// LocalDateTime startTime = param.getStartDate().atStartOfDay();
|
||||
// LocalDateTime endTime = param.getEndDate().atTime(23, 59, 59);
|
||||
// this.reportAccountSummaryHead(param, reportAccountSummaryVO, startTime, endTime);
|
||||
// ReportAccountSummaryExportVO reportAccountSummaryExportVO = (ReportAccountSummaryExportVO) LeBeanUtil.copyCreateProperties(reportAccountSummaryVO, ReportAccountSummaryExportVO.class);
|
||||
// List<ReportAccountSummaryDetailPO> reportAccountSummaryDetailPOList = this.getReportAccountSummaryDetailPOS(param, startTime, endTime);
|
||||
// List<ReportAccountSummaryDetailExportPO> reportAccountSummaryDetailPO = LeBeanUtil.copyCreateList(reportAccountSummaryDetailPOList, ReportAccountSummaryDetailExportPO.class);
|
||||
// reportAccountSummaryExportVO.setReportAccountSummaryDetailPO(reportAccountSummaryDetailPO);
|
||||
// reportAccountSummaryExportVO.setStartDate(String.valueOf(param.getStartDate()));
|
||||
// reportAccountSummaryExportVO.setEndDate(String.valueOf(param.getEndDate()));
|
||||
// return reportAccountSummaryExportVO;
|
||||
// }
|
||||
|
||||
public ReportAccountDataSumVO queryAccountDataSummary(ReportBaseParam param) {
|
||||
CompletableFuture<ReportAccountDataDepositSumParam> reportAccountDataDepositSum = this.getReportAccountDataDepositSum(param);
|
||||
CompletableFuture<ReportAccountDataConsumeSumParam> reportAccountDataConsumeSum = this.getReportAccountDataConsumeSum(param);
|
||||
CompletableFuture<ReportSumRechargeVO> reportSumRecharge = this.getReportSumRecharge(param);
|
||||
CompletableFuture<ReportAccountDataBalanceParam> reportAccountDataBalanceParam = this.getReportAccountDataBalanceSum(param);
|
||||
CompletableFuture<ReportAccountDataNumSumParam> reportAccountDataNumSumParam = this.getReportAccountDataCardNumSum(param);
|
||||
CompletableFuture<Void> allOfFutures = CompletableFuture.allOf(reportAccountDataDepositSum, reportAccountDataConsumeSum, reportSumRecharge, reportAccountDataBalanceParam, reportAccountDataNumSumParam);
|
||||
CompletableFuture<ReportAccountDataSumVO> reportAccountDataSum = allOfFutures.thenApply((result) -> {
|
||||
return new ReportAccountDataSumVO((ReportAccountDataNumSumParam)reportAccountDataNumSumParam.join(), (ReportAccountDataBalanceParam)reportAccountDataBalanceParam.join(), (ReportAccountDataDepositSumParam)reportAccountDataDepositSum.join(), (ReportAccountDataConsumeSumParam)reportAccountDataConsumeSum.join(), (ReportSumRechargeVO)reportSumRecharge.join());
|
||||
}).exceptionally((ex) -> {
|
||||
String var10002 = I18n.getMessage("report.account-data-total-error");
|
||||
throw new ServiceException(var10002 + ex.getMessage());
|
||||
});
|
||||
return (ReportAccountDataSumVO)reportAccountDataSum.join();
|
||||
}
|
||||
|
||||
private CompletableFuture<ReportAccountDataNumSumParam> getReportAccountDataCardNumSum(ReportBaseParam param) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
ReportAccountDataNumParam reportAccountDataNumParam = this.reportAccCardSummaryTaskService.queryAccountDataNumSum(param);
|
||||
ReportAccountDataCardNumParam reportAccountDataCardNumParam = this.reportAccCardSummaryTaskService.queryAccountDataCardNumSum(param);
|
||||
if (param.getStartDate().isEqual(LocalDate.now()) || param.getEndDate().isEqual(LocalDate.now())) {
|
||||
AccStatisticsSumDTO accStatisticsSumDTO = new AccStatisticsSumDTO();
|
||||
accStatisticsSumDTO.setStartTime(LocalDate.now().atStartOfDay());
|
||||
accStatisticsSumDTO.setEndTime(LocalDate.now().atTime(23, 59, 59));
|
||||
AccStatisticsSumVO accStatisticsSumVO = this.accInfoServiceV3Api.accStatisticsSum(accStatisticsSumDTO);
|
||||
AccCountStatisticsVO accCountStatisticsVO = accStatisticsSumVO.getAccCountStatisticsVO();
|
||||
reportAccountDataNumParam.setNormalCount(accCountStatisticsVO.getNormalCount());
|
||||
reportAccountDataNumParam.setDeactivateCount(accCountStatisticsVO.getDeactivateCount());
|
||||
reportAccountDataNumParam.setExpireCount(accCountStatisticsVO.getExpireCount());
|
||||
reportAccountDataNumParam.setOpenCount(reportAccountDataNumParam.getOpenCount() + accCountStatisticsVO.getOpenCount());
|
||||
reportAccountDataNumParam.setClosedCount(reportAccountDataNumParam.getClosedCount() + accCountStatisticsVO.getClosedCount());
|
||||
reportAccountDataNumParam.setEndCount(reportAccountDataNumParam.getNormalCount() + reportAccountDataNumParam.getDeactivateCount() + reportAccountDataNumParam.getExpireCount());
|
||||
reportAccountDataNumParam.setChangeCount(reportAccountDataNumParam.getEndCount() - reportAccountDataNumParam.getStartCount());
|
||||
AccCardStatisticsVO accCardStatisticsVO = accStatisticsSumVO.getAccCardStatisticsVO();
|
||||
reportAccountDataCardNumParam.setNormalCount(accCardStatisticsVO.getNormalCount());
|
||||
reportAccountDataCardNumParam.setLossCount(accCardStatisticsVO.getLossCount());
|
||||
reportAccountDataCardNumParam.setEndCount(reportAccountDataCardNumParam.getNormalCount() + reportAccountDataCardNumParam.getLossCount());
|
||||
reportAccountDataCardNumParam.setChangeCount(reportAccountDataCardNumParam.getEndCount() - reportAccountDataCardNumParam.getStartCount());
|
||||
reportAccountDataCardNumParam.setIntervalOpenCount(reportAccountDataCardNumParam.getIntervalOpenCount() + accCardStatisticsVO.getIntervalOpenCount());
|
||||
reportAccountDataCardNumParam.setIntervalLossCount(reportAccountDataCardNumParam.getIntervalLossCount() + accCardStatisticsVO.getIntervalLossCount());
|
||||
}
|
||||
|
||||
return new ReportAccountDataNumSumParam(reportAccountDataNumParam, reportAccountDataCardNumParam);
|
||||
}, this.asyncTaskExecutor);
|
||||
}
|
||||
|
||||
private CompletableFuture<ReportAccountDataBalanceParam> getReportAccountDataBalanceSum(ReportBaseParam param) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
return this.reportRevenueSummaryService.getReportAccountDataBalanceSum(param);
|
||||
}, this.asyncTaskExecutor);
|
||||
}
|
||||
|
||||
private CompletableFuture<ReportAccountDataDepositSumParam> getReportAccountDataDepositSum(ReportBaseParam param) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
ReportSumDepositVO reportSumDepositVO = this.reportRevenueSummaryService.querySystemDepositCost(param);
|
||||
ReportAccountDataDepositSumParam reportAccountDataDepositSumParam = LeBeanUtil.copyCreateProperties(reportSumDepositVO, ReportAccountDataDepositSumParam.class);
|
||||
reportAccountDataDepositSumParam.setDepositChangeAmount(reportAccountDataDepositSumParam.getEndDepositAmount().subtract(reportAccountDataDepositSumParam.getBeginDepositAmount()));
|
||||
reportAccountDataDepositSumParam.setProductCostChange(reportAccountDataDepositSumParam.getEndProductCost().subtract(reportAccountDataDepositSumParam.getBeginProductCost()));
|
||||
return reportAccountDataDepositSumParam;
|
||||
}, this.asyncTaskExecutor);
|
||||
}
|
||||
|
||||
private CompletableFuture<ReportAccountDataConsumeSumParam> getReportAccountDataConsumeSum(ReportBaseParam param) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
return this.reportRevenueSummaryService.queryAccountDataConsumeSummary(param);
|
||||
}, this.asyncTaskExecutor);
|
||||
}
|
||||
|
||||
private CompletableFuture<ReportSumRechargeVO> getReportSumRecharge(ReportBaseParam param) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
return this.reportRevenueSummaryService.querySystemIncome(param);
|
||||
}, this.asyncTaskExecutor);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
package com.bonus.canteen.core.report.statistics.account.vo;
|
||||
|
||||
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataBalanceParam;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataConsumeSumParam;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataDepositSumParam;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataNumSumParam;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.vo.ReportSumRechargeVO;
|
||||
|
||||
public class ReportAccountDataSumVO {
|
||||
private ReportAccountDataNumSumParam reportAccountDataNumSumParam;
|
||||
private ReportAccountDataBalanceParam reportAccountDataBalanceParam;
|
||||
private ReportAccountDataDepositSumParam reportAccountDataDepositSumParam;
|
||||
private ReportAccountDataConsumeSumParam reportAccountDataConsumeSumParam;
|
||||
private ReportSumRechargeVO reportSumRechargeVO;
|
||||
|
||||
public ReportAccountDataSumVO(ReportAccountDataNumSumParam reportAccountDataNumSumParam, ReportAccountDataBalanceParam reportAccountDataBalanceParam, ReportAccountDataDepositSumParam reportAccountDataDepositSumParam, ReportAccountDataConsumeSumParam reportAccountDataConsumeSumParam, ReportSumRechargeVO reportSumRechargeVO) {
|
||||
this.reportAccountDataNumSumParam = reportAccountDataNumSumParam;
|
||||
this.reportAccountDataBalanceParam = reportAccountDataBalanceParam;
|
||||
this.reportAccountDataDepositSumParam = reportAccountDataDepositSumParam;
|
||||
this.reportAccountDataConsumeSumParam = reportAccountDataConsumeSumParam;
|
||||
this.reportSumRechargeVO = reportSumRechargeVO;
|
||||
}
|
||||
|
||||
public ReportAccountDataNumSumParam getReportAccountDataNumSumParam() {
|
||||
return this.reportAccountDataNumSumParam;
|
||||
}
|
||||
|
||||
public ReportAccountDataBalanceParam getReportAccountDataBalanceParam() {
|
||||
return this.reportAccountDataBalanceParam;
|
||||
}
|
||||
|
||||
public ReportAccountDataDepositSumParam getReportAccountDataDepositSumParam() {
|
||||
return this.reportAccountDataDepositSumParam;
|
||||
}
|
||||
|
||||
public ReportAccountDataConsumeSumParam getReportAccountDataConsumeSumParam() {
|
||||
return this.reportAccountDataConsumeSumParam;
|
||||
}
|
||||
|
||||
public ReportSumRechargeVO getReportSumRechargeVO() {
|
||||
return this.reportSumRechargeVO;
|
||||
}
|
||||
|
||||
public void setReportAccountDataNumSumParam(final ReportAccountDataNumSumParam reportAccountDataNumSumParam) {
|
||||
this.reportAccountDataNumSumParam = reportAccountDataNumSumParam;
|
||||
}
|
||||
|
||||
public void setReportAccountDataBalanceParam(final ReportAccountDataBalanceParam reportAccountDataBalanceParam) {
|
||||
this.reportAccountDataBalanceParam = reportAccountDataBalanceParam;
|
||||
}
|
||||
|
||||
public void setReportAccountDataDepositSumParam(final ReportAccountDataDepositSumParam reportAccountDataDepositSumParam) {
|
||||
this.reportAccountDataDepositSumParam = reportAccountDataDepositSumParam;
|
||||
}
|
||||
|
||||
public void setReportAccountDataConsumeSumParam(final ReportAccountDataConsumeSumParam reportAccountDataConsumeSumParam) {
|
||||
this.reportAccountDataConsumeSumParam = reportAccountDataConsumeSumParam;
|
||||
}
|
||||
|
||||
public void setReportSumRechargeVO(final ReportSumRechargeVO reportSumRechargeVO) {
|
||||
this.reportSumRechargeVO = reportSumRechargeVO;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getReportAccountDataNumSumParam());
|
||||
return "ReportAccountDataSumVO(reportAccountDataNumSumParam=" + var10000 + ", reportAccountDataBalanceParam=" + String.valueOf(this.getReportAccountDataBalanceParam()) + ", reportAccountDataDepositSumParam=" + String.valueOf(this.getReportAccountDataDepositSumParam()) + ", reportAccountDataConsumeSumParam=" + String.valueOf(this.getReportAccountDataConsumeSumParam()) + ", reportSumRechargeVO=" + String.valueOf(this.getReportSumRechargeVO()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
|
||||
import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataBalanceParam;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataConsumeSumParam;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.param.ReportProductCostVO;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.vo.*;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportBaseParam;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Mapper
|
||||
public interface ReportRevenueSummaryMapper {
|
||||
ReportSumRechargeVO querySystemIncome(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportSumConsumeVO querySystemConsume(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
|
||||
ReportSumDepositVO querySystemDepositCost(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
|
||||
ReportProductCostVO querySystemProductCost(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
|
||||
@InterceptorIgnore
|
||||
ReportAccountDataConsumeSumParam queryAccountDataConsumeSummary(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
|
||||
ReportAccountDataBalanceParam getReportAccountDataBalanceSum(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportPersonWalletSumVO queryPersonWalletRecharge(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportWalletConsumeVO queryWalletForConsume(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO, @Param("walletId") Integer walletId);
|
||||
//
|
||||
// ReportPersonWalletSumVO queryPersonWalletWithdrawal(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// BigDecimal queryWalletForBalance(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO, @Param("walletId") Integer walletId, @Param("balType") String balType);
|
||||
//
|
||||
// ReportSubsidyWalletSumVO queryWalletForSubsidy(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportRedWalletSumVO queryWalletForRed(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportNotAccountSumVO queryNotAccountSum(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// ReportManageSumVO queryManageAmount(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
//
|
||||
// BigDecimal queryManageBal(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO, @Param("balType") String balType);
|
||||
//
|
||||
// BigDecimal queryCouponConsume(@Param("param") ReportBaseParam param, @Param("authPO") MgrUserAuthPO authPO);
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.param;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class ReportProductCostVO {
|
||||
@ApiModelProperty("本期工本费收取金额")
|
||||
private BigDecimal productCost;
|
||||
@ApiModelProperty("本期工本费退回金额")
|
||||
private BigDecimal refundProductCost;
|
||||
@ApiModelProperty("期初工本费金额")
|
||||
private BigDecimal beginProductCost;
|
||||
@ApiModelProperty("期末工本费金额")
|
||||
private BigDecimal endProductCost;
|
||||
|
||||
public BigDecimal getProductCost() {
|
||||
return this.productCost;
|
||||
}
|
||||
|
||||
public BigDecimal getRefundProductCost() {
|
||||
return this.refundProductCost;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginProductCost() {
|
||||
return this.beginProductCost;
|
||||
}
|
||||
|
||||
public BigDecimal getEndProductCost() {
|
||||
return this.endProductCost;
|
||||
}
|
||||
|
||||
public void setProductCost(final BigDecimal productCost) {
|
||||
this.productCost = productCost;
|
||||
}
|
||||
|
||||
public void setRefundProductCost(final BigDecimal refundProductCost) {
|
||||
this.refundProductCost = refundProductCost;
|
||||
}
|
||||
|
||||
public void setBeginProductCost(final BigDecimal beginProductCost) {
|
||||
this.beginProductCost = beginProductCost;
|
||||
}
|
||||
|
||||
public void setEndProductCost(final BigDecimal endProductCost) {
|
||||
this.endProductCost = endProductCost;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getProductCost());
|
||||
return "ReportProductCostVO(productCost=" + var10000 + ", refundProductCost=" + String.valueOf(this.getRefundProductCost()) + ", beginProductCost=" + String.valueOf(this.getBeginProductCost()) + ", endProductCost=" + String.valueOf(this.getEndProductCost()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.service;
|
||||
|
||||
import com.bonus.canteen.core.account.v3.metadata.enums.AccWalletIdEnum;
|
||||
import com.bonus.canteen.core.auth.api.MgrAuthApi;
|
||||
import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
|
||||
import com.bonus.canteen.core.marketing.coupon.service.MktCouponService;
|
||||
import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMetrics;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataBalanceParam;
|
||||
import com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataConsumeSumParam;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.mapper.ReportRevenueSummaryMapper;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.param.ReportProductCostVO;
|
||||
import com.bonus.canteen.core.report.statistics.order.summary.vo.*;
|
||||
import com.bonus.canteen.core.report.statistics.param.ReportBaseParam;
|
||||
import com.bonus.common.houqin.utils.LeBeanUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Service
|
||||
public class ReportRevenueSummaryService {
|
||||
private static final Logger log = LoggerFactory.getLogger(ReportRevenueSummaryService.class);
|
||||
private static final String BEGIN_AMOUNT = "begin";
|
||||
private static final String END_AMOUNT = "end";
|
||||
@Autowired
|
||||
private ReportRevenueSummaryMapper reportRevenueSummaryMapper;
|
||||
@Autowired
|
||||
private MgrAuthApi mgrAuthApi;
|
||||
@Autowired
|
||||
private MktCouponService mktCouponService;
|
||||
|
||||
public ReportSumRechargeVO querySystemIncome(ReportBaseParam param) {
|
||||
MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
return this.reportRevenueSummaryMapper.querySystemIncome(param, authPO);
|
||||
}
|
||||
|
||||
// public ReportSumConsumeVO querySystemConsume(ReportBaseParam param) {
|
||||
// MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
// return this.reportRevenueSummaryMapper.querySystemConsume(param, authPO);
|
||||
// }
|
||||
|
||||
public ReportSumDepositVO querySystemDepositCost(ReportBaseParam param) {
|
||||
MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
ReportSumDepositVO reportSumDepositVO = this.reportRevenueSummaryMapper.querySystemDepositCost(param, authPO);
|
||||
ReportProductCostVO reportProductCostVO = this.reportRevenueSummaryMapper.querySystemProductCost(param, authPO);
|
||||
LeBeanUtil.copyProperties(reportProductCostVO, reportSumDepositVO);
|
||||
return reportSumDepositVO;
|
||||
}
|
||||
|
||||
public ReportAccountDataConsumeSumParam queryAccountDataConsumeSummary(ReportBaseParam param) {
|
||||
MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
return this.reportRevenueSummaryMapper.queryAccountDataConsumeSummary(param, authPO);
|
||||
}
|
||||
|
||||
public ReportAccountDataBalanceParam getReportAccountDataBalanceSum(ReportBaseParam param) {
|
||||
MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
return this.reportRevenueSummaryMapper.getReportAccountDataBalanceSum(param, authPO);
|
||||
}
|
||||
|
||||
// public ReportWalletSumVO queryWalletSum(ReportBaseParam param) {
|
||||
// MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
// long personStart = System.currentTimeMillis();
|
||||
// ReportPersonWalletSumVO personWallet = this.reportRevenueSummaryMapper.queryPersonWalletRecharge(param, authPO);
|
||||
// ReportWalletConsumeVO consumePerson = this.reportRevenueSummaryMapper.queryWalletForConsume(param, authPO, AccWalletIdEnum.WALLET.getKey());
|
||||
// ReportPersonWalletSumVO withdrawalPerson = this.reportRevenueSummaryMapper.queryPersonWalletWithdrawal(param, authPO);
|
||||
// BigDecimal personBegin = this.reportRevenueSummaryMapper.queryWalletForBalance(param, authPO, AccWalletIdEnum.WALLET.getKey(), "begin");
|
||||
// BigDecimal endBegin = this.reportRevenueSummaryMapper.queryWalletForBalance(param, authPO, AccWalletIdEnum.WALLET.getKey(), "end");
|
||||
// LeBeanUtil.copyProperties(withdrawalPerson, personWallet);
|
||||
// personWallet.setPersonNormalConsume(consumePerson.getNormalConsume());
|
||||
// personWallet.setPersonAccountRefund(consumePerson.getAccountRefund());
|
||||
// personWallet.setPersonDeductionConsume(consumePerson.getDeductionConsume());
|
||||
// personWallet.setPersonAccountConsume(consumePerson.getAccountConsume());
|
||||
// personWallet.setPersonBeginAmount(personBegin);
|
||||
// personWallet.setPersonEndAmount(endBegin);
|
||||
// log.info("获取个人钱包信息耗时: {}", System.currentTimeMillis() - personStart);
|
||||
// long subsidyStart = System.currentTimeMillis();
|
||||
// ReportSubsidyWalletSumVO subsidyWallet = this.reportRevenueSummaryMapper.queryWalletForSubsidy(param, authPO);
|
||||
// ReportWalletConsumeVO consumeSubsidy = this.reportRevenueSummaryMapper.queryWalletForConsume(param, authPO, AccWalletIdEnum.SUBSIDY.getKey());
|
||||
// BigDecimal subsidyBeginAmount = this.reportRevenueSummaryMapper.queryWalletForBalance(param, authPO, AccWalletIdEnum.SUBSIDY.getKey(), "begin");
|
||||
// BigDecimal subsidyEndAmount = this.reportRevenueSummaryMapper.queryWalletForBalance(param, authPO, AccWalletIdEnum.SUBSIDY.getKey(), "end");
|
||||
// subsidyWallet.setSubsidyAccountConsume(consumeSubsidy.getAccountConsume());
|
||||
// subsidyWallet.setSubsidyNormalConsume(consumeSubsidy.getNormalConsume());
|
||||
// subsidyWallet.setSubsidyAccountRefund(consumeSubsidy.getAccountRefund());
|
||||
// subsidyWallet.setSubsidyDeductionConsume(consumeSubsidy.getDeductionConsume());
|
||||
// subsidyWallet.setSubsidyBeginAmount(subsidyBeginAmount);
|
||||
// subsidyWallet.setSubsidyEndAmount(subsidyEndAmount);
|
||||
// log.info("获取补贴钱包信息耗时: {}", System.currentTimeMillis() - subsidyStart);
|
||||
// long redStart = System.currentTimeMillis();
|
||||
// ReportRedWalletSumVO redWallet = this.reportRevenueSummaryMapper.queryWalletForRed(param, authPO);
|
||||
// ReportWalletConsumeVO consumeRed = this.reportRevenueSummaryMapper.queryWalletForConsume(param, authPO, AccWalletIdEnum.LUCK_MONEY.getKey());
|
||||
// redWallet.setRedNormalConsume(consumeRed.getNormalConsume());
|
||||
// redWallet.setRedAccountRefund(consumeRed.getAccountRefund());
|
||||
// redWallet.setRedDeductionConsume(consumeRed.getDeductionConsume());
|
||||
// redWallet.setRedAccountConsume(consumeRed.getAccountConsume());
|
||||
// BigDecimal redBeginAmount = this.reportRevenueSummaryMapper.queryWalletForBalance(param, authPO, AccWalletIdEnum.LUCK_MONEY.getKey(), "begin");
|
||||
// BigDecimal redEndAmount = this.reportRevenueSummaryMapper.queryWalletForBalance(param, authPO, AccWalletIdEnum.LUCK_MONEY.getKey(), "end");
|
||||
// redWallet.setRedBeginAmount(redBeginAmount);
|
||||
// redWallet.setRedEndAmount(redEndAmount);
|
||||
// log.info("获取红包钱包信息耗时: {}", System.currentTimeMillis() - redStart);
|
||||
// ReportNotAccountSumVO notAccount = this.reportRevenueSummaryMapper.queryNotAccountSum(param, authPO);
|
||||
// ReportWalletSumVO reportWalletSumVO = new ReportWalletSumVO();
|
||||
// reportWalletSumVO.setPersonWallet(personWallet);
|
||||
// reportWalletSumVO.setSubsidyWallet(subsidyWallet);
|
||||
// reportWalletSumVO.setRedWallet(redWallet);
|
||||
// reportWalletSumVO.setNotAccount(notAccount);
|
||||
// return reportWalletSumVO;
|
||||
// }
|
||||
|
||||
// public ReportMixSumVO queryMixSumCost(ReportBaseParam param) {
|
||||
// MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
// ReportSumDepositVO reportSumDepositVO = this.reportRevenueSummaryMapper.querySystemDepositCost(param, authPO);
|
||||
// ReportProductCostVO reportProductCostVO = this.reportRevenueSummaryMapper.querySystemProductCost(param, authPO);
|
||||
// LeBeanUtil.copyProperties(reportProductCostVO, reportSumDepositVO);
|
||||
// ReportManageSumVO reportManageSumVO = this.reportRevenueSummaryMapper.queryManageAmount(param, authPO);
|
||||
// BigDecimal begin = this.reportRevenueSummaryMapper.queryManageBal(param, authPO, "begin");
|
||||
// BigDecimal end = this.reportRevenueSummaryMapper.queryManageBal(param, authPO, "end");
|
||||
// reportManageSumVO.setManageBeginAmount(begin);
|
||||
// reportManageSumVO.setManageEndAmount(end);
|
||||
// ReportMixSumVO reportMixSumVO = new ReportMixSumVO();
|
||||
// reportMixSumVO.setDeposit(reportSumDepositVO);
|
||||
// reportMixSumVO.setManage(reportManageSumVO);
|
||||
// return reportMixSumVO;
|
||||
// }
|
||||
|
||||
// public ReportSumCouponVO queryCouponSum(ReportBaseParam param) {
|
||||
// MgrUserAuthPO authPO = this.mgrAuthApi.getUserAuthPO();
|
||||
// ReportSumCouponVO reportSumCouponVO = new ReportSumCouponVO();
|
||||
// MktCouponMetrics metrics = this.mktCouponService.getCouponReport(param.getStartDate(), param.getEndDate());
|
||||
// if (metrics != null) {
|
||||
// LeBeanUtil.copyProperties(metrics, reportSumCouponVO);
|
||||
// }
|
||||
//
|
||||
// BigDecimal couponConsume = this.reportRevenueSummaryMapper.queryCouponConsume(param, authPO).divide(new BigDecimal("100"));
|
||||
// reportSumCouponVO.setNormalConsumption(couponConsume);
|
||||
// return reportSumCouponVO;
|
||||
// }
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@ApiModel("账户管理费")
|
||||
public class ReportManageSumVO {
|
||||
@ApiModelProperty("账户管理费收取")
|
||||
private BigDecimal manageCostAmount;
|
||||
@ApiModelProperty("账户管理费期初余额")
|
||||
private BigDecimal manageBeginAmount;
|
||||
@ApiModelProperty("账户管理费期末余额")
|
||||
private BigDecimal manageEndAmount;
|
||||
|
||||
public BigDecimal getManageCostAmount() {
|
||||
return this.manageCostAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getManageBeginAmount() {
|
||||
return this.manageBeginAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getManageEndAmount() {
|
||||
return this.manageEndAmount;
|
||||
}
|
||||
|
||||
public void setManageCostAmount(final BigDecimal manageCostAmount) {
|
||||
this.manageCostAmount = manageCostAmount;
|
||||
}
|
||||
|
||||
public void setManageBeginAmount(final BigDecimal manageBeginAmount) {
|
||||
this.manageBeginAmount = manageBeginAmount;
|
||||
}
|
||||
|
||||
public void setManageEndAmount(final BigDecimal manageEndAmount) {
|
||||
this.manageEndAmount = manageEndAmount;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getManageCostAmount());
|
||||
return "ReportManageSumVO(manageCostAmount=" + var10000 + ", manageBeginAmount=" + String.valueOf(this.getManageBeginAmount()) + ", manageEndAmount=" + String.valueOf(this.getManageEndAmount()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
@ApiModel("押金工本账户管理类")
|
||||
public class ReportMixSumVO {
|
||||
@ApiModelProperty("押金")
|
||||
private ReportSumDepositVO deposit;
|
||||
@ApiModelProperty("账户管理费")
|
||||
private ReportManageSumVO manage;
|
||||
|
||||
public ReportSumDepositVO getDeposit() {
|
||||
return this.deposit;
|
||||
}
|
||||
|
||||
public ReportManageSumVO getManage() {
|
||||
return this.manage;
|
||||
}
|
||||
|
||||
public void setDeposit(final ReportSumDepositVO deposit) {
|
||||
this.deposit = deposit;
|
||||
}
|
||||
|
||||
public void setManage(final ReportManageSumVO manage) {
|
||||
this.manage = manage;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getDeposit());
|
||||
return "ReportMixSumVO(deposit=" + var10000 + ", manage=" + String.valueOf(this.getManage()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@ApiModel("非系统账户")
|
||||
public class ReportNotAccountSumVO {
|
||||
@ApiModelProperty("微信消费")
|
||||
private BigDecimal wechatConsume;
|
||||
@ApiModelProperty("支付宝消费")
|
||||
private BigDecimal alipayConsume;
|
||||
@ApiModelProperty("现金消费")
|
||||
private BigDecimal cashConsume;
|
||||
@ApiModelProperty("银行消费")
|
||||
private BigDecimal bankConsume;
|
||||
@ApiModelProperty("第三方系统消费")
|
||||
private BigDecimal thirdConsume;
|
||||
@ApiModelProperty("其他消费")
|
||||
private BigDecimal otherConsume;
|
||||
@ApiModelProperty("非系统账户消费")
|
||||
private BigDecimal notAccountConsume;
|
||||
|
||||
public BigDecimal getWechatConsume() {
|
||||
return this.wechatConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayConsume() {
|
||||
return this.alipayConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getCashConsume() {
|
||||
return this.cashConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getBankConsume() {
|
||||
return this.bankConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getThirdConsume() {
|
||||
return this.thirdConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getOtherConsume() {
|
||||
return this.otherConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getNotAccountConsume() {
|
||||
return this.notAccountConsume;
|
||||
}
|
||||
|
||||
public void setWechatConsume(final BigDecimal wechatConsume) {
|
||||
this.wechatConsume = wechatConsume;
|
||||
}
|
||||
|
||||
public void setAlipayConsume(final BigDecimal alipayConsume) {
|
||||
this.alipayConsume = alipayConsume;
|
||||
}
|
||||
|
||||
public void setCashConsume(final BigDecimal cashConsume) {
|
||||
this.cashConsume = cashConsume;
|
||||
}
|
||||
|
||||
public void setBankConsume(final BigDecimal bankConsume) {
|
||||
this.bankConsume = bankConsume;
|
||||
}
|
||||
|
||||
public void setThirdConsume(final BigDecimal thirdConsume) {
|
||||
this.thirdConsume = thirdConsume;
|
||||
}
|
||||
|
||||
public void setOtherConsume(final BigDecimal otherConsume) {
|
||||
this.otherConsume = otherConsume;
|
||||
}
|
||||
|
||||
public void setNotAccountConsume(final BigDecimal notAccountConsume) {
|
||||
this.notAccountConsume = notAccountConsume;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getWechatConsume());
|
||||
return "ReportNotAccountSumVO(wechatConsume=" + var10000 + ", alipayConsume=" + String.valueOf(this.getAlipayConsume()) + ", cashConsume=" + String.valueOf(this.getCashConsume()) + ", bankConsume=" + String.valueOf(this.getBankConsume()) + ", thirdConsume=" + String.valueOf(this.getThirdConsume()) + ", otherConsume=" + String.valueOf(this.getOtherConsume()) + ", notAccountConsume=" + String.valueOf(this.getNotAccountConsume()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,215 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@ApiModel("个人钱包")
|
||||
public class ReportPersonWalletSumVO {
|
||||
@ApiModelProperty("微信充值")
|
||||
private BigDecimal wechatRecharge;
|
||||
@ApiModelProperty("支付宝充值")
|
||||
private BigDecimal alipayRecharge;
|
||||
@ApiModelProperty("现金充值")
|
||||
private BigDecimal cashRecharge;
|
||||
@ApiModelProperty("银行充值")
|
||||
private BigDecimal bankRecharge;
|
||||
@ApiModelProperty("第三方充值")
|
||||
private BigDecimal thirdRecharge;
|
||||
@ApiModelProperty("其他充值")
|
||||
private BigDecimal otherRecharge;
|
||||
@ApiModelProperty("个人钱包充值")
|
||||
private BigDecimal totalRecharge;
|
||||
@ApiModelProperty("个人钱包充值赠送金额")
|
||||
private BigDecimal giftAmount;
|
||||
@ApiModelProperty("正常消费")
|
||||
private BigDecimal personNormalConsume;
|
||||
@ApiModelProperty("退单退款")
|
||||
private BigDecimal personAccountRefund;
|
||||
@ApiModelProperty("补扣消费")
|
||||
private BigDecimal personDeductionConsume;
|
||||
@ApiModelProperty("个人钱包消费")
|
||||
private BigDecimal personAccountConsume;
|
||||
@ApiModelProperty("支付宝提现")
|
||||
private BigDecimal alipayWithdraw;
|
||||
@ApiModelProperty("微信提现")
|
||||
private BigDecimal wechatWithdraw;
|
||||
@ApiModelProperty("现金提现")
|
||||
private BigDecimal cashWithdraw;
|
||||
@ApiModelProperty("银行提现")
|
||||
private BigDecimal bankWithdraw;
|
||||
@ApiModelProperty("其他提现")
|
||||
private BigDecimal otherWithdraw;
|
||||
@ApiModelProperty("个人钱包提现")
|
||||
private BigDecimal totalWithdraw;
|
||||
@ApiModelProperty("个人钱包期初余额")
|
||||
private BigDecimal personBeginAmount;
|
||||
@ApiModelProperty("个人钱包期末余额")
|
||||
private BigDecimal personEndAmount;
|
||||
|
||||
public BigDecimal getWechatRecharge() {
|
||||
return this.wechatRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayRecharge() {
|
||||
return this.alipayRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getCashRecharge() {
|
||||
return this.cashRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getBankRecharge() {
|
||||
return this.bankRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getThirdRecharge() {
|
||||
return this.thirdRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getOtherRecharge() {
|
||||
return this.otherRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalRecharge() {
|
||||
return this.totalRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getGiftAmount() {
|
||||
return this.giftAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getPersonNormalConsume() {
|
||||
return this.personNormalConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getPersonAccountRefund() {
|
||||
return this.personAccountRefund;
|
||||
}
|
||||
|
||||
public BigDecimal getPersonDeductionConsume() {
|
||||
return this.personDeductionConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getPersonAccountConsume() {
|
||||
return this.personAccountConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayWithdraw() {
|
||||
return this.alipayWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getWechatWithdraw() {
|
||||
return this.wechatWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getCashWithdraw() {
|
||||
return this.cashWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getBankWithdraw() {
|
||||
return this.bankWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getOtherWithdraw() {
|
||||
return this.otherWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalWithdraw() {
|
||||
return this.totalWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getPersonBeginAmount() {
|
||||
return this.personBeginAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getPersonEndAmount() {
|
||||
return this.personEndAmount;
|
||||
}
|
||||
|
||||
public void setWechatRecharge(final BigDecimal wechatRecharge) {
|
||||
this.wechatRecharge = wechatRecharge;
|
||||
}
|
||||
|
||||
public void setAlipayRecharge(final BigDecimal alipayRecharge) {
|
||||
this.alipayRecharge = alipayRecharge;
|
||||
}
|
||||
|
||||
public void setCashRecharge(final BigDecimal cashRecharge) {
|
||||
this.cashRecharge = cashRecharge;
|
||||
}
|
||||
|
||||
public void setBankRecharge(final BigDecimal bankRecharge) {
|
||||
this.bankRecharge = bankRecharge;
|
||||
}
|
||||
|
||||
public void setThirdRecharge(final BigDecimal thirdRecharge) {
|
||||
this.thirdRecharge = thirdRecharge;
|
||||
}
|
||||
|
||||
public void setOtherRecharge(final BigDecimal otherRecharge) {
|
||||
this.otherRecharge = otherRecharge;
|
||||
}
|
||||
|
||||
public void setTotalRecharge(final BigDecimal totalRecharge) {
|
||||
this.totalRecharge = totalRecharge;
|
||||
}
|
||||
|
||||
public void setGiftAmount(final BigDecimal giftAmount) {
|
||||
this.giftAmount = giftAmount;
|
||||
}
|
||||
|
||||
public void setPersonNormalConsume(final BigDecimal personNormalConsume) {
|
||||
this.personNormalConsume = personNormalConsume;
|
||||
}
|
||||
|
||||
public void setPersonAccountRefund(final BigDecimal personAccountRefund) {
|
||||
this.personAccountRefund = personAccountRefund;
|
||||
}
|
||||
|
||||
public void setPersonDeductionConsume(final BigDecimal personDeductionConsume) {
|
||||
this.personDeductionConsume = personDeductionConsume;
|
||||
}
|
||||
|
||||
public void setPersonAccountConsume(final BigDecimal personAccountConsume) {
|
||||
this.personAccountConsume = personAccountConsume;
|
||||
}
|
||||
|
||||
public void setAlipayWithdraw(final BigDecimal alipayWithdraw) {
|
||||
this.alipayWithdraw = alipayWithdraw;
|
||||
}
|
||||
|
||||
public void setWechatWithdraw(final BigDecimal wechatWithdraw) {
|
||||
this.wechatWithdraw = wechatWithdraw;
|
||||
}
|
||||
|
||||
public void setCashWithdraw(final BigDecimal cashWithdraw) {
|
||||
this.cashWithdraw = cashWithdraw;
|
||||
}
|
||||
|
||||
public void setBankWithdraw(final BigDecimal bankWithdraw) {
|
||||
this.bankWithdraw = bankWithdraw;
|
||||
}
|
||||
|
||||
public void setOtherWithdraw(final BigDecimal otherWithdraw) {
|
||||
this.otherWithdraw = otherWithdraw;
|
||||
}
|
||||
|
||||
public void setTotalWithdraw(final BigDecimal totalWithdraw) {
|
||||
this.totalWithdraw = totalWithdraw;
|
||||
}
|
||||
|
||||
public void setPersonBeginAmount(final BigDecimal personBeginAmount) {
|
||||
this.personBeginAmount = personBeginAmount;
|
||||
}
|
||||
|
||||
public void setPersonEndAmount(final BigDecimal personEndAmount) {
|
||||
this.personEndAmount = personEndAmount;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getWechatRecharge());
|
||||
return "ReportPersonWalletSumVO(wechatRecharge=" + var10000 + ", alipayRecharge=" + String.valueOf(this.getAlipayRecharge()) + ", cashRecharge=" + String.valueOf(this.getCashRecharge()) + ", bankRecharge=" + String.valueOf(this.getBankRecharge()) + ", thirdRecharge=" + String.valueOf(this.getThirdRecharge()) + ", otherRecharge=" + String.valueOf(this.getOtherRecharge()) + ", totalRecharge=" + String.valueOf(this.getTotalRecharge()) + ", giftAmount=" + String.valueOf(this.getGiftAmount()) + ", personNormalConsume=" + String.valueOf(this.getPersonNormalConsume()) + ", personAccountRefund=" + String.valueOf(this.getPersonAccountRefund()) + ", personDeductionConsume=" + String.valueOf(this.getPersonDeductionConsume()) + ", personAccountConsume=" + String.valueOf(this.getPersonAccountConsume()) + ", alipayWithdraw=" + String.valueOf(this.getAlipayWithdraw()) + ", wechatWithdraw=" + String.valueOf(this.getWechatWithdraw()) + ", cashWithdraw=" + String.valueOf(this.getCashWithdraw()) + ", bankWithdraw=" + String.valueOf(this.getBankWithdraw()) + ", otherWithdraw=" + String.valueOf(this.getOtherWithdraw()) + ", totalWithdraw=" + String.valueOf(this.getTotalWithdraw()) + ", personBeginAmount=" + String.valueOf(this.getPersonBeginAmount()) + ", personEndAmount=" + String.valueOf(this.getPersonEndAmount()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@ApiModel("红包钱包")
|
||||
public class ReportRedWalletSumVO {
|
||||
@ApiModelProperty("红包钱包发放")
|
||||
private BigDecimal redTotal;
|
||||
@ApiModelProperty("正常消费")
|
||||
private BigDecimal redNormalConsume;
|
||||
@ApiModelProperty("退单退款")
|
||||
private BigDecimal redAccountRefund;
|
||||
@ApiModelProperty("补扣消费")
|
||||
private BigDecimal redDeductionConsume;
|
||||
@ApiModelProperty("红包钱包消费")
|
||||
private BigDecimal redAccountConsume;
|
||||
@ApiModelProperty("红包期初余额")
|
||||
private BigDecimal redBeginAmount;
|
||||
@ApiModelProperty("红包期末余额")
|
||||
private BigDecimal redEndAmount;
|
||||
|
||||
public BigDecimal getRedTotal() {
|
||||
return this.redTotal;
|
||||
}
|
||||
|
||||
public BigDecimal getRedNormalConsume() {
|
||||
return this.redNormalConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getRedAccountRefund() {
|
||||
return this.redAccountRefund;
|
||||
}
|
||||
|
||||
public BigDecimal getRedDeductionConsume() {
|
||||
return this.redDeductionConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getRedAccountConsume() {
|
||||
return this.redAccountConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getRedBeginAmount() {
|
||||
return this.redBeginAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getRedEndAmount() {
|
||||
return this.redEndAmount;
|
||||
}
|
||||
|
||||
public void setRedTotal(final BigDecimal redTotal) {
|
||||
this.redTotal = redTotal;
|
||||
}
|
||||
|
||||
public void setRedNormalConsume(final BigDecimal redNormalConsume) {
|
||||
this.redNormalConsume = redNormalConsume;
|
||||
}
|
||||
|
||||
public void setRedAccountRefund(final BigDecimal redAccountRefund) {
|
||||
this.redAccountRefund = redAccountRefund;
|
||||
}
|
||||
|
||||
public void setRedDeductionConsume(final BigDecimal redDeductionConsume) {
|
||||
this.redDeductionConsume = redDeductionConsume;
|
||||
}
|
||||
|
||||
public void setRedAccountConsume(final BigDecimal redAccountConsume) {
|
||||
this.redAccountConsume = redAccountConsume;
|
||||
}
|
||||
|
||||
public void setRedBeginAmount(final BigDecimal redBeginAmount) {
|
||||
this.redBeginAmount = redBeginAmount;
|
||||
}
|
||||
|
||||
public void setRedEndAmount(final BigDecimal redEndAmount) {
|
||||
this.redEndAmount = redEndAmount;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getRedTotal());
|
||||
return "ReportRedWalletSumVO(redTotal=" + var10000 + ", redNormalConsume=" + String.valueOf(this.getRedNormalConsume()) + ", redAccountRefund=" + String.valueOf(this.getRedAccountRefund()) + ", redDeductionConsume=" + String.valueOf(this.getRedDeductionConsume()) + ", redAccountConsume=" + String.valueOf(this.getRedAccountConsume()) + ", redBeginAmount=" + String.valueOf(this.getRedBeginAmount()) + ", redEndAmount=" + String.valueOf(this.getRedEndAmount()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,105 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@ApiModel("补贴钱包")
|
||||
public class ReportSubsidyWalletSumVO {
|
||||
@ApiModelProperty("补贴钱包发放")
|
||||
private BigDecimal totalSubsidy;
|
||||
@ApiModelProperty("正常消费")
|
||||
private BigDecimal subsidyNormalConsume;
|
||||
@ApiModelProperty("退单退款")
|
||||
private BigDecimal subsidyAccountRefund;
|
||||
@ApiModelProperty("补扣消费")
|
||||
private BigDecimal subsidyDeductionConsume;
|
||||
@ApiModelProperty("补贴钱包消费")
|
||||
private BigDecimal subsidyAccountConsume;
|
||||
@ApiModelProperty("补贴钱包提现")
|
||||
private BigDecimal subsidyWithdraw;
|
||||
@ApiModelProperty("补贴钱包清空")
|
||||
private BigDecimal subsidyClear;
|
||||
@ApiModelProperty("补贴期初余额")
|
||||
private BigDecimal subsidyBeginAmount;
|
||||
@ApiModelProperty("补贴期末余额")
|
||||
private BigDecimal subsidyEndAmount;
|
||||
|
||||
public BigDecimal getTotalSubsidy() {
|
||||
return this.totalSubsidy;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyNormalConsume() {
|
||||
return this.subsidyNormalConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyAccountRefund() {
|
||||
return this.subsidyAccountRefund;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyDeductionConsume() {
|
||||
return this.subsidyDeductionConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyAccountConsume() {
|
||||
return this.subsidyAccountConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyWithdraw() {
|
||||
return this.subsidyWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyClear() {
|
||||
return this.subsidyClear;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyBeginAmount() {
|
||||
return this.subsidyBeginAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyEndAmount() {
|
||||
return this.subsidyEndAmount;
|
||||
}
|
||||
|
||||
public void setTotalSubsidy(final BigDecimal totalSubsidy) {
|
||||
this.totalSubsidy = totalSubsidy;
|
||||
}
|
||||
|
||||
public void setSubsidyNormalConsume(final BigDecimal subsidyNormalConsume) {
|
||||
this.subsidyNormalConsume = subsidyNormalConsume;
|
||||
}
|
||||
|
||||
public void setSubsidyAccountRefund(final BigDecimal subsidyAccountRefund) {
|
||||
this.subsidyAccountRefund = subsidyAccountRefund;
|
||||
}
|
||||
|
||||
public void setSubsidyDeductionConsume(final BigDecimal subsidyDeductionConsume) {
|
||||
this.subsidyDeductionConsume = subsidyDeductionConsume;
|
||||
}
|
||||
|
||||
public void setSubsidyAccountConsume(final BigDecimal subsidyAccountConsume) {
|
||||
this.subsidyAccountConsume = subsidyAccountConsume;
|
||||
}
|
||||
|
||||
public void setSubsidyWithdraw(final BigDecimal subsidyWithdraw) {
|
||||
this.subsidyWithdraw = subsidyWithdraw;
|
||||
}
|
||||
|
||||
public void setSubsidyClear(final BigDecimal subsidyClear) {
|
||||
this.subsidyClear = subsidyClear;
|
||||
}
|
||||
|
||||
public void setSubsidyBeginAmount(final BigDecimal subsidyBeginAmount) {
|
||||
this.subsidyBeginAmount = subsidyBeginAmount;
|
||||
}
|
||||
|
||||
public void setSubsidyEndAmount(final BigDecimal subsidyEndAmount) {
|
||||
this.subsidyEndAmount = subsidyEndAmount;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getTotalSubsidy());
|
||||
return "ReportSubsidyWalletSumVO(totalSubsidy=" + var10000 + ", subsidyNormalConsume=" + String.valueOf(this.getSubsidyNormalConsume()) + ", subsidyAccountRefund=" + String.valueOf(this.getSubsidyAccountRefund()) + ", subsidyDeductionConsume=" + String.valueOf(this.getSubsidyDeductionConsume()) + ", subsidyAccountConsume=" + String.valueOf(this.getSubsidyAccountConsume()) + ", subsidyWithdraw=" + String.valueOf(this.getSubsidyWithdraw()) + ", subsidyClear=" + String.valueOf(this.getSubsidyClear()) + ", subsidyBeginAmount=" + String.valueOf(this.getSubsidyBeginAmount()) + ", subsidyEndAmount=" + String.valueOf(this.getSubsidyEndAmount()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,133 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class ReportSumConsumeVO {
|
||||
@ApiModelProperty("账户-正常消费")
|
||||
private BigDecimal normalConsume;
|
||||
@ApiModelProperty("账户-退单退款")
|
||||
private BigDecimal accountRefund;
|
||||
@ApiModelProperty("账户-补扣消费")
|
||||
private BigDecimal deductionConsume;
|
||||
@ApiModelProperty("账户-消费总额")
|
||||
private BigDecimal accountConsume;
|
||||
@ApiModelProperty("账户期初余额")
|
||||
private BigDecimal beginAmount;
|
||||
@ApiModelProperty("账户期末余额")
|
||||
private BigDecimal endAmount;
|
||||
@ApiModelProperty("微信消费")
|
||||
private BigDecimal wechatConsume;
|
||||
@ApiModelProperty("支付宝消费")
|
||||
private BigDecimal alipayConsume;
|
||||
@ApiModelProperty("现金消费")
|
||||
private BigDecimal cashConsume;
|
||||
@ApiModelProperty("银行消费")
|
||||
private BigDecimal bankConsume;
|
||||
@ApiModelProperty("餐券消费")
|
||||
private BigDecimal couponConsume;
|
||||
@ApiModelProperty("第三方消费")
|
||||
private BigDecimal thirdConsume;
|
||||
|
||||
public BigDecimal getNormalConsume() {
|
||||
return this.normalConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getAccountRefund() {
|
||||
return this.accountRefund;
|
||||
}
|
||||
|
||||
public BigDecimal getDeductionConsume() {
|
||||
return this.deductionConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getAccountConsume() {
|
||||
return this.accountConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginAmount() {
|
||||
return this.beginAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getEndAmount() {
|
||||
return this.endAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getWechatConsume() {
|
||||
return this.wechatConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayConsume() {
|
||||
return this.alipayConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getCashConsume() {
|
||||
return this.cashConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getBankConsume() {
|
||||
return this.bankConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getCouponConsume() {
|
||||
return this.couponConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getThirdConsume() {
|
||||
return this.thirdConsume;
|
||||
}
|
||||
|
||||
public void setNormalConsume(final BigDecimal normalConsume) {
|
||||
this.normalConsume = normalConsume;
|
||||
}
|
||||
|
||||
public void setAccountRefund(final BigDecimal accountRefund) {
|
||||
this.accountRefund = accountRefund;
|
||||
}
|
||||
|
||||
public void setDeductionConsume(final BigDecimal deductionConsume) {
|
||||
this.deductionConsume = deductionConsume;
|
||||
}
|
||||
|
||||
public void setAccountConsume(final BigDecimal accountConsume) {
|
||||
this.accountConsume = accountConsume;
|
||||
}
|
||||
|
||||
public void setBeginAmount(final BigDecimal beginAmount) {
|
||||
this.beginAmount = beginAmount;
|
||||
}
|
||||
|
||||
public void setEndAmount(final BigDecimal endAmount) {
|
||||
this.endAmount = endAmount;
|
||||
}
|
||||
|
||||
public void setWechatConsume(final BigDecimal wechatConsume) {
|
||||
this.wechatConsume = wechatConsume;
|
||||
}
|
||||
|
||||
public void setAlipayConsume(final BigDecimal alipayConsume) {
|
||||
this.alipayConsume = alipayConsume;
|
||||
}
|
||||
|
||||
public void setCashConsume(final BigDecimal cashConsume) {
|
||||
this.cashConsume = cashConsume;
|
||||
}
|
||||
|
||||
public void setBankConsume(final BigDecimal bankConsume) {
|
||||
this.bankConsume = bankConsume;
|
||||
}
|
||||
|
||||
public void setCouponConsume(final BigDecimal couponConsume) {
|
||||
this.couponConsume = couponConsume;
|
||||
}
|
||||
|
||||
public void setThirdConsume(final BigDecimal thirdConsume) {
|
||||
this.thirdConsume = thirdConsume;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getNormalConsume());
|
||||
return "ReportSumConsumeVO(normalConsume=" + var10000 + ", accountRefund=" + String.valueOf(this.getAccountRefund()) + ", deductionConsume=" + String.valueOf(this.getDeductionConsume()) + ", accountConsume=" + String.valueOf(this.getAccountConsume()) + ", beginAmount=" + String.valueOf(this.getBeginAmount()) + ", endAmount=" + String.valueOf(this.getEndAmount()) + ", wechatConsume=" + String.valueOf(this.getWechatConsume()) + ", alipayConsume=" + String.valueOf(this.getAlipayConsume()) + ", cashConsume=" + String.valueOf(this.getCashConsume()) + ", bankConsume=" + String.valueOf(this.getBankConsume()) + ", couponConsume=" + String.valueOf(this.getCouponConsume()) + ", thirdConsume=" + String.valueOf(this.getThirdConsume()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@ApiModel("餐券信息")
|
||||
public class ReportSumCouponVO {
|
||||
@ApiModelProperty("餐券发放总额")
|
||||
private BigDecimal totalCouponGrant;
|
||||
@ApiModelProperty("正常消费总额")
|
||||
private BigDecimal normalConsumption;
|
||||
@ApiModelProperty("餐券过期总额")
|
||||
private BigDecimal couponExpired;
|
||||
@ApiModelProperty("餐券期初余额")
|
||||
private BigDecimal beginCoupon;
|
||||
@ApiModelProperty("餐券期末余额")
|
||||
private BigDecimal endCoupon;
|
||||
|
||||
public ReportSumCouponVO() {
|
||||
this.totalCouponGrant = BigDecimal.ZERO;
|
||||
this.normalConsumption = BigDecimal.ZERO;
|
||||
this.couponExpired = BigDecimal.ZERO;
|
||||
this.beginCoupon = BigDecimal.ZERO;
|
||||
this.endCoupon = BigDecimal.ZERO;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalCouponGrant() {
|
||||
return this.totalCouponGrant;
|
||||
}
|
||||
|
||||
public BigDecimal getNormalConsumption() {
|
||||
return this.normalConsumption;
|
||||
}
|
||||
|
||||
public BigDecimal getCouponExpired() {
|
||||
return this.couponExpired;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginCoupon() {
|
||||
return this.beginCoupon;
|
||||
}
|
||||
|
||||
public BigDecimal getEndCoupon() {
|
||||
return this.endCoupon;
|
||||
}
|
||||
|
||||
public void setTotalCouponGrant(final BigDecimal totalCouponGrant) {
|
||||
this.totalCouponGrant = totalCouponGrant;
|
||||
}
|
||||
|
||||
public void setNormalConsumption(final BigDecimal normalConsumption) {
|
||||
this.normalConsumption = normalConsumption;
|
||||
}
|
||||
|
||||
public void setCouponExpired(final BigDecimal couponExpired) {
|
||||
this.couponExpired = couponExpired;
|
||||
}
|
||||
|
||||
public void setBeginCoupon(final BigDecimal beginCoupon) {
|
||||
this.beginCoupon = beginCoupon;
|
||||
}
|
||||
|
||||
public void setEndCoupon(final BigDecimal endCoupon) {
|
||||
this.endCoupon = endCoupon;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getTotalCouponGrant());
|
||||
return "ReportSumCouponVO(totalCouponGrant=" + var10000 + ", normalConsumption=" + String.valueOf(this.getNormalConsumption()) + ", couponExpired=" + String.valueOf(this.getCouponExpired()) + ", beginCoupon=" + String.valueOf(this.getBeginCoupon()) + ", endCoupon=" + String.valueOf(this.getEndCoupon()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class ReportSumDepositVO {
|
||||
@ApiModelProperty("押金期初金额")
|
||||
private BigDecimal beginDepositAmount;
|
||||
@ApiModelProperty("押金期末金额")
|
||||
private BigDecimal endDepositAmount;
|
||||
@ApiModelProperty("本期押金收取金额")
|
||||
private BigDecimal depositAmount;
|
||||
@ApiModelProperty("本期押金退回金额")
|
||||
private BigDecimal refundDepositAmount;
|
||||
@ApiModelProperty("本期工本费收取金额")
|
||||
private BigDecimal productCost;
|
||||
@ApiModelProperty("本期工本费退回金额")
|
||||
private BigDecimal refundProductCost;
|
||||
@ApiModelProperty("期初工本费金额")
|
||||
private BigDecimal beginProductCost;
|
||||
@ApiModelProperty("期末工本费金额")
|
||||
private BigDecimal endProductCost;
|
||||
|
||||
public BigDecimal getBeginDepositAmount() {
|
||||
return this.beginDepositAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getEndDepositAmount() {
|
||||
return this.endDepositAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getDepositAmount() {
|
||||
return this.depositAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getRefundDepositAmount() {
|
||||
return this.refundDepositAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getProductCost() {
|
||||
return this.productCost;
|
||||
}
|
||||
|
||||
public BigDecimal getRefundProductCost() {
|
||||
return this.refundProductCost;
|
||||
}
|
||||
|
||||
public BigDecimal getBeginProductCost() {
|
||||
return this.beginProductCost;
|
||||
}
|
||||
|
||||
public BigDecimal getEndProductCost() {
|
||||
return this.endProductCost;
|
||||
}
|
||||
|
||||
public void setBeginDepositAmount(final BigDecimal beginDepositAmount) {
|
||||
this.beginDepositAmount = beginDepositAmount;
|
||||
}
|
||||
|
||||
public void setEndDepositAmount(final BigDecimal endDepositAmount) {
|
||||
this.endDepositAmount = endDepositAmount;
|
||||
}
|
||||
|
||||
public void setDepositAmount(final BigDecimal depositAmount) {
|
||||
this.depositAmount = depositAmount;
|
||||
}
|
||||
|
||||
public void setRefundDepositAmount(final BigDecimal refundDepositAmount) {
|
||||
this.refundDepositAmount = refundDepositAmount;
|
||||
}
|
||||
|
||||
public void setProductCost(final BigDecimal productCost) {
|
||||
this.productCost = productCost;
|
||||
}
|
||||
|
||||
public void setRefundProductCost(final BigDecimal refundProductCost) {
|
||||
this.refundProductCost = refundProductCost;
|
||||
}
|
||||
|
||||
public void setBeginProductCost(final BigDecimal beginProductCost) {
|
||||
this.beginProductCost = beginProductCost;
|
||||
}
|
||||
|
||||
public void setEndProductCost(final BigDecimal endProductCost) {
|
||||
this.endProductCost = endProductCost;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getBeginDepositAmount());
|
||||
return "ReportSumDepositVO(beginDepositAmount=" + var10000 + ", endDepositAmount=" + String.valueOf(this.getEndDepositAmount()) + ", depositAmount=" + String.valueOf(this.getDepositAmount()) + ", refundDepositAmount=" + String.valueOf(this.getRefundDepositAmount()) + ", productCost=" + String.valueOf(this.getProductCost()) + ", refundProductCost=" + String.valueOf(this.getRefundProductCost()) + ", beginProductCost=" + String.valueOf(this.getBeginProductCost()) + ", endProductCost=" + String.valueOf(this.getEndProductCost()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,223 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class ReportSumRechargeVO {
|
||||
@ApiModelProperty("微信充值")
|
||||
private BigDecimal wechatRecharge;
|
||||
@ApiModelProperty("支付宝充值")
|
||||
private BigDecimal alipayRecharge;
|
||||
@ApiModelProperty("现金充值")
|
||||
private BigDecimal cashRecharge;
|
||||
@ApiModelProperty("银行充值")
|
||||
private BigDecimal bankRecharge;
|
||||
@ApiModelProperty("第三方充值")
|
||||
private BigDecimal thirdRecharge;
|
||||
@ApiModelProperty("其他充值")
|
||||
private BigDecimal otherRecharge;
|
||||
@ApiModelProperty("个人充值总额")
|
||||
private BigDecimal rechargeAmount;
|
||||
@ApiModelProperty("充值赠送金额")
|
||||
private BigDecimal giftAmount;
|
||||
@ApiModelProperty("管理费总额")
|
||||
private BigDecimal manageCost;
|
||||
@ApiModelProperty("红包金额")
|
||||
private BigDecimal luckAmount;
|
||||
@ApiModelProperty("个人补贴金额")
|
||||
private BigDecimal subsidyAmount;
|
||||
@ApiModelProperty("补贴清空")
|
||||
private BigDecimal subsidyClearAmount;
|
||||
@ApiModelProperty("销户清空补贴")
|
||||
private BigDecimal cancelSubsidyClearAmount;
|
||||
@ApiModelProperty("清空总额")
|
||||
private BigDecimal clearAmount;
|
||||
@ApiModelProperty("微信提现")
|
||||
private BigDecimal wechatWithdraw;
|
||||
@ApiModelProperty("支付宝提现")
|
||||
private BigDecimal alipayWithdraw;
|
||||
@ApiModelProperty("现金提现")
|
||||
private BigDecimal cashWithdraw;
|
||||
@ApiModelProperty("银行提现")
|
||||
private BigDecimal bankWithdraw;
|
||||
@ApiModelProperty("提现总额")
|
||||
private BigDecimal totalWithdraw;
|
||||
@ApiModelProperty("个人钱包提现")
|
||||
private BigDecimal walletWithdraw;
|
||||
@ApiModelProperty("补贴钱包提现")
|
||||
private BigDecimal subsidyWithdraw;
|
||||
|
||||
public BigDecimal getWechatRecharge() {
|
||||
return this.wechatRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayRecharge() {
|
||||
return this.alipayRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getCashRecharge() {
|
||||
return this.cashRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getBankRecharge() {
|
||||
return this.bankRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getThirdRecharge() {
|
||||
return this.thirdRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getOtherRecharge() {
|
||||
return this.otherRecharge;
|
||||
}
|
||||
|
||||
public BigDecimal getRechargeAmount() {
|
||||
return this.rechargeAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getGiftAmount() {
|
||||
return this.giftAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getManageCost() {
|
||||
return this.manageCost;
|
||||
}
|
||||
|
||||
public BigDecimal getLuckAmount() {
|
||||
return this.luckAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyAmount() {
|
||||
return this.subsidyAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyClearAmount() {
|
||||
return this.subsidyClearAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getCancelSubsidyClearAmount() {
|
||||
return this.cancelSubsidyClearAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getClearAmount() {
|
||||
return this.clearAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getWechatWithdraw() {
|
||||
return this.wechatWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getAlipayWithdraw() {
|
||||
return this.alipayWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getCashWithdraw() {
|
||||
return this.cashWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getBankWithdraw() {
|
||||
return this.bankWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalWithdraw() {
|
||||
return this.totalWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getWalletWithdraw() {
|
||||
return this.walletWithdraw;
|
||||
}
|
||||
|
||||
public BigDecimal getSubsidyWithdraw() {
|
||||
return this.subsidyWithdraw;
|
||||
}
|
||||
|
||||
public void setWechatRecharge(final BigDecimal wechatRecharge) {
|
||||
this.wechatRecharge = wechatRecharge;
|
||||
}
|
||||
|
||||
public void setAlipayRecharge(final BigDecimal alipayRecharge) {
|
||||
this.alipayRecharge = alipayRecharge;
|
||||
}
|
||||
|
||||
public void setCashRecharge(final BigDecimal cashRecharge) {
|
||||
this.cashRecharge = cashRecharge;
|
||||
}
|
||||
|
||||
public void setBankRecharge(final BigDecimal bankRecharge) {
|
||||
this.bankRecharge = bankRecharge;
|
||||
}
|
||||
|
||||
public void setThirdRecharge(final BigDecimal thirdRecharge) {
|
||||
this.thirdRecharge = thirdRecharge;
|
||||
}
|
||||
|
||||
public void setOtherRecharge(final BigDecimal otherRecharge) {
|
||||
this.otherRecharge = otherRecharge;
|
||||
}
|
||||
|
||||
public void setRechargeAmount(final BigDecimal rechargeAmount) {
|
||||
this.rechargeAmount = rechargeAmount;
|
||||
}
|
||||
|
||||
public void setGiftAmount(final BigDecimal giftAmount) {
|
||||
this.giftAmount = giftAmount;
|
||||
}
|
||||
|
||||
public void setManageCost(final BigDecimal manageCost) {
|
||||
this.manageCost = manageCost;
|
||||
}
|
||||
|
||||
public void setLuckAmount(final BigDecimal luckAmount) {
|
||||
this.luckAmount = luckAmount;
|
||||
}
|
||||
|
||||
public void setSubsidyAmount(final BigDecimal subsidyAmount) {
|
||||
this.subsidyAmount = subsidyAmount;
|
||||
}
|
||||
|
||||
public void setSubsidyClearAmount(final BigDecimal subsidyClearAmount) {
|
||||
this.subsidyClearAmount = subsidyClearAmount;
|
||||
}
|
||||
|
||||
public void setCancelSubsidyClearAmount(final BigDecimal cancelSubsidyClearAmount) {
|
||||
this.cancelSubsidyClearAmount = cancelSubsidyClearAmount;
|
||||
}
|
||||
|
||||
public void setClearAmount(final BigDecimal clearAmount) {
|
||||
this.clearAmount = clearAmount;
|
||||
}
|
||||
|
||||
public void setWechatWithdraw(final BigDecimal wechatWithdraw) {
|
||||
this.wechatWithdraw = wechatWithdraw;
|
||||
}
|
||||
|
||||
public void setAlipayWithdraw(final BigDecimal alipayWithdraw) {
|
||||
this.alipayWithdraw = alipayWithdraw;
|
||||
}
|
||||
|
||||
public void setCashWithdraw(final BigDecimal cashWithdraw) {
|
||||
this.cashWithdraw = cashWithdraw;
|
||||
}
|
||||
|
||||
public void setBankWithdraw(final BigDecimal bankWithdraw) {
|
||||
this.bankWithdraw = bankWithdraw;
|
||||
}
|
||||
|
||||
public void setTotalWithdraw(final BigDecimal totalWithdraw) {
|
||||
this.totalWithdraw = totalWithdraw;
|
||||
}
|
||||
|
||||
public void setWalletWithdraw(final BigDecimal walletWithdraw) {
|
||||
this.walletWithdraw = walletWithdraw;
|
||||
}
|
||||
|
||||
public void setSubsidyWithdraw(final BigDecimal subsidyWithdraw) {
|
||||
this.subsidyWithdraw = subsidyWithdraw;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getWechatRecharge());
|
||||
return "ReportSumRechargeVO(wechatRecharge=" + var10000 + ", alipayRecharge=" + String.valueOf(this.getAlipayRecharge()) + ", cashRecharge=" + String.valueOf(this.getCashRecharge()) + ", bankRecharge=" + String.valueOf(this.getBankRecharge()) + ", thirdRecharge=" + String.valueOf(this.getThirdRecharge()) + ", otherRecharge=" + String.valueOf(this.getOtherRecharge()) + ", rechargeAmount=" + String.valueOf(this.getRechargeAmount()) + ", giftAmount=" + String.valueOf(this.getGiftAmount()) + ", manageCost=" + String.valueOf(this.getManageCost()) + ", luckAmount=" + String.valueOf(this.getLuckAmount()) + ", subsidyAmount=" + String.valueOf(this.getSubsidyAmount()) + ", subsidyClearAmount=" + String.valueOf(this.getSubsidyClearAmount()) + ", cancelSubsidyClearAmount=" + String.valueOf(this.getCancelSubsidyClearAmount()) + ", clearAmount=" + String.valueOf(this.getClearAmount()) + ", wechatWithdraw=" + String.valueOf(this.getWechatWithdraw()) + ", alipayWithdraw=" + String.valueOf(this.getAlipayWithdraw()) + ", cashWithdraw=" + String.valueOf(this.getCashWithdraw()) + ", bankWithdraw=" + String.valueOf(this.getBankWithdraw()) + ", totalWithdraw=" + String.valueOf(this.getTotalWithdraw()) + ", walletWithdraw=" + String.valueOf(this.getWalletWithdraw()) + ", subsidyWithdraw=" + String.valueOf(this.getSubsidyWithdraw()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@ApiModel("消费类")
|
||||
public class ReportWalletConsumeVO {
|
||||
@ApiModelProperty("正常消费")
|
||||
private BigDecimal normalConsume;
|
||||
@ApiModelProperty("退单退款")
|
||||
private BigDecimal accountRefund;
|
||||
@ApiModelProperty("补扣消费")
|
||||
private BigDecimal deductionConsume;
|
||||
@ApiModelProperty("总消费")
|
||||
private BigDecimal accountConsume;
|
||||
|
||||
public BigDecimal getNormalConsume() {
|
||||
return this.normalConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getAccountRefund() {
|
||||
return this.accountRefund;
|
||||
}
|
||||
|
||||
public BigDecimal getDeductionConsume() {
|
||||
return this.deductionConsume;
|
||||
}
|
||||
|
||||
public BigDecimal getAccountConsume() {
|
||||
return this.accountConsume;
|
||||
}
|
||||
|
||||
public void setNormalConsume(final BigDecimal normalConsume) {
|
||||
this.normalConsume = normalConsume;
|
||||
}
|
||||
|
||||
public void setAccountRefund(final BigDecimal accountRefund) {
|
||||
this.accountRefund = accountRefund;
|
||||
}
|
||||
|
||||
public void setDeductionConsume(final BigDecimal deductionConsume) {
|
||||
this.deductionConsume = deductionConsume;
|
||||
}
|
||||
|
||||
public void setAccountConsume(final BigDecimal accountConsume) {
|
||||
this.accountConsume = accountConsume;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getNormalConsume());
|
||||
return "ReportWalletConsumeVO(normalConsume=" + var10000 + ", accountRefund=" + String.valueOf(this.getAccountRefund()) + ", deductionConsume=" + String.valueOf(this.getDeductionConsume()) + ", accountConsume=" + String.valueOf(this.getAccountConsume()) + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.bonus.canteen.core.report.statistics.order.summary.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
@ApiModel("钱包")
|
||||
public class ReportWalletSumVO {
|
||||
@ApiModelProperty("个人钱包")
|
||||
private ReportPersonWalletSumVO personWallet;
|
||||
@ApiModelProperty("补贴钱包")
|
||||
private ReportSubsidyWalletSumVO subsidyWallet;
|
||||
@ApiModelProperty("红包钱包")
|
||||
private ReportRedWalletSumVO redWallet;
|
||||
@ApiModelProperty("非系统账户")
|
||||
private ReportNotAccountSumVO notAccount;
|
||||
|
||||
public ReportPersonWalletSumVO getPersonWallet() {
|
||||
return this.personWallet;
|
||||
}
|
||||
|
||||
public ReportSubsidyWalletSumVO getSubsidyWallet() {
|
||||
return this.subsidyWallet;
|
||||
}
|
||||
|
||||
public ReportRedWalletSumVO getRedWallet() {
|
||||
return this.redWallet;
|
||||
}
|
||||
|
||||
public ReportNotAccountSumVO getNotAccount() {
|
||||
return this.notAccount;
|
||||
}
|
||||
|
||||
public void setPersonWallet(final ReportPersonWalletSumVO personWallet) {
|
||||
this.personWallet = personWallet;
|
||||
}
|
||||
|
||||
public void setSubsidyWallet(final ReportSubsidyWalletSumVO subsidyWallet) {
|
||||
this.subsidyWallet = subsidyWallet;
|
||||
}
|
||||
|
||||
public void setRedWallet(final ReportRedWalletSumVO redWallet) {
|
||||
this.redWallet = redWallet;
|
||||
}
|
||||
|
||||
public void setNotAccount(final ReportNotAccountSumVO notAccount) {
|
||||
this.notAccount = notAccount;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
String var10000 = String.valueOf(this.getPersonWallet());
|
||||
return "ReportWalletSumVO(personWallet=" + var10000 + ", subsidyWallet=" + String.valueOf(this.getSubsidyWallet()) + ", redWallet=" + String.valueOf(this.getRedWallet()) + ", notAccount=" + String.valueOf(this.getNotAccount()) + ")";
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,94 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.canteen.core.report.statistics.account.mapper.ReportAccCardSummaryTaskMapper">
|
||||
<!--namespace根据路径填写-->
|
||||
<select id="queryAccountDataNumSum"
|
||||
resultType="com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataNumParam">
|
||||
SELECT
|
||||
b.begin_num AS start_count,
|
||||
c.end_num AS end_count,
|
||||
c.end_num - b.begin_num AS change_count,
|
||||
c.normal_count,
|
||||
c.deactivate_count,
|
||||
c.expire_count,
|
||||
a.open_count,
|
||||
a.closed_count
|
||||
FROM(
|
||||
SELECT
|
||||
ifnull( sum( open_account_num ), 0 ) AS open_count,
|
||||
ifnull( sum( logout_num ), 0 ) AS closed_count
|
||||
FROM
|
||||
report_acc_card_summary_task
|
||||
WHERE
|
||||
sum_type = 1
|
||||
AND statistic_date BETWEEN #{param.startDate} AND #{param.endDate}
|
||||
) a,
|
||||
(
|
||||
SELECT
|
||||
IFNULL(sum(r.end_num),0) AS begin_num
|
||||
FROM
|
||||
( SELECT org_id, max( statistic_date ) max_date FROM report_acc_card_summary_task WHERE statistic_date <![CDATA[<]]> #{param.startDate} AND sum_type = 1 GROUP BY org_id ) a
|
||||
INNER JOIN report_acc_card_summary_task r ON r.org_id = a.org_id
|
||||
AND r.statistic_date = a.max_date
|
||||
AND r.sum_type =1
|
||||
AND r.statistic_date <![CDATA[<]]> #{param.startDate}
|
||||
) b,
|
||||
(
|
||||
SELECT
|
||||
IFNULL(sum(r.end_num),0) AS end_num,
|
||||
IFNULL(sum(r.end_normal_num),0) AS normal_count,
|
||||
IFNULL(sum(r.end_deactivated_num),0) AS deactivate_count,
|
||||
IFNULL(sum(r.end_overdue_num),0) AS expire_count
|
||||
FROM
|
||||
( SELECT org_id, max( statistic_date ) max_date FROM report_acc_card_summary_task WHERE statistic_date <![CDATA[<=]]> #{param.endDate} AND sum_type = 1 GROUP BY org_id ) a
|
||||
INNER JOIN report_acc_card_summary_task r ON r.org_id = a.org_id
|
||||
AND r.statistic_date = a.max_date
|
||||
AND r.sum_type =1
|
||||
AND r.statistic_date <![CDATA[<=]]> #{param.endDate}
|
||||
) c
|
||||
</select>
|
||||
|
||||
<select id="queryAccountDataCardNumSum"
|
||||
resultType="com.bonus.canteen.core.report.statistics.account.param.ReportAccountDataCardNumParam">
|
||||
SELECT
|
||||
b.begin_num AS start_count,
|
||||
c.end_num AS end_count,
|
||||
c.end_num - b.begin_num AS change_count,
|
||||
c.normal_count,
|
||||
c.loss_count,
|
||||
a.interval_open_count,
|
||||
a.interval_loss_count
|
||||
FROM(
|
||||
SELECT
|
||||
ifnull(sum(open_account_num),0) AS interval_open_count,
|
||||
ifnull(sum(loss_card_num),0) AS interval_loss_count
|
||||
FROM
|
||||
report_acc_card_summary_task
|
||||
WHERE
|
||||
sum_type = 2
|
||||
AND statistic_date BETWEEN #{param.startDate} AND #{param.endDate}
|
||||
) a,
|
||||
(
|
||||
SELECT
|
||||
IFNULL(sum(r.end_num),0) AS begin_num
|
||||
FROM
|
||||
( SELECT org_id, max( statistic_date ) max_date FROM report_acc_card_summary_task WHERE statistic_date <![CDATA[<]]> #{param.startDate} AND sum_type = 2 GROUP BY org_id ) a
|
||||
INNER JOIN report_acc_card_summary_task r ON r.org_id = a.org_id
|
||||
AND r.statistic_date = a.max_date
|
||||
AND r.sum_type = 2
|
||||
AND r.statistic_date <![CDATA[<]]> #{param.startDate}
|
||||
) b,
|
||||
(
|
||||
SELECT
|
||||
IFNULL(sum(r.end_num),0) AS end_num,
|
||||
IFNULL(sum(r.end_normal_num),0) AS normal_count,
|
||||
IFNULL(sum(r.end_loss_card_num),0) AS loss_count
|
||||
FROM
|
||||
( SELECT org_id, max( statistic_date ) max_date FROM report_acc_card_summary_task WHERE statistic_date <![CDATA[<=]]> #{param.endDate} AND sum_type = 2 GROUP BY org_id ) a
|
||||
INNER JOIN report_acc_card_summary_task r ON r.org_id = a.org_id
|
||||
AND r.statistic_date = a.max_date
|
||||
AND r.sum_type = 2
|
||||
AND r.statistic_date <![CDATA[<=]]> #{param.endDate}
|
||||
) c
|
||||
</select>
|
||||
</mapper>
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue