结算导入新增数据时提醒

src/main/java/com/ydtech/modules/inv/controller/InvReceivableController.java

@@ -139,8 +139,7 @@ public class InvReceivableController extends BaseController {
     @ApiOperation("结算导入新增")
     @PostMapping("addSettlement")
     public HttpResult addSettlement(@RequestBody InvSettlementSource invSettlementSource){
-        Boolean b = invReceivableService.addSettlement(invSettlementSource);
-        return b ? HttpResult.ok("新增成功") : HttpResult.error("新增失败");
+        return invReceivableService.addSettlement(invSettlementSource);
     }
 
 

src/main/java/com/ydtech/modules/inv/service/InvReceivableService.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.inv.model.po.InvSettlementSource;
 import com.ydtech.modules.inv.model.po.InvSource;
@@ -53,7 +54,7 @@ public interface InvReceivableService {
 
     Boolean addReceivable(InvSource invSource);
 
-    Boolean addSettlement(InvSettlementSource invSettlementSource);
+    HttpResult addSettlement(InvSettlementSource invSettlementSource);
 
     List<String> dataMatching();
 

src/main/java/com/ydtech/modules/inv/service/impl/InvReceivableServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.inv.dao.InvReceivableMapper;
@@ -17,6 +18,7 @@ import com.ydtech.modules.inv.service.InvSourceService;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -44,6 +46,9 @@ public class InvReceivableServiceImpl implements InvReceivableService {
     @Autowired
     InvSettlementSourceMapper invSettlementSourceMapper;
 
+    @Autowired
+    private InvReceivableService invReceivableService;
+
     @Override
     public List<ReceivableResultVo> getReceivableList(String startTime, String endTime, String insuranceId) {
         return invReceivableMapper.getReceivableList(startTime, endTime, insuranceId);
@@ -711,7 +716,7 @@ public class InvReceivableServiceImpl implements InvReceivableService {
     }
 
     @Override
-    public Boolean addSettlement(InvSettlementSource invSettlementSource) {
+    public HttpResult addSettlement(InvSettlementSource invSettlementSource) {
         invSettlementSource.setId(IdGenerate.nextId());
         invSettlementSource.builder();
         //处理补贴金额
@@ -725,10 +730,29 @@ public class InvReceivableServiceImpl implements InvReceivableService {
                         .add(invSettlementSource.getSyPremiumTax().multiply(invSettlementSource.getCommercialExportRatio())
                                 .add(invSettlementSource.getNonCarPremiumTax().multiply(invSettlementSource.getNonVehicleExportRatio())))
         );
+
+        String licenseno = invSettlementSource.getLicenseno();
+        List<String> namesList = new ArrayList<>();
+        namesList.add(licenseno);
+
+        StringBuilder licensenos = new StringBuilder();
+
+        List<String> receivableLicensenos = invReceivableService.getReceivableListByLicenseno(namesList);
+
+        if (CollectionUtils.isEmpty(receivableLicensenos)) {
+            licensenos.append(invSettlementSource.getLicenseno());
+            licensenos.append(",");
+        }
+
         DateTime dateTime = new DateTime();
         invSettlementSource.setRevenueTime(dateTime.toString());
         boolean save = invSettlementSourceMapper.insert(invSettlementSource) > 0 ? true : false;
-        return save;
+
+        if (licensenos.length() > 0) {
+            licensenos.append("未在应收表中查询到对应车牌号");
+            return save ? HttpResult.ok("新增成功", licensenos.toString()) : HttpResult.error("新增失败");
+        }
+        return save ? HttpResult.ok("新增成功") : HttpResult.error("新增失败");
     }
 
     @Override