yaoyu %!s(int64=3) %!d(string=hai) anos
pai
achega
9b221967a5

+ 19 - 1
zjcmp_cd/zjcmp_cd/src/client/nccloud/web/cdmc/cdm/repayprcpl/action/LinkBillToRepayprcplAction.java

@@ -3,7 +3,11 @@ package nccloud.web.cdmc.cdm.repayprcpl.action;
 import java.util.ArrayList;
 import java.util.List;
 
+import nc.bs.framework.common.NCLocator;
 import nc.impl.pubapp.pattern.data.vo.VOQuery;
+import nc.itf.uap.IUAPQueryBS;
+import nc.jdbc.framework.processor.BeanProcessor;
+import nc.vo.bd.bankaccount.BankAccSubVO;
 import nc.vo.cdmc.cdm.repayprcpl.AggRepayPrcplVO;
 import nc.vo.cdmc.cdm.repayprcpl.RepayPrcplVO;
 import nc.vo.cdmc.pub.constants.CdmcPubConst;
@@ -14,13 +18,15 @@ import nccloud.framework.web.action.itf.ICommonAction;
 import nccloud.framework.web.container.ClientInfo;
 import nccloud.framework.web.container.IRequest;
 import nccloud.framework.web.container.SessionContext;
+import nccloud.framework.web.ui.model.row.Cell;
+import nccloud.framework.web.ui.model.row.Row;
 import nccloud.framework.web.ui.pattern.billcard.BillCard;
 import nccloud.web.ifac.pub.util.NCCPageInfoUtil;
 import nccloud.web.sf.common.NCCUIDataModuleUtil;
 
 /**
  * 到账通知发布生成贷款还本
- * @author YY
+ * @author 
  *
  */
 public class LinkBillToRepayprcplAction implements ICommonAction{
@@ -48,6 +54,10 @@ public class LinkBillToRepayprcplAction implements ICommonAction{
 			repayPrcplVO.setPk_org_v(informerVO[0].getPk_org_v());
 			//对账标识
 			repayPrcplVO.setVdef5(informerVO[0].getBankrelated_code());
+			//还本日期
+			repayPrcplVO.setVdef17(informerVO[0].getInfodate().toString());
+			//借款单位账户
+			repayPrcplVO.setPk_loanbankacc(informerVO[0].getBankaccount());
 			
 			ClientInfo clientInfo = SessionContext.getInstance().getClientInfo();
 
@@ -69,6 +79,14 @@ public class LinkBillToRepayprcplAction implements ICommonAction{
 			aggRepayPrcplVO.setParent(repayPrcplVO);
 			BillCard billCard = null;
 			billCard = NCCUIDataModuleUtil.buildCardDataFormula(aggRepayPrcplVO, "36630BLPI_CARD", "add");
+			
+			
+//			IUAPQueryBS iUAPQueryBS = (IUAPQueryBS) NCLocator.getInstance().lookup(IUAPQueryBS.class.getName());
+//			String sql = "select * from bd_bankaccsub where accnum = '"+informerVO[0].getBankaccount()+"' and nvl(dr,0)=0";
+//			BankAccSubVO bankAccSubVO = (BankAccSubVO) iUAPQueryBS.executeQuery(sql, new BeanProcessor(BankAccSubVO.class));
+			Row[] rows=billCard.getHead().getModel().getRows();
+			  Cell cell=rows[0].getValues().get("pk_loanbankacc");
+			  cell.setDisplay(informerVO[0].getBankaccount());
 			return billCard;
 		} catch (Exception e) {
 			e.printStackTrace();

+ 122 - 0
zjcmp_cd/zjcmp_cd/src/client/nccloud/web/cmp/billmanagement/paybills/action/PaybillSaveCommitAction.java

@@ -0,0 +1,122 @@
+package nccloud.web.cmp.billmanagement.paybills.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Map;
+
+import nc.bs.framework.common.NCLocator;
+import nc.bs.logging.Logger;
+import nc.impl.pubapp.pattern.data.vo.VOQuery;
+import nc.itf.uap.IVOPersistence;
+import nc.vo.cmp.bill.BillAggVO;
+import nc.vo.cmp.bill.BillDetailVO;
+import nc.vo.cmp.bill.BillVO;
+import nc.vo.cmp.informer.InformerVO;
+import nc.vo.pub.BusinessException;
+import nc.vo.pub.lang.UFDouble;
+import nc.vo.tmpub.util.StringUtil;
+import nccloud.framework.core.exception.ExceptionUtils;
+import nccloud.framework.service.ServiceLocator;
+import nccloud.framework.web.ui.pattern.billcard.BillCard;
+import nccloud.itf.tmpub.util.PerformanceLog;
+import nccloud.pubitf.cmp.paybill.IPaybillMgrServiceForNCC;
+import nccloud.pubitf.cmp.paybill.PaybillSagaInfoAdapter;
+import nccloud.pubitf.tmpub.pub.ISagasBizService;
+import nccloud.web.cmp.billmanagement.paybills.common.PaybillsUtil;
+import nccloud.web.tmpub.action.AbstrSaveCommitAction;
+import nccloud.web.tmpub.pub.ms.util.SagasBizUtil;
+
+public class PaybillSaveCommitAction extends AbstrSaveCommitAction<BillAggVO> {
+	private final String PARAM_CONTENT = "content";
+	protected PerformanceLog btplog = new PerformanceLog();
+	private static volatile ISagasBizService bizService;
+
+	protected static ISagasBizService getISagasBizService() {
+		if (bizService == null) {
+			Class var0 = ISagasBizService.class;
+			synchronized (ISagasBizService.class) {
+				if (bizService == null) {
+					return (ISagasBizService) ServiceLocator.find(ISagasBizService.class);
+				}
+			}
+		}
+
+		return bizService;
+	}
+
+	protected Object doSaveCommit(BillAggVO aggVO, Map<String, String> extParam) throws BusinessException {
+		try {
+			this.btplog.start("baocuntijiao-zhurusagaxinxi");
+			SagasBizUtil.setOperInfo("36070PBR_D5_card", "savecommit");
+			getISagasBizService().checkFrozen(new PaybillSagaInfoAdapter(), aggVO.getPrimaryKey());
+			this.btplog.end("baocuntijiao-zhurusagaxinxi");
+		} catch (Exception var5) {
+			Logger.error(var5);
+			ExceptionUtils.wrapException(var5);
+		}
+		BillVO headvo=(BillVO) aggVO.getParentVO();
+		
+		if (null != aggVO.getParentVO()) {
+			((BillVO) aggVO.getParentVO()).setBill_status(-10);
+			((BillVO) aggVO.getParentVO()).setBill_type("F5");
+			BillDetailVO[] detailvos = (BillDetailVO[]) aggVO.getChildrenVO();
+			for (BillDetailVO detailvo: detailvos) {
+				detailvo.setBill_type("F5");
+			}
+		}
+		if (null != headvo.getDef11()) {
+	    	if(!headvo.getDef12().equals("")) {
+	    		UFDouble srcmoney = new UFDouble(headvo.getDef12());
+	    		if(!srcmoney.equals(headvo.getPrimal_money())) {
+	    			ExceptionUtils.wrapBusinessException("付款金额和到账通知的金额不等,请检验。 ");
+	    		}
+	    	}
+		}
+		
+		this.btplog.start("baocuntijiao-yewu xinxi hebing");
+		PaybillsUtil.Paybills2BusiAgg(aggVO);
+		this.btplog.end("baocuntijiao-yewu xinxi hebing");
+		String contentStr = (String) extParam.get("content");
+		JSONObject assign = StringUtil.isNull(contentStr) ? null : (JSONObject) JSON.parse(contentStr);
+		
+		Object  objet= this.getNCCService().doSaveCommit(aggVO, assign);
+		if (null != headvo.getDef11()) {
+	    	 VOQuery<InformerVO> querysordr = new VOQuery<InformerVO>(InformerVO.class);
+	         //到账通知发布主表
+	    	 String [] pks=new String[] {headvo.getDef11()};
+	   	     InformerVO[] informerVO = querysordr.query(pks);
+	    	 informerVO[0].setGenerateflag("hasgenerate");//已生成
+	    	 informerVO[0].setUsemoney(headvo.getPrimal_money());//赎回金额--付款原币金额(付款结算)
+	    	 informerVO[0].setPk_claimer(headvo.getBillmaker());//认证人
+	    	 informerVO[0].setClaimdate(headvo.getBill_date());//认证日期
+	    	 informerVO[0].setPk_lower(headvo.getPk_paybill());//主键
+	    	 informerVO[0].setLowerbilltype("F5");
+	    	 informerVO[0].setDr(0);
+	    	 
+	    	 IVOPersistence ivopce=(IVOPersistence) NCLocator.getInstance().lookup(IVOPersistence.class.getName());
+	    	 
+	    	 try {
+				ivopce.updateVO(informerVO[0]);
+			} catch (BusinessException e) {
+				// TODO Auto-generated catch block
+			   ExceptionUtils.wrapBusinessException(e.getMessage());
+			}
+		}
+		
+		return objet;
+	}
+
+	protected Class<?> getFrontDataClass() {
+		return BillCard.class;
+	}
+
+	protected IPaybillMgrServiceForNCC getNCCService() {
+		return (IPaybillMgrServiceForNCC) ServiceLocator.find(IPaybillMgrServiceForNCC.class);
+	}
+
+	protected Object beforeReturn(Object billcard) throws BusinessException {
+		PaybillsUtil.afterProcess((BillCard) billcard);
+		PaybillsUtil.sourceFlagTranslate((BillCard) billcard);
+		return billcard;
+	}
+}

+ 9 - 3
zjcmp_cd/zjcmp_cd/src/client/nccloud/web/ifm/apply/handler/ApplyOrgChangeEditAfterHandler.java

@@ -77,9 +77,17 @@ public class ApplyOrgChangeEditAfterHandler extends AbstractCommonAfterEditHandl
     newvo.setBillstatus(Integer.valueOf(0));
     newvo.setVdef5(pvo.getVdef5());
     newvo.setVdef6(pvo.getVdef6());
-    newvo.setProductstatus(ProductStatusEnum.APPLYING.toStringValue());
+    newvo.setMoney(pvo.getMoney());
     
+    if(pvo.getVdef5() == null) {
+   	 newvo.setPurchasedate(billmakedate);
+   }else {
+   	 newvo.setPurchasedate(pvo.getPurchasedate());
+   	
+   }
     
+    newvo.setProductstatus(ProductStatusEnum.APPLYING.toStringValue());
+  
     newvo.setBoundary(Integer.valueOf(1));
     newvo.setPaytype(Integer.valueOf(1));
     newvo.setPk_group(ApplyQueryUtil.getGroupByOrg(pvo.getPk_org()));
@@ -93,9 +101,7 @@ public class ApplyOrgChangeEditAfterHandler extends AbstractCommonAfterEditHandl
 
     newvo.setRisk(Integer.valueOf(RiskEnum.R1.toIntValue()));
 
-    newvo.setPurchasedate(billmakedate);
   
-
     newvo.setRedeemmethod(Integer.valueOf(RedeemMethodEnum.MONEYREDEEM.toIntValue()));
 
     newvo.setDividendmethod(Integer.valueOf(DividendMethodEnum.BONDDIVID.toIntValue()));

+ 5 - 1
zjcmp_cd/zjcmp_cd/src/client/nccloud/web/ifm/investapply/action/LinkBillToApplyAction.java

@@ -47,7 +47,11 @@ public class LinkBillToApplyAction implements ICommonAction{
 			investApplyVO.setPk_org_v(informerVO[0].getPk_org_v());
 			//结算账户
 			investApplyVO.setSettleaccount(informerVO[0].getPk_acc_sub());
-//			
+			//理财金额
+			investApplyVO.setMoney(informerVO[0].getMoneyy());
+			//购买时间
+			investApplyVO.setPurchasedate(informerVO[0].getInfodate());
+//			0
 //			investApplyVO.setVbillstatus(-1);
 //			investApplyVO.setBoundary(1);
 //			investApplyVO.setProductstatus("applying");