bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

余额二维码

This commit is contained in:
sxu 2025-04-08 13:03:21 +08:00
parent 1019fad136
commit f0463594ca
5 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java
View File

@ -19,20 +19,20 @@ public class AccInfoVo {
@ApiModelProperty("账户状态 1正常 2冻结 3销户 4过期") @ApiModelProperty("账户状态 1正常 2冻结 3销户 4过期")
private Integer accStatus; private Integer accStatus;
@ApiModelProperty("账户可用总余额(不包括冻结金额)") @ApiModelProperty("账户可用总余额(不包括冻结金额)")
private BigDecimal accBalTotal; private Long accBalTotal;
@ApiModelProperty("账户总余额(包含冻结金额)") @ApiModelProperty("账户总余额(包含冻结金额)")
private BigDecimal accAllBal; private Long accAllBal;
@ApiModelProperty("个人钱包(可用)余额/分") @ApiModelProperty("个人钱包(可用)余额/分")
private BigDecimal walletBal; private Long walletBal;
@ApiModelProperty("补贴钱包(可用)余额/分") @ApiModelProperty("补贴钱包(可用)余额/分")
private BigDecimal subsidyBal; private Long subsidyBal;
@ApiModelProperty("红包余额") @ApiModelProperty("红包余额")
private BigDecimal redEnvelope; private Long redEnvelope;
@ApiModelProperty("个人钱包冻结金额") @ApiModelProperty("个人钱包冻结金额")
private BigDecimal walletFreezeBal; private Long walletFreezeBal;
@ApiModelProperty("补贴钱包冻结金额") @ApiModelProperty("补贴钱包冻结金额")
private BigDecimal subFreezeBal; private Long subFreezeBal;
private BigDecimal accFreezeBalTotal; private Long accFreezeBalTotal;
private List<AccWalletInfo> walletInfoList; private List<AccWalletInfo> walletInfoList;
} }

26
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/WalletBalanceVO.java
View File

@ -7,35 +7,35 @@ import java.math.BigDecimal;
@Data @Data
public class WalletBalanceVO { public class WalletBalanceVO {
@ApiModelProperty("个人钱包余额/分") @ApiModelProperty("个人钱包余额/分")
private BigDecimal walletBal; private Long walletBal;
@ApiModelProperty("补贴钱包余额/分") @ApiModelProperty("补贴钱包余额/分")
private BigDecimal subsidyBal; private Long subsidyBal;
@ApiModelProperty("红包余额") @ApiModelProperty("红包余额")
private BigDecimal redEnvelope; private Long redEnvelope;
@ApiModelProperty("个人钱包冻结金额") @ApiModelProperty("个人钱包冻结金额")
private BigDecimal walletFreezeBal; private Long walletFreezeBal;
@ApiModelProperty("补贴钱包冻结金额") @ApiModelProperty("补贴钱包冻结金额")
private BigDecimal subFreezeBal; private Long subFreezeBal;
@ApiModelProperty("冻结金额") @ApiModelProperty("冻结金额")
private BigDecimal accFreezeBalTotal; private Long accFreezeBalTotal;
@ApiModelProperty("账户总余额(包含冻结金额)") @ApiModelProperty("账户总余额(包含冻结金额)")
private BigDecimal accAllBal; private Long accAllBal;
@ApiModelProperty("账户可用余额总余额(不包括冻结金额)") @ApiModelProperty("账户可用余额总余额(不包括冻结金额)")
private BigDecimal accBalTotal; private Long accBalTotal;
@ApiModelProperty("账户状态 1正常 2冻结 3销户 4过期") @ApiModelProperty("账户状态 1正常 2冻结 3销户 4过期")
private Integer accStatus; private Integer accStatus;
public static WalletBalanceVO of(AccInfoVo accInfoVo) { public static WalletBalanceVO of(AccInfoVo accInfoVo) {
WalletBalanceVO walletBalanceVO = new WalletBalanceVO(); WalletBalanceVO walletBalanceVO = new WalletBalanceVO();
walletBalanceVO.setAccBalTotal(accInfoVo.getAccBalTotal()); //walletBalanceVO.setAccBalTotal(accInfoVo.getAccBalTotal());
walletBalanceVO.setAccAllBal(accInfoVo.getAccAllBal()); walletBalanceVO.setAccAllBal(accInfoVo.getAccAllBal());
walletBalanceVO.setWalletBal(accInfoVo.getWalletBal()); walletBalanceVO.setWalletBal(accInfoVo.getWalletBal());
walletBalanceVO.setSubsidyBal(accInfoVo.getSubsidyBal()); walletBalanceVO.setSubsidyBal(accInfoVo.getSubsidyBal());
walletBalanceVO.setRedEnvelope(accInfoVo.getRedEnvelope()); //walletBalanceVO.setRedEnvelope(accInfoVo.getRedEnvelope());
walletBalanceVO.setWalletFreezeBal(accInfoVo.getWalletFreezeBal()); //walletBalanceVO.setWalletFreezeBal(accInfoVo.getWalletFreezeBal());
walletBalanceVO.setSubFreezeBal(accInfoVo.getSubFreezeBal()); //walletBalanceVO.setSubFreezeBal(accInfoVo.getSubFreezeBal());
walletBalanceVO.setAccFreezeBalTotal(accInfoVo.getAccFreezeBalTotal()); //walletBalanceVO.setAccFreezeBalTotal(accInfoVo.getAccFreezeBalTotal());
walletBalanceVO.setAccStatus(accInfoVo.getAccStatus()); walletBalanceVO.setAccStatus(accInfoVo.getAccStatus());
return walletBalanceVO; return walletBalanceVO;
} }

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
View File

@ -166,7 +166,7 @@ public class AccInfoServiceImpl implements IAccInfoService {
} }
public WalletBalanceVO queryWalletBalance(AccInfo accInfo) { public WalletBalanceVO queryWalletBalance(AccInfo accInfo) {
log.info("[app]v4查询账户余额入参={}", JSONUtil.toJsonStr(accInfo)); log.info("查询账户余额入参={}", JSONUtil.toJsonStr(accInfo));
AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accInfo); AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accInfo);
if (ObjectUtil.isNull(accInfoVO)) { if (ObjectUtil.isNull(accInfoVO)) {
throw new ServiceException("账户不存在"); throw new ServiceException("账户不存在");
@ -178,17 +178,15 @@ public class AccInfoServiceImpl implements IAccInfoService {
log.info("获取账户(钱包)信息,出参={}", JSONUtil.toJsonStr(accInfoVO)); log.info("获取账户(钱包)信息,出参={}", JSONUtil.toJsonStr(accInfoVO));
} }
WalletBalanceVO walletBalanceVO = WalletBalanceVO.of(accInfoVO); WalletBalanceVO walletBalanceVO = WalletBalanceVO.of(accInfoVO);
log.info("[app]v4查询账户余额入参={}", JSONUtil.toJsonStr(walletBalanceVO)); log.info("查询账户余额入参={}", JSONUtil.toJsonStr(walletBalanceVO));
return walletBalanceVO; return walletBalanceVO;
} }
protected void setAccInfoVODetailList(AccInfoVo accInfoVo, List<AccWalletInfo> walletInfoList) { protected void setAccInfoVODetailList(AccInfoVo accInfoVo, List<AccWalletInfo> walletInfoList) {
if (ObjectUtil.isNotEmpty(walletInfoList)) { if (ObjectUtil.isNotEmpty(walletInfoList)) {
//accInfoVo.setAccBalTotal((BigDecimal)walletInfoList.stream().map(AccWalletInfo::getWalletBal).filter(ObjectUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add)); accInfoVo.setWalletBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.WALLET.getKey()).mapToLong(AccWalletInfo::getWalletBal).sum());
//BigDecimal frozenBalanceAll = (BigDecimal)walletInfoList.stream().map(AccWalletInfo::getFrozenBalance).filter(ObjectUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add); accInfoVo.setSubsidyBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.SUBSIDY.getKey()).mapToLong(AccWalletInfo::getWalletBal).sum());
//accInfoVo.setAccFreezeBalTotal(frozenBalanceAll); accInfoVo.setAccAllBal(accInfoVo.getWalletBal() + accInfoVo.getSubsidyBal());
accInfoVo.setAccAllBal(NumberUtil.add(accInfoVo.getAccBalTotal(), accInfoVo.getAccFreezeBalTotal()));
accInfoVo.setWalletInfoList(walletInfoList);
} }
} }
} }

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java
View File

@ -56,14 +56,14 @@ public class AllocCanteen extends BaseEntity {
/** 营业时间 */ /** 营业时间 */
@ApiModelProperty(value = "营业时间") @ApiModelProperty(value = "营业时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "HH:mm:ss")
@Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss")
private Date startBusinessTime; private Date startBusinessTime;
/** 营业时间 */ /** 营业时间 */
@ApiModelProperty(value = "营业时间") @ApiModelProperty(value = "营业时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "HH:mm:ss")
@Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss")
private Date endBusinessTime; private Date endBusinessTime;
/** 食堂图片链接 */ /** 食堂图片链接 */

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java
View File

@ -71,14 +71,14 @@ public class AllocStall extends BaseEntity {
/** 营业时间 */ /** 营业时间 */
@ApiModelProperty(value = "营业时间") @ApiModelProperty(value = "营业时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "HH:mm:ss")
@Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss")
private Date startBusinessTime; private Date startBusinessTime;
/** 营业时间 */ /** 营业时间 */
@ApiModelProperty(value = "营业时间") @ApiModelProperty(value = "营业时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "HH:mm:ss")
@Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "营业时间", width = 30, dateFormat = "HH:mm:ss")
private Date endBusinessTime; private Date endBusinessTime;
/** 是否启用叫号 */ /** 是否启用叫号 */