Commit 6b857fe4e5e5cd4bd9639d96fac8b2faba99e1a7

Authored by qdlgxiemaosheng
1 parent b513f39e

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

src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -385,7 +385,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp @@ -385,7 +385,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp
385 OrderFieldLockRecordDO recordDO = fieldLockRecordService.getOne(new LambdaQueryWrapper<OrderFieldLockRecordDO>() 385 OrderFieldLockRecordDO recordDO = fieldLockRecordService.getOne(new LambdaQueryWrapper<OrderFieldLockRecordDO>()
386 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 386 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
387 .eq(OrderFieldLockRecordDO::getOrderId, applyDO.getOrderId()) 387 .eq(OrderFieldLockRecordDO::getOrderId, applyDO.getOrderId())
388 - .eq(OrderFieldLockRecordDO::getUserId, applyDO.getApplyUserId())); 388 + .eq(OrderFieldLockRecordDO::getUserId, applyDO.getApplyUserId())
  389 + .orderByDesc(OrderFieldLockRecordDO::getId)
  390 + .last("limit 1"));
389 if (Objects.isNull(recordDO)) { 391 if (Objects.isNull(recordDO)) {
390 recordDO = OrderFieldLockRecordDO.builder() 392 recordDO = OrderFieldLockRecordDO.builder()
391 .orderId(applyDO.getOrderId()) 393 .orderId(applyDO.getOrderId())