diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java index fcd1e5b..00a457b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java @@ -19,20 +19,20 @@ public class AccInfoVo { @ApiModelProperty("账户状态 1正常 2冻结 3销户 4过期") private Integer accStatus; @ApiModelProperty("账户可用总余额(不包括冻结金额)") - private BigDecimal accBalTotal; + private Long accBalTotal; @ApiModelProperty("账户总余额(包含冻结金额)") - private BigDecimal accAllBal; + private Long accAllBal; @ApiModelProperty("个人钱包(可用)余额/分") - private BigDecimal walletBal; + private Long walletBal; @ApiModelProperty("补贴钱包(可用)余额/分") - private BigDecimal subsidyBal; + private Long subsidyBal; @ApiModelProperty("红包余额") - private BigDecimal redEnvelope; + private Long redEnvelope; @ApiModelProperty("个人钱包冻结金额") - private BigDecimal walletFreezeBal; + private Long walletFreezeBal; @ApiModelProperty("补贴钱包冻结金额") - private BigDecimal subFreezeBal; - private BigDecimal accFreezeBalTotal; + private Long subFreezeBal; + private Long accFreezeBalTotal; private List walletInfoList; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/WalletBalanceVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/WalletBalanceVO.java index 57f59a9..791ed96 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/WalletBalanceVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/WalletBalanceVO.java @@ -7,35 +7,35 @@ import java.math.BigDecimal; @Data public class WalletBalanceVO { @ApiModelProperty("个人钱包余额/分") - private BigDecimal walletBal; + private Long walletBal; @ApiModelProperty("补贴钱包余额/分") - private BigDecimal subsidyBal; + private Long subsidyBal; @ApiModelProperty("红包余额") - private BigDecimal redEnvelope; + private Long redEnvelope; @ApiModelProperty("个人钱包冻结金额") - private BigDecimal walletFreezeBal; + private Long walletFreezeBal; @ApiModelProperty("补贴钱包冻结金额") - private BigDecimal subFreezeBal; + private Long subFreezeBal; @ApiModelProperty("冻结金额") - private BigDecimal accFreezeBalTotal; + private Long accFreezeBalTotal; @ApiModelProperty("账户总余额(包含冻结金额)") - private BigDecimal accAllBal; + private Long accAllBal; @ApiModelProperty("账户可用余额总余额(不包括冻结金额)") - private BigDecimal accBalTotal; + private Long accBalTotal; @ApiModelProperty("账户状态 1正常 2冻结 3销户 4过期") private Integer accStatus; public static WalletBalanceVO of(AccInfoVo accInfoVo) { WalletBalanceVO walletBalanceVO = new WalletBalanceVO(); - walletBalanceVO.setAccBalTotal(accInfoVo.getAccBalTotal()); + //walletBalanceVO.setAccBalTotal(accInfoVo.getAccBalTotal()); walletBalanceVO.setAccAllBal(accInfoVo.getAccAllBal()); walletBalanceVO.setWalletBal(accInfoVo.getWalletBal()); walletBalanceVO.setSubsidyBal(accInfoVo.getSubsidyBal()); - walletBalanceVO.setRedEnvelope(accInfoVo.getRedEnvelope()); - walletBalanceVO.setWalletFreezeBal(accInfoVo.getWalletFreezeBal()); - walletBalanceVO.setSubFreezeBal(accInfoVo.getSubFreezeBal()); - walletBalanceVO.setAccFreezeBalTotal(accInfoVo.getAccFreezeBalTotal()); + //walletBalanceVO.setRedEnvelope(accInfoVo.getRedEnvelope()); + //walletBalanceVO.setWalletFreezeBal(accInfoVo.getWalletFreezeBal()); + //walletBalanceVO.setSubFreezeBal(accInfoVo.getSubFreezeBal()); + //walletBalanceVO.setAccFreezeBalTotal(accInfoVo.getAccFreezeBalTotal()); walletBalanceVO.setAccStatus(accInfoVo.getAccStatus()); return walletBalanceVO; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index 78cf88a..549f36d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java @@ -166,7 +166,7 @@ public class AccInfoServiceImpl implements IAccInfoService { } public WalletBalanceVO queryWalletBalance(AccInfo accInfo) { - log.info("[app]v4查询账户余额入参={}", JSONUtil.toJsonStr(accInfo)); + log.info("查询账户余额入参={}", JSONUtil.toJsonStr(accInfo)); AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accInfo); if (ObjectUtil.isNull(accInfoVO)) { throw new ServiceException("账户不存在"); @@ -178,17 +178,15 @@ public class AccInfoServiceImpl implements IAccInfoService { log.info("获取账户(钱包)信息,出参={}", JSONUtil.toJsonStr(accInfoVO)); } WalletBalanceVO walletBalanceVO = WalletBalanceVO.of(accInfoVO); - log.info("[app]v4查询账户余额入参={}", JSONUtil.toJsonStr(walletBalanceVO)); + log.info("查询账户余额入参={}", JSONUtil.toJsonStr(walletBalanceVO)); return walletBalanceVO; } protected void setAccInfoVODetailList(AccInfoVo accInfoVo, List walletInfoList) { if (ObjectUtil.isNotEmpty(walletInfoList)) { - //accInfoVo.setAccBalTotal((BigDecimal)walletInfoList.stream().map(AccWalletInfo::getWalletBal).filter(ObjectUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add)); - //BigDecimal frozenBalanceAll = (BigDecimal)walletInfoList.stream().map(AccWalletInfo::getFrozenBalance).filter(ObjectUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add); - //accInfoVo.setAccFreezeBalTotal(frozenBalanceAll); - accInfoVo.setAccAllBal(NumberUtil.add(accInfoVo.getAccBalTotal(), accInfoVo.getAccFreezeBalTotal())); - accInfoVo.setWalletInfoList(walletInfoList); + accInfoVo.setWalletBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.WALLET.getKey()).mapToLong(AccWalletInfo::getWalletBal).sum()); + accInfoVo.setSubsidyBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.SUBSIDY.getKey()).mapToLong(AccWalletInfo::getWalletBal).sum()); + accInfoVo.setAccAllBal(accInfoVo.getWalletBal() + accInfoVo.getSubsidyBal()); } } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java index 86e2b27..cffafc6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java @@ -56,14 +56,14 @@ public class AllocCanteen extends BaseEntity { /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss") private Date startBusinessTime; /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss") private Date endBusinessTime; /** 食堂图片链接 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java index 1861a86..2426881 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java @@ -71,14 +71,14 @@ public class AllocStall extends BaseEntity { /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss") private Date startBusinessTime; /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss") private Date endBusinessTime; /** 是否启用叫号 */