fix: 修复导出/编辑利润率/审核列表

谢茂盛
1 parent 614fafa0
Showing 1 changed file with 2 additions and 1 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -583,7 +583,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         return OrderProfitAnalysisFieldVO.builder()
                 .orderId(profitAnalysisVO.getOrderId())
-                .profitType(profitAnalysisVO.getProfitType())
+                .profitType(StringUtils.isBlank(profitAnalysisVO.getProfitType()) ? Constant.STRING_ZERO : profitAnalysisVO.getProfitType())
                 .customerPrice(Objects.nonNull(profitAnalysisVO.getCustomerPrice()) ? profitAnalysisVO.getCustomerPrice().toString() : null)
                 .customerTotalPrice(Objects.nonNull(profitAnalysisVO.getCustomerTotalPrice()) ? profitAnalysisVO.getCustomerTotalPrice().toString() : null)
                 .customerCurrency(profitAnalysisVO.getCustomerCurrency())
@@ -617,6 +617,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(result.getId());
                     OrderProfitAnalysisVO profitAnalysisVO = new OrderProfitAnalysisVO();
                     BeanUtils.copyProperties(profitAnalysisDO, profitAnalysisVO);
+                    profitAnalysisVO.setProfitType(String.valueOf(profitAnalysisDO.getProfitType()));
                     result.setProfitAnalysisInfo(profitAnalysisVO);
                 }
             });