湖北消金 - 修改金额不正确时显示的错误码，修改回盘文件无论是否发送成功 都发出邮件

src/main/java/cn/quantgroup/financial/constant/HubeiCFCField.java

@@ -108,7 +108,7 @@ public class HubeiCFCField {
      * 交易码
      */
     public static final String tradeCodeSuccess = "0000";
-    public static final String tradeCodeNoTrade = "1111";
+    public static final String tradeCodeNoTrade = "0001";
     public static final String tradeCodeWrongPrice = "2222";
     /**
      * 交易结果

src/main/java/cn/quantgroup/financial/controller/ApiCommonController.java

@@ -144,7 +144,7 @@ public class ApiCommonController {
     }
 
     @RequestMapping(value = "/hubei/returnDisc", method = {RequestMethod.POST,RequestMethod.GET})
-    public @ResponseBody JsonResult getReturnDisc(@RequestParam("applyDt") String applyDt,@RequestParam("type") Integer type){
+    public @ResponseBody JsonResult getReturnDisc(@RequestParam("applyDt") String applyDt,@RequestParam("type") Integer type,@RequestParam("docId") Long docId){
         try {
             if(type.intValue()==HubeiCFCDataType.RETURN_ADVANCE_REPAYMENT.get().intValue()){
                 huBeiService.handleDiscData(HubeiCFCDataType.RETURN_ADVANCE_REPAYMENT,null,null,new Integer(1).byteValue(),applyDt);

src/main/java/cn/quantgroup/financial/controller/SystemToolsController.java

@@ -26,7 +26,7 @@ public class SystemToolsController {
     public  @ResponseBody JsonResult saveMailInfo(@RequestBody MailInfo mailInfo){
         Long mailId = null;
         if(mailInfo !=null){
-//            mailId = mailService.saveMailInfo(mailInfo);
+            mailId = mailService.saveMailInfo(mailInfo);
         }
         return JsonResult.SUCCESS(mailId);
     }

src/main/java/cn/quantgroup/financial/scheduler/HuBeiReturnDiscScheduler.java

@@ -157,7 +157,7 @@ class ScheduleAdvanceRepay implements Runnable{
 
     public boolean isOutTime(){
         Long spendtime = System.currentTimeMillis()-startTime;
-        if(spendtime>1000*60*60*23){
+        if(spendtime>1000*60*60*6){
             //运行超时 自动停止
             return true;
         }else {

src/main/java/cn/quantgroup/financial/service/impl/HuBeiServiceImpl.java

@@ -175,25 +175,26 @@ public class HuBeiServiceImpl implements IHuBeiService {
                 }else {
                     logger.info("do not need save data");
                 }
-
-                DataSource dataSource = null;
-                switch (dataType){
-                    case SEND_DEBIT:
-                    case SEND_ADVANCE_REPAYMENT_CHECK:
+            }
+            DataSource dataSource = null;
+            switch (dataType){
+                case SEND_DEBIT:
+                case SEND_ADVANCE_REPAYMENT_CHECK:
+                    if(response!=null&&HubeiCFCField.EC_SUCCESS_CODE.equals(response.getEc())){
                         //发送送盘文件 邮件
                         dataSource = iMailService.getDataSource(new String(Base64.decodeBase64(response.getFileConent())),response.getFileName());
                         sendMailAttachment(dataType,new ArrayList<DataSource>(Arrays.asList(dataSource)));
                         response.setFileConent(null);
-                        break;
-                    case RETURN_ADVANCE_REPAYMENT:
-                    case RETURN_BATCH_DEBIT:
-                    case RETURN_BATCH_COMPENSATION:
-                        //发送回盘 邮件
-                        dataSource = iMailService.getDataSource(new String(Base64.decodeBase64(huBeiCFCRequest.getFileConent())),huBeiCFCRequest.getFileName());
-                        sendMailAttachment(dataType,new ArrayList<DataSource>(Arrays.asList(dataSource)));
-                        break;
-                        default:
-                }
+                    }
+                    break;
+                case RETURN_ADVANCE_REPAYMENT:
+                case RETURN_BATCH_DEBIT:
+                case RETURN_BATCH_COMPENSATION:
+                    //发送回盘 邮件
+                    dataSource = iMailService.getDataSource(new String(Base64.decodeBase64(huBeiCFCRequest.getFileConent())),huBeiCFCRequest.getFileName());
+                    sendMailAttachment(dataType,new ArrayList<DataSource>(Arrays.asList(dataSource)));
+                    break;
+                default:
             }
             return response;
         }else {
@@ -637,7 +638,7 @@ public class HuBeiServiceImpl implements IHuBeiService {
             huBeiJsonBean.setTradeMsg(HubeiCFCField.codeMappingMsg.get(HubeiCFCField.tradeCodeSuccess));
         }else if(reallyRepayAmount.compareTo(BigDecimal.ZERO)==0){
             huBeiJsonBean.setTradeCode(HubeiCFCField.tradeCodeNoTrade);
-            huBeiJsonBean.setTradeMsg(HubeiCFCField.codeMappingMsg.get(HubeiCFCField.tradeCodeWrongPrice));
+            huBeiJsonBean.setTradeMsg(HubeiCFCField.codeMappingMsg.get(HubeiCFCField.tradeCodeNoTrade));
         }else {
             huBeiJsonBean.setTradeCode(HubeiCFCField.tradeCodeWrongPrice);
             huBeiJsonBean.setTradeMsg(HubeiCFCField.codeMappingMsg.get(HubeiCFCField.tradeCodeWrongPrice));

src/main/resources/config/local/application.properties

@@ -8,16 +8,16 @@ thirdparty.api.hubei=http://116.211.134.215/Gateway/servlet/OutsiteReqServlet
 #thirdparty.api.hubei=http://127.0.0.1/Gateway/servlet/OutsiteReqServlet
 
 api.jdbc.driverClassName=com.mysql.jdbc.Driver
-api.jdbc.url=jdbc:mysql://192.168.4.16:3306/financial_system_api?useUnicode=true&characterEncoding=UTF8
-api.jdbc.username=qa
-api.jdbc.password=qatest
+api.jdbc.url=jdbc:mysql://192.168.4.190:3306/financial_system_api?useUnicode=true&characterEncoding=UTF8
+api.jdbc.username=financial_user_rw
+api.jdbc.password=quant_financial_rw
 api.jdbc.maxActive=500
 api.jdbc.minIdle=20
 
 system.jdbc.driverClassName=com.mysql.jdbc.Driver
-system.jdbc.url=jdbc:mysql://192.168.4.16:3306/financial_system?useUnicode=true&characterEncoding=UTF8
-system.jdbc.username=qa
-system.jdbc.password=qatest
+system.jdbc.url=jdbc:mysql://192.168.4.190:3306/financial_system?useUnicode=true&characterEncoding=UTF8
+system.jdbc.username=financial_user_rw
+system.jdbc.password=quant_financial_rw
 system.jdbc.maxActive=200
 system.jdbc.minIdle=20
 

src/test/java/cn/quantgroup/financial/service/HuBeiServiceTest.java

@@ -66,8 +66,9 @@ public class HuBeiServiceTest {
     /**
      * 提前还款
      */
+    @Test
     public void testReturnAdvanceRepayDisc(){
-        huBeiService.handleDiscData(HubeiCFCDataType.RETURN_ADVANCE_REPAYMENT,null,null,new Integer(1).byteValue());
+        huBeiService.handleDiscData(HubeiCFCDataType.RETURN_ADVANCE_REPAYMENT,"20170221_9009_T01.txt",10L,new Integer(1).byteValue());
     }
 
     /**
@@ -105,7 +106,7 @@ public class HuBeiServiceTest {
     public void testCheckSendDisc(){
         //20170119_9009_T01.txt
         try {
-            huBeiService.handleDiscData(HubeiCFCDataType.SEND_ADVANCE_REPAYMENT_CHECK,"20170209_9009_T01.txt",null,new Integer(1).byteValue());
+            huBeiService.handleDiscData(HubeiCFCDataType.SEND_ADVANCE_REPAYMENT_CHECK,"20170221_9009_T01.txt",10L,new Integer(1).byteValue());
         } catch (Exception e) {
             e.printStackTrace();
         }