From 007bb91e70a5129304de1837f60161c6f5f3ad4f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 10:25:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
index 5c1abe9..5f0657c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
@@ -3,15 +3,10 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay;
import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast;
-import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay;
-import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDayLast;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
@@ -108,12 +103,10 @@
poHistory = this.updateRmClientAmountBySameDateNewData(clientVo, poHistory, poLast, dV1_0_1, cdData);
sv.updateRmClientAmountDay(poHistory);
}
- sv.saveRmClientAmountLast(poLast);
}else if(upYmd.after(poLast.dt)){
//鏂扮殑鏃ユ湡
poLast = this.updateRmClientAmountLastByNewDateNewData(clientVo, dV1_0_1, cdData, poLast);
this.newAndSaveHistoryDataDeal(sv, clientVo, dV1_0_1, cdData, poLast);
- sv.saveRmClientAmountLast(poLast);
}else{
//杩欑鎯呭喌涓嶅瓨鍦�
}
@@ -170,8 +163,16 @@
RmClientAmountDay poHistory = new RmClientAmountDay() ;
poHistory.clientId = clientVo.getId();
if(lastPo != null){
- poHistory.amount += lastPo.amount ;
- poHistory.money += lastPo.money ;
+ if(poHistory.amount != null){
+ poHistory.amount += lastPo.amount ;
+ }else{
+ poHistory.amount = lastPo.amount ;
+ }
+ if(poHistory.money != null){
+ poHistory.money += lastPo.money ;
+ }else{
+ poHistory.money = lastPo.money ;
+ }
poHistory.dt = lastPo.dt ;
poHistory.openDtLast = lastPo.openDtLast ;
poHistory.closeDtLast = lastPo.closeDtLast ;
@@ -278,8 +279,16 @@
*/
private RmClientAmountDay updateRmClientAmountBySameDateNewData(SeClient clientVo, RmClientAmountDay poHistory, RmClientAmountDayLast lastPo, DataV1_0_1 dV1_0_1, DataCd83CloseVo cdData)throws Exception {
poHistory.clientId = clientVo.getId();
- poHistory.amount += lastPo.amount ;
- poHistory.money += lastPo.money ;
+ if(poHistory.amount != null){
+ poHistory.amount += cdData.thisAmount ;
+ }else{
+ poHistory.amount = cdData.thisAmount ;
+ }
+ if(poHistory.money != null){
+ poHistory.money += cdData.thisMoney ;
+ }else{
+ poHistory.money = cdData.thisMoney ;
+ }
poHistory.dt = lastPo.dt ;
poHistory.openDtLast = lastPo.openDtLast ;
poHistory.closeDtLast = lastPo.closeDtLast ;
--
Gitblit v1.8.0