20180110

ccb_fund_trusteeship/src/main/java/com/fuzamei/dao/CapitalTransferDao.java

@@ -69,8 +69,11 @@ public class CapitalTransferDao {
 	public void insertOperationHistory(Map<String, Object> map) {//往操作记录表插入
 		capitalTransferMapper.insertOperationHistory(map);
 	}	
-	 public void insertAttachmentInfo(Map<String, Object> map) {//往附件表插入
+	public void insertAttachmentInfo(Map<String, Object> map) {//往附件表插入
 		 capitalTransferMapper.insertAttachmentInfo(map);
 	 }	
+	public void updateTUserAccountBalance(Map<String, Object> map) {//划转资金后  修改账户里的余额
+		capitalTransferMapper.updateTUserAccountBalance(map);
+	}
 	
 }

ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/AccountInfo.java

@@ -0,0 +1,43 @@
+package com.fuzamei.entity;
+
+public class AccountInfo {
+	private Integer id;//主键 id
+	private Integer account_id;//账户id
+	private String  enterprise_name;//账户名称
+	private String  account_type;//账户类型
+	private  Double money;//钱
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getAccount_id() {
+		return account_id;
+	}
+	public void setAccount_id(Integer account_id) {
+		this.account_id = account_id;
+	}
+	public String getEnterprise_name() {
+		return enterprise_name;
+	}
+	public void setEnterprise_name(String enterprise_name) {
+		this.enterprise_name = enterprise_name;
+	}
+	public String getAccount_type() {
+		return account_type;
+	}
+	public void setAccount_type(String account_type) {
+		this.account_type = account_type;
+	}
+	public Double getMoney() {
+		return money;
+	}
+	public void setMoney(Double money) {
+		this.money = money;
+	}
+	
+	
+	
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/UserAccount.java

@@ -0,0 +1,21 @@
+package com.fuzamei.entity;
+//用户表和账户表的中间表
+public class UserAccount {
+	private Integer user_id;//用户id
+	private Integer account_id;//账户id
+	public Integer getUser_id() {
+		return user_id;
+	}
+	public void setUser_id(Integer user_id) {
+		this.user_id = user_id;
+	}
+	public Integer getAccount_id() {
+		return account_id;
+	}
+	public void setAccount_id(Integer account_id) {
+		this.account_id = account_id;
+	}
+	
+	
+	
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/UserDetail.java

@@ -15,7 +15,7 @@ public class UserDetail {
 	private List<String> role_name;				//角色名称
 	private List<String> authority_name;		//权限名称
 	private Double account_balance;				//账户余额
-	private String drawing_account;				//划款账户
+	//private String drawing_account;		    //划款账户       这字段删掉了挪到账户表里了
 	private Long create_time;					//账户创建时间
 	private Long update_time;					//账户修改时间
 	public Double getAccount_balance() {
@@ -24,12 +24,7 @@ public class UserDetail {
 	public void setAccount_balance(Double account_balance) {
 		this.account_balance = account_balance;
 	}
-	public String getDrawing_account() {
-		return drawing_account;
-	}
-	public void setDrawing_account(String drawing_account) {
-		this.drawing_account = drawing_account;
-	}
+
 	public Long getCreate_time() {
 		return create_time;
 	}

ccb_fund_trusteeship/src/main/java/com/fuzamei/mapper/CapitalTransferMapper.xml

@@ -363,8 +363,12 @@
 			fund_id=#{fund_id}  
 	</update>
 	<!--根据user_id 去修改账户余额  -->
-	<update id="updateAccountBalance">
+	<update id="updateTUserAccountBalance"><!--用户表的账户余额  要减掉-->
        update  t_user set account_balance=#{account_balance}   where user_id=#{user_id}
 	</update>
+	<!--根据账户表的账户id来修改钱  -->
+	<update id="updateAccountMoney"><!-- 账户表的钱要加起来 -->
+       update  account set money=#{money}   where account_id=#{account_id}
+	</update>
 
 </mapper>

ccb_fund_trusteeship/src/main/java/com/fuzamei/mapperInterface/CapitalTransferMapper.java

@@ -27,4 +27,5 @@ public interface CapitalTransferMapper {
 	public Integer getStatusIdByCapitalId(Integer fund_id);
     public void insertOperationHistory(Map<String, Object> map);//往操作记录表插入
     public void insertAttachmentInfo(Map<String, Object> map);//往附件表插入
+    public void updateTUserAccountBalance(Map<String, Object> map);//划转资金后  修改账户里的余额
 }

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/CapitalTransferService.java

@@ -273,28 +273,46 @@ public class CapitalTransferService {
 	public void  insertCapitalTransfer(Map<String, Object> map){
 		long currentTime = System.currentTimeMillis();//获取系统时间
 		int attachmentId = attachmentService.generateAtachmentId();	//去数据库查询有重复的随机数
+		
 		UserDetail userDetail = (UserDetail) map.get("userDetail");//userDetail从controller层获取到
 		List<String> roleList = userDetail.getRole_name();//角色名称
 		String check_department=userDetail.getOrganization_name();//机构名称
+		String check_person=userDetail.getPerson_name();//处理人员
+		int user_id=(int) map.get("userId");
 		String custodian=(String) map.get("custodian");
 		String fund_name=(String) map.get("fund_name");
-		double sum_of_money=(double) map.get("sum_of_money");//划款金额暂未获取
+		double sum_of_money=(double) map.get("sum_of_money");
 		
 		
 		String attachment_name=(String) map.get("attachment_name");//附件名称拿上传文件后的名称
-		double  account_balance=userDetail.getAccount_balance();//????????//管理人的账户余额
-		String  drawing_account= userDetail.getDrawing_account();//???????//划款账户
-	    double minusResult=account_balance-sum_of_money;//账户余额减去划款金额后的结果
-		   //这里账户余额要做一个计算公式（减去）划款金额
-	
-		
-		
+		double  account_balance=userDetail.getAccount_balance();//管理人的账户余额 ？？？？
+		//String  drawing_account= userDetail.getDrawing_account();//划款账户   字段不要了
+	    double minusResult=account_balance-sum_of_money;//账户余额减去划款金额后的结果？？？
+		  
 		Map<String, Object> mapToCapitalTransfer=new LinkedHashMap<String, Object>();
 		mapToCapitalTransfer.put("custodian", custodian);//管理人？？？？还是userDetail.getUser_id()
 		mapToCapitalTransfer.put("fund_name", fund_name);//基金名称
 		mapToCapitalTransfer.put("sum_of_money",sum_of_money);//划款金额
 		capitalTransferDao.insertCapitalTransfer(mapToCapitalTransfer);//插入到划转资金表
 		
+		
+		Map<String, Object> mapToDaoOfCapitalTransfer=new LinkedHashMap<String, Object>();
+		mapToDaoOfCapitalTransfer.put("check_department", check_department);
+		mapToDaoOfCapitalTransfer.put("check_person",check_person);//处理人员
+		mapToDaoOfCapitalTransfer.put("check_result", "通过");//这里待？？？
+		mapToDaoOfCapitalTransfer.put("check_opinion", "--");//刚发起没有审核意见
+		mapToDaoOfCapitalTransfer.put("check_time", currentTime); 
+		mapToDaoOfCapitalTransfer.put("relation", StatusId.LAUNCHING);//发起
+		capitalTransferDao.insertCheckTransfer(mapToDaoOfCapitalTransfer);//管理人发起划款资金后也会产生一条划款记录到划转审核记录表里  且任务状态为发起
+		
+		Map<String, Object> mapToUpdateUserAccountBalance=new LinkedHashMap<String, Object>();
+		mapToUpdateUserAccountBalance.put("user_id",user_id );
+		mapToUpdateUserAccountBalance.put("account_balance", minusResult);
+		capitalTransferDao.updateTUserAccountBalance(mapToUpdateUserAccountBalance);//去用户表去修改账户余额
+		
+		
+		
+		
 		Map<String, Object> mapToAttachment=new LinkedHashMap<String, Object>();
 		mapToAttachment.put("attachment_id", attachmentId);             //写的是随机数上面已经去数据库校验过了
 		mapToAttachment.put("attachment_name", attachment_name);        //附件名称
@@ -309,7 +327,7 @@ public class CapitalTransferService {
 		mapToOperationHistory.put("operator_account", userDetail.getAccount());					//操作账号
 		mapToOperationHistory.put("operator_person", userDetail.getPerson_name());				//操作人
 		mapToOperationHistory.put("operator_time", currentTime);							    //操作时间为当前操作时间
-		mapToOperationHistory.put("hash", "66666666666");					                    //如何计算操作的hash值？？？？暂时写死的
+		mapToOperationHistory.put("hash", "777777777");					                    //如何计算操作的hash值？？？？暂时写死的
 		capitalTransferDao.insertOperationHistory(mapToOperationHistory);                       //将操作记录信息插入到操作记录表中
 		
 	}

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/CapitalTransferAction.java

@@ -210,9 +210,9 @@ public class CapitalTransferAction {
 	 */
 	@PostMapping(value="/adminInsertCapitalTransfer")
 	@ResponseBody
-	public Map<String,Object> adminInsertCapitalTransfer( @RequestParam("userId") Object uId,
+	public Map<String,Object> adminInsertCapitalTransfer(@RequestParam("userId") Object uId,
 			                                        @RequestParam("file") MultipartFile file,
-			                                        @RequestParam("custodian") String Custodian , //管理人
+			                                        @RequestParam("custodian") String Custodian , //管理人??
 			                                        @RequestParam("fund_name") String fName,      //基金名称
 			                                        @RequestParam("sum_of_money") double Sum_of_money,//划款金额
 			                                        HttpServletRequest request){
@@ -236,13 +236,14 @@ public class CapitalTransferAction {
            	dir.mkdirs();  
        	 }  
        	 file.transferTo(newfile);	
-       	 Integer custodian=ValidationUtil.checkAndAssignInt(Custodian);//检验前端传来的（管理人）参数
+       	 //Integer user_id=ValidationUtil.checkAndAssignInt(uId);	
+       	 String  custodian=ValidationUtil.checkBlankAndAssignString(Custodian);//检验前端传来的（管理人）参数??
 		 String fund_name =ValidationUtil.checkBlankAndAssignString(fName);//校验前端传来的（基金名称）参数
-		 Double sum_of_money=ValidationUtil.checkAndAssignDouble("Sum_of_money");  //校验前端传来的（划款金额）参数——————>待校验,校验调用的方法待改动
+		 Double sum_of_money=ValidationUtil.checkAndAssignDouble(Sum_of_money);  //校验前端传来的（划款金额）参数
 		 
 	     Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 	     mapToService.put("userDetail",userDetail );
-	     mapToService.put("custodian",custodian );
+	     mapToService.put("custodian",custodian );//管理ren ??????
 	     mapToService.put("fund_name", fund_name);
 	     mapToService.put("sum_of_money", sum_of_money);
 	     mapToService.put("attachment_name", fileName);