MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -5359,7 +5359,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             TopCostTpItemVo topCostTpItem = tpItems.stream().findFirst().get();
             BigDecimal divide = new BigDecimal("0.00");//成本
             BigDecimal bigDecimal = new BigDecimal("100");
-            if (topCostTpItem.getDockStatus() == 1) {
+            if (ObjectUtil.isNotNull(topCostTpItem.getDockStatus()) && topCostTpItem.getDockStatus() == 1) {
                 //启用成本扣除项
                 switch (topCostTpItem.getDockType()) {
                     case 1://百分比
@@ -5785,6 +5785,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     String businessName = orderGoodsService.getBusinessById(orderGoods.getOrderGoodsId());
                     //业务层次过滤
                     List<TopCostTpItemVo> items = itemList.stream().filter(item -> {
+                        if (ObjectUtils.isNull(item.getDockStatus())){
+                            item.setDockStatus(0);
+                        }
+                        if (ObjectUtils.isNull(item.getDockType())){
+                            item.setDockType(0);
+                        }
                         //教育类型不限
                         if (item.getEducationTypeId() == -1) {
                             return true;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/service/impl/ITopInstSettleServiceImpl.java

@@ -1120,6 +1120,17 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
         if (CollectionUtils.isEmpty(settleRoleList)){
             return checkLog;
         }
+        List<TopOldOrderCheckLog> logs = topOldOrderCheckLogService
+                        .list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
+                        .eq(TopOldOrderCheckLog::getOrderSn, settleSn)
+                        .eq(TopOldOrderCheckLog::getCheckFrom, 5));
+        if (CollectionUtils.isNotEmpty(logs)){
+            TopOldOrderCheckLog checkLog1 = logs.stream().max(Comparator.comparing(TopOldOrderCheckLog::getCheckSort)).get();
+            if (sort >= checkLog1.getCheckSort()){
+                return checkLog;
+            }
+        }
+
         List<Long> roleIds = settleRoleList.stream().map(TopSysUserRole::getRoleId).collect(Collectors.toList());
         if (roleIds.stream().anyMatch(x -> x.equals(checkLog.getRoleId()))){
             getNextCheck(settleRoleList,sort + 1,settleSn);