code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/task/TravelFinanConfirmCreateTask.java

@@ -566,7 +566,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
             }
         }
         List<Long> updateIdList = trainTgEntryCol.stream().map(r -> r.getLong("id")).collect(Collectors.toList());
-        DynamicObject[] updateBillArray = BusinessDataServiceHelper.load("er_traincheckingbill", FinanceBillConfirmConstant.NCKD_CB_FINANCONFIRM, new QFilter("id", QCP.in, updateIdList).toArray());
+        DynamicObject[] updateBillArray = BusinessDataServiceHelper.load("er_hotelcheckingbill", FinanceBillConfirmConstant.NCKD_CB_FINANCONFIRM, new QFilter("id", QCP.in, updateIdList).toArray());
         for(DynamicObject updateBill : updateBillArray){
             updateBill.set(FinanceBillConfirmConstant.NCKD_CB_FINANCONFIRM, confirmBillId);
         }
@@ -603,13 +603,18 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
                 }
             }
             BigDecimal cbAmount = BigDecimal.ZERO;
+            Boolean isOver = false;
             if(standardAmount != null){
                 cbAmount = orderPrice.subtract(standardAmount);
-                if(cbAmount.compareTo(BigDecimal.ZERO) <= 0){
+                if(cbAmount.compareTo(BigDecimal.ZERO) > 0){
                     // 超标金额没有大于0，则没有超标
-                    continue;
+                    isOver = true;
                 }
             }
+
+            if(!isOver){
+                continue;
+            }
             DynamicObject tgEntry = tgEntryCol.addNew();
             tgEntry.set(FinanceBillConfirmConstant.NCKD_CB_ENTRY.NCKD_CB_STANDARD, standardAmount);
             tgEntry.set(FinanceBillConfirmConstant.NCKD_CB_ENTRY.NCKD_CB_EXCSTAMT, cbAmount);
@@ -624,7 +629,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
 
         }
         List<Long> updateIdList = trainTgEntryCol.stream().map(r -> r.getLong("id")).collect(Collectors.toList());
-        DynamicObject[] updateBillArray = BusinessDataServiceHelper.load("er_traincheckingbill", FinanceBillConfirmConstant.NCKD_CB_FINANCONFIRM, new QFilter("id", QCP.in, updateIdList).toArray());
+        DynamicObject[] updateBillArray = BusinessDataServiceHelper.load("er_vehiclecheckingbill", FinanceBillConfirmConstant.NCKD_CB_FINANCONFIRM, new QFilter("id", QCP.in, updateIdList).toArray());
         for(DynamicObject updateBill : updateBillArray){
             updateBill.set(FinanceBillConfirmConstant.NCKD_CB_FINANCONFIRM, confirmBillId);
         }