From d86684671c4efcd139aae66b434d43436884c59f Mon Sep 17 00:00:00 2001
From: gityjf <2211675158@qq.com>
Date: Thu, 17 Dec 2020 18:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=BE=E7=BA=A6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml                   | 3 +++
 .../tenwa/lease/app/allinpay/servlet/AllinpayServlet.java | 1 +
 src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java            | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index e4fad4144..36106c6e0 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -1521,6 +1521,7 @@
 				<attribute name="CORPUS_SP" label="分润成本" type="String" length="18" scale="2"/>
 				<attribute name="INTEREST_sp" label="分润给SP" type="String" length="18" scale="2"/>
 				<attribute name="SPLITTING_STATUS" label="分润支付状态" type="STRING" length="2"/>
+				<attribute name="CHARGE_WAY" label="扣款方式" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -4265,6 +4266,7 @@
 				<attribute name="id" label="id" type="STRING"/>
 				<attribute name="contract_id" label="合同id" type="STRING"/>
 				<attribute name="plan_id" label="计划id" type="STRING"/>
+				<attribute name="plan_list" label="期次" type="STRING"/>
 				<attribute name="money" label="卡扣金额" type="STRING"/>
 				<attribute name="hire_date" label="卡口日期" type="STRING"/>
 				<attribute name="BATCH_NO" label="流水号" type="STRING"/>
@@ -4308,6 +4310,7 @@
 				<attribute name="SIGN_TIME" label="签约时间" type="STRING" length="100" />
 				<attribute name="CUSTOMER_LAUNCH_TIME" label="客户发起时间" type="STRING" length="100" />
 				<attribute name="AGRMNO" label="协议号" type="STRING" length="100" />
+				<attribute name="sign_type" label="签约类型" type="STRING" length="10" />
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java b/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java
index 3405920d9..a275cff1f 100644
--- a/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java
+++ b/src/com/tenwa/lease/app/allinpay/servlet/AllinpayServlet.java
@@ -217,6 +217,7 @@ public class AllinpayServlet extends BaseServlet {
 			if(ldc == null){
 				ldc = bomLDC.newObject();
 				ldc.setAttributeValue("PROJECT_ID", projectId);
+				ldc.setAttributeValue("sign_type", "TL");
 				ldc.setAttributeValue("SIGN_STATUS", "sign_status1");
 				bomLDC.saveObject(ldc);
 			}else if("sign_status2".equals(ldc.getAttribute("SIGN_STATUS").toString())) {
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java b/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java
index d37d9e73d..a595eaa9e 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CARD_TLSIGN.java
@@ -42,7 +42,11 @@ public interface LC_CARD_TLSIGN{
 	*/
 	public static final String CUSTOMER_LAUNCH_TIME = "CUSTOMER_LAUNCH_TIME";
 	/**
-	* ��� STRING(100)<br>
-	*/
+	 * ��� STRING(100)<br>
+	 */
 	public static final String AGRMNO = "AGRMNO";
+	/**
+	 * ǩԼ���� STRING(10)<br>
+	 */
+	public static final String sign_type = "sign_type";
 }
\ No newline at end of file