feat:利润率计算/利润分析新增两列字段（客户单价/总价人民币）

qdlgxiemaosheng
1 parent 6b857fe4
Showing 2 changed files with 7 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -1064,10 +1064,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         List<OrderFieldLockRecordDO> fieldLockRecordDOList = fieldLockRecordService.list(new LambdaQueryWrapper<OrderFieldLockRecordDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockRecordDO::getUserId, dataScope.getLoginUserId())
-                .in(OrderFieldLockRecordDO::getOrderId, orderIds));
+                .in(OrderFieldLockRecordDO::getOrderId, orderIds)
+                .orderByAsc(OrderFieldLockRecordDO::getId));
         if (CollectionUtils.isNotEmpty(fieldLockRecordDOList)) {
-            Map<Long, OrderFieldLockRecordDO> recordDOMap = fieldLockRecordDOList.stream().collect(Collectors.toMap(OrderFieldLockRecordDO::getOrderId, Function.identity()));
+            Map<Long, OrderFieldLockRecordDO> recordDOMap = fieldLockRecordDOList.stream().collect(Collectors.toMap(OrderFieldLockRecordDO::getOrderId, Function.identity(), (v1, v2) -> v1));
             orderInfoResultVOList.forEach(x -> {
                 OrderFieldLockRecordDO recordDO = recordDOMap.get(x.getId());
                 if (Objects.nonNull(recordDO)) {
@@ -1448,7 +1449,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             orderBaseInfoDo.setOrderStatus(ApplyStatusEnum.AUDIT_PASS.getStatus().equals(orderFieldLockApplyDO.getStatus()) ? OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus()
                     : OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
-            fieldLockRecordService.save(lockProfitField(updateVO.getOrderId(), userId));
+            //fieldLockRecordService.save(lockProfitField(updateVO.getOrderId(), userId));
         }
         if (Objects.nonNull(updateVO.getReportInfo())) {
@@ -1458,7 +1459,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
-            fieldLockRecordService.save(lockReportField(updateVO.getOrderId(), userId));
+            //fieldLockRecordService.save(lockReportField(updateVO.getOrderId(), userId));
         }
         if (Objects.nonNull(updateVO.getTrackStageInfo())) {
@@ -502,6 +502,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         return OrderProfitAnalysisDO.builder()
                 .orderId(profitAnalysisFieldVO.getOrderId())
                 .profitType(StringUtils.isBlank(profitAnalysisFieldVO.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisFieldVO.getProfitType()))
+                .customerRmbPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerRmbPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerRmbPrice()) : null)
+                .customerRmbTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerRmbTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerRmbTotalPrice()) : null)
                 .customerPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerPrice()) : null)
                 .customerTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerTotalPrice()) : null)
                 .customerCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getCustomerCurrency()) ? profitAnalysisFieldVO.getCustomerCurrency() : null)