From 93df90598a7ad8013871653d228c4e0d98f88968 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 28 Aug 2018 21:31:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E6=AC=BE=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cache/CollectAuditInfoCache.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java index 7e18d0f75..2204f99fb 100644 --- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java +++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java @@ -642,14 +642,15 @@ public class CollectAuditInfoCache { bo.setAttributeValue("COLLECT_STATUS", "批量收款"); bo.setAttributeValue("COLLECT_MSG", "批量代收,收款成功"); bo.setAttributeValue("BATCH_STATUS", "complete"); - saveBuckle(bo,tx,i+""); + //bo.setAttributeValue("rent", bo.getAttribute("rent").toString()); + saveBuckle(bo,tx,i+"",rent); }else if (map.containsKey("RET_CODE") && ("2007".equals(map.get("RET_CODE")) || "2005".equals(map.get("RET_CODE")) || "2003".equals(map.get("RET_CODE")) || "2001".equals(map.get("RET_CODE")) || "2000".equals(map.get("RET_CODE")))){ //更新银联处理中的反馈信息 bc.createQuery("update O set O.COLLECT_MSG=:COLLECT_MSG where O.id=:id") .setParameter("COLLECT_MSG", map.get("ERR_MSG")) .setParameter("id", bo.getAttribute("id").toString()).executeUpdate(); bo.setAttributeValue("COLLECT_MSG", map.get("ERR_MSG")); - saveBuckle(bo,tx,i+""); + saveBuckle(bo,tx,i+"","0.00"); }else{ //更新收付状态 bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG,O.BATCH_STATUS=:BATCH_STATUS,O.BATCH_NO='',O.BATCH_SN='' where O.id=:id") @@ -660,7 +661,7 @@ public class CollectAuditInfoCache { bo.setAttributeValue("COLLECT_STATUS", "未收款"); bo.setAttributeValue("COLLECT_MSG", map.get("ERR_MSG")); bo.setAttributeValue("BATCH_STATUS", ""); - saveBuckle(bo,tx,i+""); + saveBuckle(bo,tx,i+"","0.00"); } }else if (snArray.length > 1) { if (map.containsKey("RET_CODE") && "0000".equals(map.get("RET_CODE"))) { @@ -677,7 +678,8 @@ public class CollectAuditInfoCache { bo.setAttributeValue("COLLECT_STATUS", "批量收款"); bo.setAttributeValue("COLLECT_MSG", "批量代收,收款成功"); bo.setAttributeValue("BATCH_STATUS", "complete"); - saveBuckle(bo,tx,i+""); + //bo.setAttributeValue("rent", bo.getAttribute("rent").toString()); + saveBuckle(bo,tx,i+"",rent); }else{ //更新收付状态 bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG,O.BATCH_STATUS=:BATCH_STATUS where O.id=:id") @@ -688,7 +690,7 @@ public class CollectAuditInfoCache { bo.setAttributeValue("COLLECT_STATUS", "部分收款"); bo.setAttributeValue("COLLECT_MSG", map.get("ERR_MSG")); bo.setAttributeValue("BATCH_STATUS", "complete"); - saveBuckle(bo,tx,i+""); + saveBuckle(bo,tx,i+"","0.00"); } }else if (map.containsKey("RET_CODE") && ("2007".equals(map.get("RET_CODE")) || "2005".equals(map.get("RET_CODE")) || "2003".equals(map.get("RET_CODE")) || "2001".equals(map.get("RET_CODE")) || "2000".equals(map.get("RET_CODE")))){ //更新银联处理中的反馈信息 @@ -696,7 +698,7 @@ public class CollectAuditInfoCache { .setParameter("COLLECT_MSG", map.get("ERR_MSG")) .setParameter("id", bo.getAttribute("id").toString()).executeUpdate(); bo.setAttributeValue("COLLECT_MSG", map.get("ERR_MSG")); - saveBuckle(bo,tx,i+""); + saveBuckle(bo,tx,i+"","0.00"); }else{//批量拆分多笔扣款,如果扣款成功条数未 0 ,则更新扣款状态为 未扣款 if (i == snArray.length && n == 0) { //更新收付状态 @@ -708,7 +710,7 @@ public class CollectAuditInfoCache { bo.setAttributeValue("COLLECT_STATUS", "未收款"); bo.setAttributeValue("COLLECT_MSG", map.get("ERR_MSG")); bo.setAttributeValue("BATCH_STATUS", ""); - saveBuckle(bo,tx,i+""); + saveBuckle(bo,tx,i+"","0.00"); } } } @@ -721,7 +723,7 @@ public class CollectAuditInfoCache { return "success"; } - public void saveBuckle(BizObject bo,JBOTransaction tx,String batch_sn) throws JBOException{ + public void saveBuckle(BizObject bo,JBOTransaction tx,String batch_sn,String rent) throws JBOException{ BizObjectManager blog = JBOFactory.getBizObjectManager(LB_BUCKLE_LOG.CLASS_NAME, tx); BizObject blbo = blog.newObject(); String collect = bo.getAttribute("COLLECT_STATUS").getString(); @@ -733,6 +735,7 @@ public class CollectAuditInfoCache { blbo.setAttributeValue(LB_BUCKLE_LOG.BATCH_SN, batch_sn); blbo.setAttributeValue(LB_BUCKLE_LOG.BATCH_NO, bo.getAttribute("BATCH_NO").getString()); blbo.setAttributeValue(LB_BUCKLE_LOG.RENT_ID, bo.getAttribute("ID").getString()); + blbo.setAttributeValue(LB_BUCKLE_LOG.cut_money,rent); blbo.setAttributeValue(LB_BUCKLE_LOG.inputuserid, "syetem"); blbo.setAttributeValue(LB_BUCKLE_LOG.inputorgid, "system"); blbo.setAttributeValue(LB_BUCKLE_LOG.inputtime, StringFunction.getTodayNow());