Commit 526998803c195143dbc00d44c909d3b11cfdf5d0
1 parent
a51d1892
feat:利润率计算/利润分析新增两列字段（客户单价/总价人民币）
Showing
2 changed files
with
3 additions
and
1 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
| ... | ... | @@ -669,6 +669,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O |
| 669 | 669 | return OrderProfitAnalysisFieldVO.builder() |
| 670 | 670 | .orderId(profitAnalysisVO.getOrderId()) |
| 671 | 671 | .profitType(StringUtils.isBlank(profitAnalysisVO.getProfitType()) ? Constant.STRING_ZERO : profitAnalysisVO.getProfitType()) |
| 672 | + .customerRmbPrice(Objects.nonNull(profitAnalysisVO.getCustomerRmbPrice()) ? profitAnalysisVO.getCustomerRmbPrice().toString() : null) | |
| 673 | + .customerRmbTotalPrice(Objects.nonNull(profitAnalysisVO.getCustomerRmbTotalPrice()) ? profitAnalysisVO.getCustomerRmbTotalPrice().toString() : null) | |
| 672 | 674 | .customerPrice(Objects.nonNull(profitAnalysisVO.getCustomerPrice()) ? profitAnalysisVO.getCustomerPrice().toString() : null) |
| 673 | 675 | .customerTotalPrice(Objects.nonNull(profitAnalysisVO.getCustomerTotalPrice()) ? profitAnalysisVO.getCustomerTotalPrice().toString() : null) |
| 674 | 676 | .customerCurrency(profitAnalysisVO.getCustomerCurrency()) | ... | ... |