czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

营业板块 金额问题

This commit is contained in:
wangw 2024-09-11 16:52:09 +08:00
parent 2ef311f887
commit 1dd8dc4508
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
View File

@ -266,7 +266,7 @@ public class TbShopInfo implements Serializable {
@ApiModelProperty(value = "是否免除桌位费 0否1是")
private Integer isTableFee;
@Column(name = "tableFee")
@Column(name = "table_fee")
@ApiModelProperty(value = "桌位费")
private BigDecimal tableFee;

17
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
View File

@ -90,11 +90,18 @@ public class SummaryServiceImpl implements SummaryService {
Integer newFlow = tbShopUserFlowMapper.tradeIndexNewFlow(param.getShopId(), DateUtil.getStrTime(param.getStartTime()), DateUtil.getStrTime(param.getEndTime()));
//台桌数
int tables = tbShopTableRepository.countAllByShopId(param.getShopId());
sale.put("totalSaleAmount", new BigDecimal(orderMap.get("saleAmount").toString()).add(refundAmount));//总金额
sale.put("incomeAmount", new BigDecimal(orderMap.get("saleAmount").toString()).add(new BigDecimal(flowMap.get("inAmount").toString())));//实收
sale.put("refundAmount", refundAmount);//销售退款金额
sale.put("inAmount", flowMap.get("inAmount"));//会员充值金额
sale.put("outAmount", flowMap.get("outAmount"));//会员退款金额
//收款金额
BigDecimal incomeAmount = new BigDecimal(orderMap.get("saleAmount").toString()).subtract(new BigDecimal(orderMap.get("saveAmount").toString()));//订单金额 - 优惠金额
sale.put("totalSaleAmount", incomeAmount.add(refundAmount));//总金额 销售收款金额＋销售退款金额
sale.put("incomeAmount", incomeAmount);//销售 收款金额
sale.put("refundAmount", refundAmount);//销售 退款金额
sale.put("totalVipAmount", new BigDecimal(flowMap.get("inAmount").toString()).add(new BigDecimal(flowMap.get("outAmount").toString())));//会员总金额
sale.put("inAmount", flowMap.get("inAmount")); //会员 充值金额
sale.put("outAmount", flowMap.get("outAmount"));//会员 退款金额
sale.put("incomeAmountAll",incomeAmount.add(new BigDecimal(flowMap.get("inAmount").toString())));//总实收 销售实收+会员实收
result.put("sale",sale);
vip.put("useAmount", flowMap.get("useAmount"));//会员消费金额
vip.put("newFlow",newFlow);//新增会员数