canrd-outside / order-erp · Commits

Commit 7943a0b5f478ac35d4b5cc3203925646ffa633cf

Authored by 谢茂盛
1 parent 326fd528
build: skipped

feat: 问题修复项 

1、1225问题项修复
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @7943a0b
@@ -374,11 +374,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -374,11 +374,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
374 } 374 }
375 if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice()) && 375 if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice()) &&
376 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketPrice())) { 376 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketPrice())) {
377 - map.put("包装费用￥", profitAnalysisVO.getPacketPrice()); 377 + map.put("包装费用$", profitAnalysisVO.getPacketPrice());
378 } 378 }
379 if (StringUtils.isNotBlank(profitAnalysisFields.getPacketTotalPrice()) && 379 if (StringUtils.isNotBlank(profitAnalysisFields.getPacketTotalPrice()) &&
380 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketTotalPrice())) { 380 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketTotalPrice())) {
381 - map.put("包装费用合计￥", profitAnalysisVO.getPacketTotalPrice()); 381 + map.put("包装费用合计$", profitAnalysisVO.getPacketTotalPrice());
382 } 382 }
383 if (StringUtils.isNotBlank(profitAnalysisFields.getExchangeRate()) && 383 if (StringUtils.isNotBlank(profitAnalysisFields.getExchangeRate()) &&
384 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getExchangeRate())) { 384 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getExchangeRate())) {