提现修改

@@ -76,22 +76,24 @@ public class TrustapplyReturn {
             for (ReturnRalationInfo returnRalationInfo : info) {
                 Map<String, Object> map = entrustDao
                     .queryEntrustByApplyNO(returnRalationInfo.getApplyNo());
-                returnRalationInfo.setOtcCode(map.get("OTC_CODE").toString());
-                returnRalationInfo.setOtcName(map.get("OTC_NAME").toString());
+                if(map!=null){
+                    returnRalationInfo.setOtcCode(map.get("OTC_CODE")!=null?map.get("OTC_CODE").toString():null);
+                    returnRalationInfo.setOtcName(map.get("OTC_NAME")!=null?map.get("OTC_NAME").toString():null);
                     if (returnRalationInfo.getReturnType().equals("0")) {
                         returnRalationInfo
-                        .setReturnAmount(Integer.parseInt(map.get("BACK_AMOUNT").toString()));
+                            .setReturnAmount(map.get("BACK_AMOUNT")!=null?Integer.parseInt(map.get("BACK_AMOUNT").toString()):null);
                     } else if (returnRalationInfo.getReturnType().equals("1")) {
                         returnRalationInfo
-                        .setReturnAmount(Integer.parseInt(map.get("APPROVAL_COUNT").toString()));
+                            .setReturnAmount(map.get("APPROVAL_COUNT")!=null?Integer.parseInt(map.get("APPROVAL_COUNT").toString()):null);
                     } else if (returnRalationInfo.getReturnType().equals("2")) {
-                    returnRalationInfo
-                        .setReturnAmount(Integer.parseInt(map.get("APPROVAL_COUNT").toString())
-                                         + Integer.parseInt(map.get("BACK_AMOUNT").toString()));
+                    	Integer value1=map.get("APPROVAL_COUNT")!=null?Integer.parseInt(map.get("APPROVAL_COUNT").toString()):0;
+                    	Integer value2=map.get("BACK_AMOUNT")!=null?Integer.parseInt(map.get("BACK_AMOUNT").toString()):0;
+                        returnRalationInfo.setReturnAmount(value1 + value2);
                     }
 	
                 }
             }
+        }
         model.addAttribute("returnRecord", trustApplyReturn);
         return "user/ration/returnRecord.jsp";
     }

@@ -60,14 +60,14 @@ public class UserKitingBiz {
     public String kiting(String subBranch, Double amount, String validCode, HttpSession session) {
         UserInfo userInfo = ActionUtil.getUser();
         String userId = userInfo.getClient_id();
-        if (!this.commonBiz.checkTime(true, 10, 11)) {
-            String beginTime = DateUtil.parseDate(
-              DateUtil.parseDate(this.sysParamDao.getParamValue("begin_time_fund"), DateEnum.UNSIGNED_TIME), 
-              DateEnum.TIME);
-            String endTime = DateUtil.parseDate(DateUtil.parseDate(
-              this.sysParamDao.getParamValue("end_time_fund"), DateEnum.UNSIGNED_TIME), DateEnum.TIME);
-            return "请于交易日的" + beginTime + " - " + endTime + "进行提现操作。";
-          }
+//        if (!this.commonBiz.checkTime(true, 10, 11)) {
+//            String beginTime = DateUtil.parseDate(
+//              DateUtil.parseDate(this.sysParamDao.getParamValue("begin_time_fund"), DateEnum.UNSIGNED_TIME), 
+//              DateEnum.TIME);
+//            String endTime = DateUtil.parseDate(DateUtil.parseDate(
+//              this.sysParamDao.getParamValue("end_time_fund"), DateEnum.UNSIGNED_TIME), DateEnum.TIME);
+//            return "请于交易日的" + beginTime + " - " + endTime + "进行提现操作。";
+//          }
         //验证短信验证码
         if (!sendMessageBiz.compareValidCode(validCode, session)) {
             return "短信验证码不正确";

@@ -70,7 +70,7 @@
 	</select>
 
 	<select id="queryReturnTotal" resultType="int" parameterType="map">
-		select SUM(BACK_AMOUNT) back_amount
+		select nvl(SUM(BACK_AMOUNT),0) back_amount
 		from hs_asset.trustapply
 		where fund_account = #{fund_account}
 		and addressx not like '赵涌在线:%'