1.平台结算需求 导入不自动结算

src/main/java/com/ydtech/modules/fnc/controller/InsPlyIncomeController.java

@@ -449,7 +449,11 @@ public class InsPlyIncomeController extends BaseController {
     public HttpResult<InsPlyIncome> ptInsert(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
         return insPlyIncomeService.ptInsert(insPlyIncomeVo);
     }
-
+    @PutMapping("/batchPinBalanceNew")
+    @ApiModelProperty(value = "平台批量结算")
+    public HttpResult<Object> batchPinBalanceNew(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
+        return insPlyIncomeService.batchPinBalanceNew(insPlyIncomeVo);
+    }
 }
 
 

src/main/java/com/ydtech/modules/fnc/service/InsPlyIncomeService.java

@@ -155,4 +155,6 @@ public interface InsPlyIncomeService extends IService<InsPlyIncome> {
 
     void updateNoHand(InsPlyIncomeVo insPlyIncomeVo);
 
+    HttpResult<Object> batchPinBalanceNew(InsPlyIncomeVo insPlyIncomeVo);
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -787,6 +787,7 @@ handlingProportion,
         BigDecimal totalOtherAmount = BigDecimal.ZERO;
         HashMap<String, Object> resultHashMap = new HashMap<>();
         HashSet<String> partnerCompaniesIdSet = new HashSet<>();
+        List<String> ids = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
         String  reason ="";
         ArrayList<HashMap<String, Object>> resultNoSelect = new ArrayList<>();
@@ -839,14 +840,14 @@ handlingProportion,
                     if (insPlyIncome.getOtherFeevalue() != null && insPlyIncome.getOtherFeevalue().compareTo(BigDecimal.ZERO) != 0) {
                         totalOtherAmount = totalOtherAmount.add(insPlyIncome.getOtherFeevalue());   //总跟单费
                     }
-                        insPlyIncome.setSettlementUserId(BaseController.getUser().getId());
-                        insPlyIncome.setSettlementTime(now);
-                        insPlyIncome.setHandlingFeesStatus("1");
-                        baseMapper.updateById(insPlyIncome);
                     //判断是否是相同保司机构
                     partnerCompaniesIdSet.add(insPlyIncome.getPartnerCompaniesId());
-                    objectObjectHashMap.put("reason",reason);
-                    resultNoSelect.add(objectObjectHashMap);  // 添加未匹配的车牌号
+                    if(StringUtils.isNotEmpty(reason)){
+                        objectObjectHashMap.put("reason",reason);
+                        resultNoSelect.add(objectObjectHashMap);  // 添加未匹配的车牌号
+                    }else {
+                        ids.add(insPlyIncome.getId());
+                    }
                 } else {
                     objectObjectHashMap.put("reason","未查询车辆");
                     resultNoSelect.add(objectObjectHashMap);  // 添加未匹配的车牌号
@@ -859,6 +860,7 @@ handlingProportion,
             resultHashMap.put("totalHandingAmount", totalHandingAmount);
             resultHashMap.put("totalOtherAmount", totalOtherAmount);
             resultHashMap.put("resultList", resultNoSelect);
+            resultHashMap.put("settIdList",ids);
             return resultHashMap;
         } catch (IOException e) {
             throw new SystemException("导入失败！");
@@ -1240,6 +1242,23 @@ handlingProportion,
         this.saveLog(insPlyIncomeVo);
     }
 
+    @Override
+    public HttpResult<Object> batchPinBalanceNew(InsPlyIncomeVo insPlyIncomeVo) {
+        LocalDateTime now = LocalDateTime.now();
+        if(!CollectionUtils.isEmpty(insPlyIncomeVo.getSettIdList())){
+            for (String  id : insPlyIncomeVo.getSettIdList()){
+                InsPlyIncome insPlyIncome = new InsPlyIncome();
+                insPlyIncome.setSettlementImageId(insPlyIncomeVo.getSettlementImageId());
+                insPlyIncome.setSettlementUserId(BaseController.getUser().getId());
+                insPlyIncome.setSettlementTime(now);
+                insPlyIncome.setId(id);
+                insPlyIncome.setHandlingFeesStatus("1");
+                baseMapper.updateById(insPlyIncome);
+            }
+        }
+        return HttpResult.ok();
+    }
+
     /**
      * @param insPlyIncomeVo
      * @param insPlyIncome   重新计算金额  通过比例

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -391,4 +391,7 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty(value = "结算日期")
     private String settlementDate;
 
+    @ApiModelProperty(value = "平台导入结算IdList")
+    private List<String> settIdList;
+
 }