From c4662a2d6dc0c407a3e15a829b2bee546bfda5f7 Mon Sep 17 00:00:00 2001
From: XZW <XZW@XZW-PC>
Date: Wed, 19 Feb 2020 14:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E9=87=91=E5=88=B0=E8=B4=A6=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=85=8D=E7=BD=AE=E8=B4=A6=E5=A5=97=E5=8F=8A?=
 =?UTF-8?q?=E4=B8=BB=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateVoucherForCardSummarizing.java               |  9 ++++++++-
 .../voucher/serviceImp/CreateVoucherServiceImpl.java   | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java
index 6633cdb2b..dd5748cf0 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java
@@ -5,6 +5,8 @@ package com.tenwa.voucher.CreateVoucherProcess;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jbo.com.tenwa.lease.comm.VI_CHARGEBACKVOUCHERTOTAL;
 import jbo.voucher.LV_VOUCHER_CONFIG;
 import jbo.voucher.TAX_CODE;
 
@@ -27,6 +29,7 @@ public class CreateVoucherForCardSummarizing {
 	private String OWN_NUMBER; 			// 银行账号
 	private String ACC_TITLE; 			// 银行科目
 	
+
 	/**
 	 * 卡扣汇总核销
 	 * @param tx
@@ -42,6 +45,9 @@ public class CreateVoucherForCardSummarizing {
 		if(userid==null || "".equals(userid)) {
 			userid="admin";
 		}
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("SPARE_BATCH_NO", SPARE_BATCH_NO);
+		BizObject vc = DataOperatorUtil.getSingleJBO(VI_CHARGEBACKVOUCHERTOTAL.CLASS_NAME, map, Sqlca);
 		Map<String, String> param = new HashMap<String, String>();
 		param.put("FACT_MONEY",ACHIEVED_MONEY);
 		param.put("INTERESTNOTAX",SEREVICE_CHARGE);
@@ -57,10 +63,11 @@ public class CreateVoucherForCardSummarizing {
     	param.put("CUSTNAME","广州银联网络支付有限公司");
     	param.put("ACC_NUMBER",OWN_NUMBER);
     	param.put("EBANK_SUBJECTS",ACC_TITLE);
+    	param.put("OWN_NAME",vc.getAttribute("OWN_NAME").getString());
     	param.put("VOUCHERNO",voucherNo);
     	param.put("CASHFLOW", "11113");// 现金流项目
 
-		Map<String, String> map = new HashMap<String, String>();
+    	map.clear();
 		map.put("PROJ_TYPE", "02");
 		map.put("VOUCHER_NO", voucherNo);
 		CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
index 0dd93bf77..eb1284d82 100644
--- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
@@ -160,8 +160,14 @@ public class CreateVoucherServiceImpl {
 					}
 				}
 				if(SUBJECTID==null || "".equals(SUBJECTID) || SUBJECTNAME==null || "".equals(SUBJECTNAME)) {
-					BizObject ZT = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"itemno=:itemno").setParameter("itemno", "aa740e4111c111eaaa0000163e0e11e6").getSingleResult(false);
-					SUBJECTID = "aa740e4111c111eaaa0000163e0e11e6";
+					BizObject ZT =null;
+					if("PZ2018080400000091".equals(VOUCHERNO)) {
+						String OWN_NAME = param.get("OWN_NAME");
+						ZT = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"codeno=:codeno and itemname=:itemname").setParameter("codeno", "ManySubject").setParameter("itemname", OWN_NAME).getSingleResult(false);
+					}else {
+						ZT = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"itemno=:itemno").setParameter("itemno", "aa740e4111c111eaaa0000163e0e11e6").getSingleResult(false);
+					}
+					SUBJECTID = ZT.getAttribute("itemno").getString();
 					SUBJECTNAME = ZT.getAttribute("itemname").getString();
 					BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false);
 					OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString();