From 7bfa5f63181b0cedd43899e9dacdfca26ebfd4ad Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@88.com>
Date: 星期二, 08 七月 2025 09:50:58 +0800
Subject: [PATCH] 修改支付接口
---
src/main/java/com/lunhan/water/service/PaymentRecordsService.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..cfe0de8 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);
@@ -380,6 +380,7 @@
if(Objects.nonNull(heartbeatDataPO)){
heartbeatDataPO.setDataValue(Integer.valueOf(heartbeat.getValue()));
heartbeatDataPO.setSendValue(heartbeatDataPO.getSendValue()==0?1:0);
+ heartbeatDataPO.setRemark(time);
heartbeatDataMapper.updateById(heartbeatDataPO);
}else {
HeartbeatDataPO dataPO=new HeartbeatDataPO();
--
Gitblit v1.9.3