Merge remote-tracking branch 'origin/dev_finance_20240830' into test

谢茂盛
2 parents f924d5a8 194f0484
Showing 3 changed files with 17 additions and 6 deletions
src/main/java/com/order/erp/domain/vo/order/OrderLockFieldVO.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
 package com.order.erp.domain.vo.order;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -44,6 +45,11 @@ public class OrderLockFieldVO implements Serializable {
     private OrderInspectionStageFieldVO inspectionStageFields;
     /**
+     * 应收款账单字段
+     */
+    private InvoiceBillOrderDO invoiceBillOrderDO;
+
+    /**
      * 导出指定订单id集合
      */
     private List<Long> orderIds;
@@ -681,7 +681,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      */
     private OrderFieldLockApplyDO initOrderFieldLockApplyDO(InvoiceBillOrderDO invoiceBillOrderDO, Long userId) {
         OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
-        BeanUtils.copyProperties(invoiceBillOrderDO, lockFieldVO);
+        lockFieldVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
         return OrderFieldLockApplyDO.builder()
                 .applyUserId(userId)
                 .auditUserId(null)
@@ -119,19 +119,22 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 BeanUtils.copyProperties(x, resultVO);
                 String fields = x.getFields();
                 if (StringUtils.isNotBlank(fields)) {
-                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() == x.getType()) {
+                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType().equals(x.getType())) {
                         resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
-                    if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType() == x.getType()) {
+                    if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(x.getType())) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         fieldVO.setReportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
-                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType() == x.getType()) {
+                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(x.getType())) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         fieldVO.setProfitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
+                    if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())) {
+                        resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                    }
                 }
                 return resultVO;
             }).collect(Collectors.toList());
@@ -399,7 +402,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_REFUSE.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
         } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
-            InvoiceBillOrderDO invoiceBillOrderDO = JSONObject.parseObject(applyDO.getFields(), InvoiceBillOrderDO.class);
+            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
             invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
             invoiceBillOrderService.updateById(invoiceBillOrderDO);
         }
@@ -525,7 +529,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
         } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
-            InvoiceBillOrderDO invoiceBillOrderDO = JSONObject.parseObject(applyDO.getFields(), InvoiceBillOrderDO.class);
+            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
             invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
             invoiceBillOrderService.updateById(invoiceBillOrderDO);
         }