diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index bc28438f3..9ecad6b34 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -18,13 +18,15 @@ public class IncomeVoucher extends BaseBussiness { private static final Logger logger = LoggerFactory.getLogger(IncomeVoucher.class); @Override public Object run(Transaction Sqlca) throws Exception { - OverdueRepayPlanVoucherPSBC overdueRepayPlanVoucherPSBC = new OverdueRepayPlanVoucherPSBC(); - if(overdueRepayPlanVoucherPSBC.findFcPSBCOverduce(this.getAttribute("FlowUnid").toString())){ - logger.info("IncomeVoucher 网银收款流程结束后生成相应的凭证,当前是邮储相关订单凭证不执行以下操作。"); - return "true"; - } this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); + logger.info("IncomeVoucher 20210906 新增判断代码【开始】"); + OverdueRepayPlanVoucherPSBC overdueRepayPlanVoucherPSBC = new OverdueRepayPlanVoucherPSBC(); + if(overdueRepayPlanVoucherPSBC.findFcPSBCOverduce(FlowUnid)){ + logger.info("IncomeVoucher 网银收款流程结束后生成相应的凭证,当前是邮储相关订单凭证不执行以下操作。【结束】,未通过。"); + return "true"; + } + logger.info("IncomeVoucher 20210906 新增判断代码【结束】,通过。"); String userid = this.getAttribute("CurUserID").toString(); /** diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java index 63799d282..7af590773 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java @@ -8,12 +8,16 @@ import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle.IncomeVoucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 定时任务生成卡扣租金及逾期利息凭证 * @author xiezhiwen */ public class InsertVoucherRentIncome { + private static final Logger logger = LoggerFactory.getLogger(InsertVoucherRentIncome.class); /** * 定时任务触发 * @throws Exception @@ -39,6 +43,7 @@ public class InsertVoucherRentIncome { * 查询数据, 判断是否需要执行插入中间表 */ // 查询是否有当月的, 未生成凭证的数据(卡扣) + logger.info("InsertVoucherRentIncome 20210906 新增fc_yc_overdue_repay_plan联表查询代码【开始】"); String sqls1="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID = LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID = LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID " + " LEFT JOIN fc_yc_overdue_repay_plan fyorp ON fyorp.rent_plan_id = lri.PLAN_ID " + " WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay','TLCollect') " + @@ -89,7 +94,7 @@ public class InsertVoucherRentIncome { List> dataList5=DataOperatorUtil.getDataBySql(Sqlca, slqs5, null); List> dataList6=DataOperatorUtil.getDataBySql(Sqlca, sqls6, null); List> dataList7=DataOperatorUtil.getDataBySql(Sqlca, slqs7, null); - + logger.info("InsertVoucherRentIncome 20210906 新增fc_yc_overdue_repay_plan联表查询代码【结束】"); /** * 将数据插入中间表的SQL */