理财赎回

zjcmp_cd/zjcmp_cd/src/client/nccloud/web/ifm/redeem/action/InformerToRedeemAction.java

@@ -4,6 +4,7 @@ import nccloud.framework.web.action.itf.ICommonAction;
 import nccloud.framework.web.container.IRequest;
 import nccloud.framework.web.convert.translate.Translator;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -39,6 +40,9 @@ public class InformerToRedeemAction implements ICommonAction {
 		IJson json = JsonFactory.create();
 
 		try {
+//			Calendar period_yer = Calendar.getInstance();//可以对每个时间域单独修改
+//
+//			int year = period_yer.get(Calendar.YEAR); 
 			HashMap<String, Object> map = (HashMap) json.fromJson(read, HashMap.class);
 			List<String> pk_informers = (List<String>) map.get("pks");
 			String where = " pk_informer = '" + pk_informers.get(0) + "'";
@@ -54,6 +58,8 @@ public class InformerToRedeemAction implements ICommonAction {
 			headvo.setPk_org_v(informervVO[0].getPk_org_v());
 			headvo.setSrcbilltypecode(informervVO[0].getPk_billtypecode());//来源单据类型编码
 			headvo.setPk_srcbilltype(informervVO[0].getPk_billtypeid());//来源单据类型 到账通知 36S3
+			headvo.setRedeemdate(informervVO[0].getInfodate());//理财赎回：赎回日期=到账通知日期；
+			
 			
 			//headvo.setPk_currtype(informervVO[0].getPk_currtype());//币种
 			//headvo.setRedeemmoney(UFDouble.ZERO_DBL);//赎回金额

zjcmp_cd/zjcmp_cd/src/client/nccloud/web/ifm/redeem/action/RedeemSaveAction.java

@@ -90,8 +90,10 @@ public class RedeemSaveAction extends CommonSaveAction<AggInvestRedeemVO>
          //到账通知发布主表
     	 String [] pks=new String[] {headvo.getVdef8()};
    	    InformerVO[] informerVO = querysordr.query(pks);
-    	if(headvo.getRedeemmoney().compareTo(informerVO[0].getMoneyy())!=0) {
+   	    UFDouble realreaning=headvo.getRealreaning();//realreaning 实际收益
-    		ExceptionUtils.wrapBusinessException("理财赎回表头【赎回金额】要等于 到账通知的【金额】! ");
+   	    UFDouble redeemmoney=headvo.getRedeemmoney();//赎回金额
+    	if((realreaning.add(redeemmoney)).compareTo(informerVO[0].getMoneyy())!=0) {
+    		ExceptionUtils.wrapBusinessException("理财赎回表头【赎回金额+实际收益】要等于 到账通知的【金额】! ");
     	}