canrd-outside / order-erp · Commits

Commit b513f39e17ca980e5bc049348d73b69a8ec6eb96

Authored by qdlgxiemaosheng
1 parent 52699880
build: skipped

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

Inline Side-by-side
Showing 2 changed files with 23 additions and 1 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
  View file @b513f39
... ... @@ -86,6 +86,8 @@ public class OrderFieldUtils {
86 86 String locked = lockFieldEnum.getStatus();
87 87 return OrderProfitAnalysisFieldVO.builder()
88 88 .customerPrice(locked)
  89 + .customerRmbPrice(locked)
  90 + .customerRmbTotalPrice(locked)
89 91 .customerTotalPrice(locked)
90 92 .customerCurrency(locked)
91 93 .exchangeRate(locked)
... ...
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @b513f39
... ... @@ -827,7 +827,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
827 827 }
828 828 if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
829 829 return false;
830   - } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) {
  830 + } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
831 831 return false;
832 832 }
833 833 return true;
... ... @@ -1369,6 +1369,24 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1369 1369 }
1370 1370  
1371 1371 /**
  1372 + * @param orderId
  1373 + * @param userId
  1374 + * @return
  1375 + */
  1376 + public OrderFieldLockRecordDO lockProfitField(Long orderId, Long userId) {
  1377 + return OrderFieldLockRecordDO.builder().orderId(orderId).userId(userId).fields(JSONObject.toJSONString(OrderFieldUtils.initProfitAnalysisField(OrderLockFieldEnum.LOCKED))).build();
  1378 + }
  1379 +
  1380 + /**
  1381 + * @param orderId
  1382 + * @param userId
  1383 + * @return
  1384 + */
  1385 + public OrderFieldLockRecordDO lockReportField(Long orderId, Long userId) {
  1386 + return OrderFieldLockRecordDO.builder().orderId(orderId).userId(userId).fields(JSONObject.toJSONString(OrderFieldUtils.initReportField(OrderLockFieldEnum.LOCKED))).build();
  1387 + }
  1388 +
  1389 + /**
1372 1390 * @param profitAnalysisVO
1373 1391 * @param orderBaseInfoDo
1374 1392 * @param userId
... ... @@ -1430,6 +1448,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1430 1448 orderBaseInfoDo.setOrderStatus(ApplyStatusEnum.AUDIT_PASS.getStatus().equals(orderFieldLockApplyDO.getStatus()) ? OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus()
1431 1449 : OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
1432 1450 optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
  1451 + fieldLockRecordService.save(lockProfitField(updateVO.getOrderId(), userId));
1433 1452 }
1434 1453  
1435 1454 if (Objects.nonNull(updateVO.getReportInfo())) {
... ... @@ -1439,6 +1458,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1439 1458  
1440 1459 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
1441 1460 optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields());
  1461 + fieldLockRecordService.save(lockReportField(updateVO.getOrderId(), userId));
1442 1462 }
1443 1463  
1444 1464 if (Objects.nonNull(updateVO.getTrackStageInfo())) {
... ...