pc端经纬度

src/main/java/com/ydtech/modules/order/service/impl/InsTelemarketingOrderServiceImpl.java

@@ -30,6 +30,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 
@@ -119,11 +120,15 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
         if ("2".equals(state)) {
             // 费用信息
-            InsFeeOrderNewHistory insFeeOrderNewHistory = insFeeOrderNewHistoryService.getByInsOrderNo(insAreaCompany.getId());
-            BeanUtils.copyProperties(insFeeOrderNewHistory, insFeeOrderNew);
-        } else {
             insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
             return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
+        } else {
+            InsFeeOrderNewHistory insFeeOrderNewHistory = insFeeOrderNewHistoryService.getByInsOrderNo(insAreaCompany.getId());
+            if (ObjectUtils.isEmpty(insFeeOrderNewHistory)) {
+                insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
+            } else {
+                BeanUtils.copyProperties(insFeeOrderNewHistory, insFeeOrderNew);
+            }
         }
         return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
     }