From cb9ca0dec02a08401cc6b244128b77d4942d42ae Mon Sep 17 00:00:00 2001 From: liulin <lin.liu@88.com> Date: 星期二, 08 七月 2025 09:42:21 +0800 Subject: [PATCH] 修改支付接口 --- src/test/java/com/lunhan/water/DateTimeTest.java | 12 +++++++----- src/main/java/com/lunhan/water/service/PaymentRecordsService.java | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lunhan/water/service/PaymentRecordsService.java b/src/main/java/com/lunhan/water/service/PaymentRecordsService.java index 7d523da..7e5fed9 100644 --- a/src/main/java/com/lunhan/water/service/PaymentRecordsService.java +++ b/src/main/java/com/lunhan/water/service/PaymentRecordsService.java @@ -349,10 +349,10 @@ public void uploadData(String time,WaterFacilityPO facilityPO, List<CountVO> listVo) { CountVO stateVo = listVo.stream().filter(x -> x.getName().equals(facilityPO.getFacilityCode() + "_state1")).findFirst().orElse(null); CountVO heartbeat = listVo.stream().filter(x -> x.getName().equals(facilityPO.getFacilityCode() + "_heartbeat")).findFirst().orElse(null); - CountVO countVO = listVo.stream().filter(x -> x.getName().equals(facilityPO.getFacilityCode() + "_count2")).findFirst().orElse(null); + CountVO countVO = listVo.stream().filter(x -> x.getName().equals(facilityPO.getFacilityCode() + "_count1")).findFirst().orElse(null); switch (stateVo.getValue()) { case "0"://取水完成 - BigDecimal divide = new BigDecimal(countVO.getValue()).divide(new BigDecimal(100)).setScale(2,RoundingMode.DOWN); + BigDecimal divide = new BigDecimal(countVO.getValue()).setScale(2,RoundingMode.DOWN); BigDecimal subtract=divide.subtract(facilityPO.getWaterCount()); if(subtract.compareTo(BigDecimal.ZERO)>0){ facilityPO.setWaterCount(divide); diff --git a/src/test/java/com/lunhan/water/DateTimeTest.java b/src/test/java/com/lunhan/water/DateTimeTest.java index f8d93be..955be1a 100644 --- a/src/test/java/com/lunhan/water/DateTimeTest.java +++ b/src/test/java/com/lunhan/water/DateTimeTest.java @@ -11,11 +11,13 @@ public class DateTimeTest { @Test public void time2BCDTest() { - String c="3"; - BigDecimal a=new BigDecimal(0.1); - BigDecimal b=BigDecimal.ZERO; - BigDecimal bigDecimal = a.multiply(new BigDecimal(c)).setScale(2, BigDecimal.ROUND_DOWN); - System.out.println(b.add(bigDecimal)); + BigDecimal a=new BigDecimal(0.3); + BigDecimal b=new BigDecimal(0.2); + if(a.compareTo(b)<0){ + System.out.println("余额不足"); + } + + } } -- Gitblit v1.9.3