czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部分金额 需要重新计算

Browse Source
This commit is contained in:
wangw
2025-11-25 13:22:12 +08:00
parent ec46d876b1
commit 3f288c7a0c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
View File

@@ -434,13 +434,13 @@ public class ShopOrderStatistic implements Serializable {
result.setRechargeRefundAmount(safeAdd(stat1.getRechargeRefundAmount(), stat2.getRechargeRefundAmount()));
result.setOnlineRechargeRefundAmount(safeAdd(stat1.getOnlineRechargeRefundAmount(), stat2.getOnlineRechargeRefundAmount()));
result.setCashRechargeRefundAmount(safeAdd(stat1.getCashRechargeRefundAmount(), stat2.getCashRechargeRefundAmount()));
result.setAvgPayAmount(safeAdd(stat1.getAvgPayAmount(), stat2.getAvgPayAmount()));
result.setTurnoverRate(safeAdd(stat1.getTurnoverRate(), stat2.getTurnoverRate()));
result.setProfitAmount(safeAdd(stat1.getProfitAmount(), stat2.getProfitAmount()));
// result.setAvgPayAmount(safeAdd(stat1.getAvgPayAmount(), stat2.getAvgPayAmount()));
// result.setTurnoverRate(safeAdd(stat1.getTurnoverRate(), stat2.getTurnoverRate()));
// result.setProfitAmount(safeAdd(stat1.getProfitAmount(), stat2.getProfitAmount()));
result.setProductCostAmount(safeAdd(stat1.getProductCostAmount(), stat2.getProductCostAmount()));
result.setProfitRate(safeAdd(stat1.getProfitRate(), stat2.getProfitRate()));
// result.setProfitRate(safeAdd(stat1.getProfitRate(), stat2.getProfitRate()));
result.setNetProfitAmount(safeAdd(stat1.getNetProfitAmount(), stat2.getNetProfitAmount()));
result.setNetProfitRate(safeAdd(stat1.getNetProfitRate(), stat2.getNetProfitRate()));
// result.setNetProfitRate(safeAdd(stat1.getNetProfitRate(), stat2.getNetProfitRate()));
result.setDiscountAmount(safeAdd(stat1.getDiscountAmount(), stat2.getDiscountAmount()));
result.setNewCustomerDiscountAmount(safeAdd(stat1.getNewCustomerDiscountAmount(), stat2.getNewCustomerDiscountAmount()));
result.setFullDiscountAmount(safeAdd(stat1.getFullDiscountAmount(), stat2.getFullDiscountAmount()));
@@ -462,7 +462,7 @@ public class ShopOrderStatistic implements Serializable {
result.setNewMemberCount(safeAdd(stat1.getNewMemberCount(), stat2.getNewMemberCount()));
result.setCustomerCount(safeAdd(stat1.getCustomerCount(), stat2.getCustomerCount()));
result.setOrderCount(safeAdd(stat1.getOrderCount(), stat2.getOrderCount()));
result.setTableCount(safeAdd(stat1.getTableCount(), stat2.getTableCount()));
result.setTableCount(stat1.getTableCount());
result.setDiscountCount(safeAdd(stat1.getDiscountCount(), stat2.getDiscountCount()));
result.setCashPayCount(safeAdd(stat1.getCashPayCount(), stat2.getCashPayCount()));
result.setWechatPayCount(safeAdd(stat1.getWechatPayCount(), stat2.getWechatPayCount()));