From e198ace19ab1a58b79f4259aec5b0bc71f28a3dd Mon Sep 17 00:00:00 2001
From: linxiaoping <12345678>
Date: Sat, 23 Jun 2018 18:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DealerDeposit/DDepositReturn_TempInfo.jsp |  8 +-
 .../DealerDeposit/DMarginChargeInfo_Temp.jsp  |  2 +-
 .../tenwa/flow/CopyDReturnTempToFormal.java   | 13 ++++
 calc/com/tenwa/flow/CopyInfoTempToFormal.java | 78 +++++++++++++++++++
 .../flow/CopyReturnInfoTempToFormal.java      | 78 +++++++++++++++++++
 .../DistributorInfoTempToFormalBusiness.java  |  1 -
 6 files changed, 177 insertions(+), 3 deletions(-)
 create mode 100644 calc/com/tenwa/flow/CopyInfoTempToFormal.java
 create mode 100644 calc/com/tenwa/flow/CopyReturnInfoTempToFormal.java

diff --git a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
index daf5f8d4d..1a5812c45 100644
--- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
@@ -13,9 +13,11 @@
 	String sTempletNo = "DDepositReturn_TempInfo";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	/* doTemp.setColTips("", "测试"); */
+	doTemp.setHtmlEvent("CAUTION_MONEY", "onblur", "selectBalance");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "-2";//只读模式
+	
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
 	
 	String sButtons[][] = {
@@ -26,7 +28,7 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	var sFlowUnid = "<%=sFlowUnid%>";
-	setItemValue(0,0,"MONEY_TYPE","退款");
+	setItemValue(0,0,"MONEY_TYPE","保证金退款");
 	setItemValue(0,0,"REFUND_PERSON","<%=ProjectName%>");
 	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
 	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
@@ -42,5 +44,9 @@
 	function returnList(){
 		 AsControl.OpenView("/DealerDeposit/DDepositReturn_TempList.jsp", "FlowUnid="+sFlowUnid,"_self","");
 	}
+	function selectBalance(){
+		AsControl.RunJavaMethod(ClassName,MethodName, Args);
+
+	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index e2606b4f9..397ea17ea 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -25,7 +25,7 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	var sFlowUnid = "<%=sFlowUnid%>";
-	setItemValue(0,0,"MONEY_TYPE","收款");
+	setItemValue(0,0,"MONEY_TYPE","保证金收款");
 	setItemValue(0,0,"PAYER","<%=CurPage.getParameter("ProjectName")%>");
 	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
 	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
diff --git a/calc/com/tenwa/flow/CopyDReturnTempToFormal.java b/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
index dc446aa89..41a44ec56 100644
--- a/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
@@ -3,9 +3,14 @@ package com.tenwa.flow;
 import java.util.HashMap;
 import java.util.Map;
 
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
+import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO_TEMP;
 
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.baseBussion.BaseBussiness;
@@ -20,6 +25,14 @@ public class CopyDReturnTempToFormal extends BaseBussiness {
 		fromCondtion.put("FLOWUNID", flowunid);
 		Map<String,String> otherProperty = new HashMap<String,String>();
 		otherProperty.put("ID", id);
+		
+		BizObject dst= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, Sqlca);
+		String disStatus = dst.getAttribute("id").toString();
+		BizObjectManager dit = JBOFactory.getBizObjectManager(D_DEPOSITRETURN_INFO_TEMP.CLASS_NAME,Sqlca);
+		BizObject deit = dit.createQuery("select * from O where FLOWUNID=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(true);
+		deit.setAttributeValue("DISTRIBUTOR_ID", disStatus);
+		dit.saveObject(deit);
+		
 		DataOperatorUtil.copySingleJBO(D_DEPOSITRETURN_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITRETURN_INFO.CLASS_NAME, null, otherProperty, Sqlca);
 		return "true";
 	}
diff --git a/calc/com/tenwa/flow/CopyInfoTempToFormal.java b/calc/com/tenwa/flow/CopyInfoTempToFormal.java
new file mode 100644
index 000000000..8530772e2
--- /dev/null
+++ b/calc/com/tenwa/flow/CopyInfoTempToFormal.java
@@ -0,0 +1,78 @@
+package com.tenwa.flow;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
+
+import com.amarsoft.app.util.ASOrgObject;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.lease.flow.project.businessapply.DistributorCompare;
+
+public class CopyInfoTempToFormal extends BaseBussiness{
+	
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String orgid=this.saveOrgInfo(Sqlca);
+		Map<String,String>fromCondtion=new HashMap<String, String>();
+		fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
+		BizObject dst= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, Sqlca);
+		String disStatus = dst.getAttribute("distributor_status").toString();
+		dst.setAttributeValue("orgid",orgid );
+		BizObjectManager dit = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME,Sqlca);
+		if("distributor_status08".equals(disStatus)){
+			dst.setAttributeValue("distributor_status", "distributor_status09");
+		}
+		dit.saveObject(dst);
+		Map<String,String>toCondtion=new HashMap<String, String>();
+		DistributorCompare dc=new DistributorCompare();
+		fromCondtion.clear();
+		fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
+		toCondtion.clear();
+		toCondtion.put("distributor_no", dst.getAttribute("distributor_no").getString());
+		
+	    DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, null, dc, Sqlca);
+		String sMessage="true"; 
+		return sMessage;
+	}
+	/**
+	 * 保存渠道信息
+	 * @author  2018-06-10
+	 */
+	private String saveOrgInfo(Transaction Sqlca) throws Exception {
+		ASOrgObject orgObject= new ASOrgObject("8006");//默认为安鹏向下的渠道信息
+		Map<String,String> mapOrgInfo=orgObject.nextLevalOrgNo(Sqlca);
+		BizObjectManager manager = JBOFactory.getFactory().getManager("jbo.sys.ORG_INFO");
+		BizObject bo=null;
+		BizObjectManager PM=JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME);
+		BizObject partnerInfo=PM.createQuery(" select * from O where O.flowUnid=:flowUnid").setParameter("flowUnid", this.getAttribute("FlowUnid").toString()).getSingleResult(true);
+		if(!mapOrgInfo.isEmpty()){
+			ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString());
+			bo=manager.newObject();
+			bo.setAttributeValue("ORGID", mapOrgInfo.get("orgno"));
+			bo.setAttributeValue("SORTNO", mapOrgInfo.get("sortno"));
+			bo.setAttributeValue("TREESORTNO", mapOrgInfo.get("sortno"));
+			bo.setAttributeValue("ORGLEVEL", "9");//默认渠道
+			bo.setAttributeValue("STATUS", "1");//默认启用
+			if(partnerInfo!=null){
+				bo.setAttributeValue("RELATIVEORGID", "8006");
+				bo.setAttributeValue("BELONGORGID", "8006");
+				bo.setAttributeValue("ORGNAME",  partnerInfo.getAttribute("distributor_name").toString());
+				bo.setAttributeValue("INPUTORG", asUser.getOrgID());
+				bo.setAttributeValue("InputUser", asUser.getUserID());
+				bo.setAttributeValue("InputTime", StringFunction.getTodayNow());
+			}
+			manager.saveObject(bo);
+		}
+		return bo.getAttribute("ORGID").toString();
+	}
+}
diff --git a/calc/com/tenwa/flow/CopyReturnInfoTempToFormal.java b/calc/com/tenwa/flow/CopyReturnInfoTempToFormal.java
new file mode 100644
index 000000000..e1f64daf0
--- /dev/null
+++ b/calc/com/tenwa/flow/CopyReturnInfoTempToFormal.java
@@ -0,0 +1,78 @@
+package com.tenwa.flow;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
+
+import com.amarsoft.app.util.ASOrgObject;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.lease.flow.project.businessapply.DistributorCompare;
+
+public class CopyReturnInfoTempToFormal extends BaseBussiness{
+	
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String orgid=this.saveOrgInfo(Sqlca);
+		Map<String,String>fromCondtion=new HashMap<String, String>();
+		fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
+		BizObject dst= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, Sqlca);
+		String disStatus = dst.getAttribute("distributor_status").toString();
+		dst.setAttributeValue("orgid",orgid );
+		BizObjectManager dit = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME,Sqlca);
+		if("distributor_status06".equals(disStatus)){
+			dst.setAttributeValue("distributor_status", "distributor_status10");
+		}
+		dit.saveObject(dst);
+		Map<String,String>toCondtion=new HashMap<String, String>();
+		DistributorCompare dc=new DistributorCompare();
+		fromCondtion.clear();
+		fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
+		toCondtion.clear();
+		toCondtion.put("distributor_no", dst.getAttribute("distributor_no").getString());
+		
+	    DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, null, dc, Sqlca);
+		String sMessage="true"; 
+		return sMessage;
+	}
+	/**
+	 * 保存渠道信息
+	 * @author  2018-06-10
+	 */
+	private String saveOrgInfo(Transaction Sqlca) throws Exception {
+		ASOrgObject orgObject= new ASOrgObject("8006");//默认为安鹏向下的渠道信息
+		Map<String,String> mapOrgInfo=orgObject.nextLevalOrgNo(Sqlca);
+		BizObjectManager manager = JBOFactory.getFactory().getManager("jbo.sys.ORG_INFO");
+		BizObject bo=null;
+		BizObjectManager PM=JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME);
+		BizObject partnerInfo=PM.createQuery(" select * from O where O.flowUnid=:flowUnid").setParameter("flowUnid", this.getAttribute("FlowUnid").toString()).getSingleResult(true);
+		if(!mapOrgInfo.isEmpty()){
+			ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString());
+			bo=manager.newObject();
+			bo.setAttributeValue("ORGID", mapOrgInfo.get("orgno"));
+			bo.setAttributeValue("SORTNO", mapOrgInfo.get("sortno"));
+			bo.setAttributeValue("TREESORTNO", mapOrgInfo.get("sortno"));
+			bo.setAttributeValue("ORGLEVEL", "9");//默认渠道
+			bo.setAttributeValue("STATUS", "1");//默认启用
+			if(partnerInfo!=null){
+				bo.setAttributeValue("RELATIVEORGID", "8006");
+				bo.setAttributeValue("BELONGORGID", "8006");
+				bo.setAttributeValue("ORGNAME",  partnerInfo.getAttribute("distributor_name").toString());
+				bo.setAttributeValue("INPUTORG", asUser.getOrgID());
+				bo.setAttributeValue("InputUser", asUser.getUserID());
+				bo.setAttributeValue("InputTime", StringFunction.getTodayNow());
+			}
+			manager.saveObject(bo);
+		}
+		return bo.getAttribute("ORGID").toString();
+	}
+}
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java
index 17cceeab0..61b69d660 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java
@@ -46,7 +46,6 @@ public class DistributorInfoTempToFormalBusiness  extends BaseBussiness {
 		dst.setAttributeValue("orgid",orgid );
 		BizObjectManager dit = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME,Sqlca);
 		if(null==disStatus || disStatus.length()<=0){
-			dst.setAttributeValue("distributor_status", "distributor_status04");
 			dst.setAttributeValue("distributor_status", "distributor_status08");
 		}
 		dit.saveObject(dst);