报价历史增加 车牌号

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

@@ -43,7 +43,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import javax.validation.constraints.NotBlank;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -71,14 +74,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     private final FeeRuleSchemeServiceImpl feeRuleSchemeService;
 
-    public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService, SysDeptService sysDeptService, StringRedisTemplate redisTemplate, @Lazy InsAreaCompanyService insAreaCompanyService, PtlAgreementService ptlAgreementService,@Lazy FeeRuleSchemeServiceImpl feeRuleSchemeService) {
+    public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService, SysDeptService sysDeptService, StringRedisTemplate redisTemplate, @Lazy InsAreaCompanyService insAreaCompanyService, PtlAgreementService ptlAgreementService, @Lazy FeeRuleSchemeServiceImpl feeRuleSchemeService) {
         this.orderComponents = orderComponents;
         this.sysUserService = sysUserService;
         this.sysDeptService = sysDeptService;
         this.redisTemplate = redisTemplate;
         this.insAreaCompanyService = insAreaCompanyService;
         this.ptlAgreementService = ptlAgreementService;
-        this.feeRuleSchemeService=feeRuleSchemeService;
+        this.feeRuleSchemeService = feeRuleSchemeService;
     }
 
     @Override
@@ -141,7 +144,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 2 构造订单
         InsOrders insOrders = new InsOrders(user, dept, quoteInfoVo);
         // 3 订单操作
-        if (StringUtils.isEmpty(quoteInfoVo.getOrderNo()) || !userId.equals(insOrders.getUserid())) {
+        if (!userId.equals(insOrders.getUserid()) || StringUtils.isEmpty(quoteInfoVo.getOrderNo())){
             // 存入订单
             String orderno = IdGenerate.nextId();
             insOrders.setOrderno(orderno);
@@ -260,8 +263,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         orderAndAreaCompany.setReptxt(null);
 
         //新增费用明细信息
-        List<QueryOrderFeeResultVo> orderFeeVoList= feeRuleSchemeService.queryFeeOrderInfo(companyId);
-        if(!orderFeeVoList.isEmpty()){
+        List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.queryFeeOrderInfo(companyId);
+        if (!orderFeeVoList.isEmpty()) {
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
         }
         //add 解决返回null页面错误  lig 2023-09-14