zyn / cjs-site

Go to a project
Toggle navigation Toggle navigation pinning
ye
af4d9dff 1 parent 3681459f

提现修改

Inline Side-by-side
Showing 3 changed files with 18 additions and 16 deletions
...@@ -76,22 +76,24 @@ public class TrustapplyReturn { ...@@ -76,22 +76,24 @@ public class TrustapplyReturn {
76 for (ReturnRalationInfo returnRalationInfo : info) { 76 for (ReturnRalationInfo returnRalationInfo : info) {
77 Map<String, Object> map = entrustDao 77 Map<String, Object> map = entrustDao
78 .queryEntrustByApplyNO(returnRalationInfo.getApplyNo()); 78 .queryEntrustByApplyNO(returnRalationInfo.getApplyNo());
79 - returnRalationInfo.setOtcCode(map.get("OTC_CODE").toString()); 79 + if(map!=null){
80 - returnRalationInfo.setOtcName(map.get("OTC_NAME").toString()); 80 + returnRalationInfo.setOtcCode(map.get("OTC_CODE")!=null?map.get("OTC_CODE").toString():null);
81 + returnRalationInfo.setOtcName(map.get("OTC_NAME")!=null?map.get("OTC_NAME").toString():null);
81 if (returnRalationInfo.getReturnType().equals("0")) { 82 if (returnRalationInfo.getReturnType().equals("0")) {
82 returnRalationInfo 83 returnRalationInfo
83 - .setReturnAmount(Integer.parseInt(map.get("BACK_AMOUNT").toString())); 84 + .setReturnAmount(map.get("BACK_AMOUNT")!=null?Integer.parseInt(map.get("BACK_AMOUNT").toString()):null);
84 } else if (returnRalationInfo.getReturnType().equals("1")) { 85 } else if (returnRalationInfo.getReturnType().equals("1")) {
85 returnRalationInfo 86 returnRalationInfo
86 - .setReturnAmount(Integer.parseInt(map.get("APPROVAL_COUNT").toString())); 87 + .setReturnAmount(map.get("APPROVAL_COUNT")!=null?Integer.parseInt(map.get("APPROVAL_COUNT").toString()):null);
87 } else if (returnRalationInfo.getReturnType().equals("2")) { 88 } else if (returnRalationInfo.getReturnType().equals("2")) {
88 - returnRalationInfo 89 + Integer value1=map.get("APPROVAL_COUNT")!=null?Integer.parseInt(map.get("APPROVAL_COUNT").toString()):0;
89 - .setReturnAmount(Integer.parseInt(map.get("APPROVAL_COUNT").toString()) 90 + Integer value2=map.get("BACK_AMOUNT")!=null?Integer.parseInt(map.get("BACK_AMOUNT").toString()):0;
90 - + Integer.parseInt(map.get("BACK_AMOUNT").toString())); 91 + returnRalationInfo.setReturnAmount(value1 + value2);
91 } 92 }
92 93
93 } 94 }
94 } 95 }
96 + }
95 model.addAttribute("returnRecord", trustApplyReturn); 97 model.addAttribute("returnRecord", trustApplyReturn);
96 return "user/ration/returnRecord.jsp"; 98 return "user/ration/returnRecord.jsp";
97 } 99 }
......
...@@ -60,14 +60,14 @@ public class UserKitingBiz { ...@@ -60,14 +60,14 @@ public class UserKitingBiz {
60 public String kiting(String subBranch, Double amount, String validCode, HttpSession session) { 60 public String kiting(String subBranch, Double amount, String validCode, HttpSession session) {
61 UserInfo userInfo = ActionUtil.getUser(); 61 UserInfo userInfo = ActionUtil.getUser();
62 String userId = userInfo.getClient_id(); 62 String userId = userInfo.getClient_id();
63 - if (!this.commonBiz.checkTime(true, 10, 11)) { 63 +// if (!this.commonBiz.checkTime(true, 10, 11)) {
64 - String beginTime = DateUtil.parseDate( 64 +// String beginTime = DateUtil.parseDate(
65 - DateUtil.parseDate(this.sysParamDao.getParamValue("begin_time_fund"), DateEnum.UNSIGNED_TIME), 65 +// DateUtil.parseDate(this.sysParamDao.getParamValue("begin_time_fund"), DateEnum.UNSIGNED_TIME),
66 - DateEnum.TIME); 66 +// DateEnum.TIME);
67 - String endTime = DateUtil.parseDate(DateUtil.parseDate( 67 +// String endTime = DateUtil.parseDate(DateUtil.parseDate(
68 - this.sysParamDao.getParamValue("end_time_fund"), DateEnum.UNSIGNED_TIME), DateEnum.TIME); 68 +// this.sysParamDao.getParamValue("end_time_fund"), DateEnum.UNSIGNED_TIME), DateEnum.TIME);
69 - return "请于交易日的" + beginTime + " - " + endTime + "进行提现操作。"; 69 +// return "请于交易日的" + beginTime + " - " + endTime + "进行提现操作。";
70 - } 70 +// }
71 //验证短信验证码 71 //验证短信验证码
72 if (!sendMessageBiz.compareValidCode(validCode, session)) { 72 if (!sendMessageBiz.compareValidCode(validCode, session)) {
73 return "短信验证码不正确"; 73 return "短信验证码不正确";
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 </select> 70 </select>
71 71
72 <select id="queryReturnTotal" resultType="int" parameterType="map"> 72 <select id="queryReturnTotal" resultType="int" parameterType="map">
73 - select SUM(BACK_AMOUNT) back_amount 73 + select nvl(SUM(BACK_AMOUNT),0) back_amount
74 from hs_asset.trustapply 74 from hs_asset.trustapply
75 where fund_account = #{fund_account} 75 where fund_account = #{fund_account}
76 and addressx not like '赵涌在线:%' 76 and addressx not like '赵涌在线:%'
......