Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java

@@ -389,6 +389,7 @@
    */

   @Transactional

   private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {

      LogHelper.userErrorInfo("提现:开始通过提现-"+extract.getId());

      String privateKey = Constant.alipayConfig.getPrivateKey();

      AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",

            Constant.alipayConfig.getAppId(), privateKey, "json", "gbk", null, "RSA2");

@@ -407,15 +408,17 @@
      AlipayFundTransToaccountTransferResponse response = null;

      try {

         response = alipayClient.execute(request);

         LogHelper.userErrorInfo("提现:支付宝通过提现成功-"+extract.getId());

      } catch (AlipayApiException e) {

         e.printStackTrace();

         LogHelper.userErrorInfo("支付宝提现异常：" + response + ",提现信息" + GsonUtil.toJson(extract));

         LogHelper.userErrorInfo("提现:支付宝提现异常：" + response + ",提现信息" + GsonUtil.toJson(extract));

      }



      try {

         CMQManager.getInstance().addExtractResultMsg(extract, response, adminUser);

         LogHelper.userErrorInfo("提现:添加处理队列成功-"+extract.getId());

      } catch (Exception e) {

         LogHelper.userErrorInfo("支付宝提现CMQ异常：" + new Gson().toJson(response) + ",提现信息" + GsonUtil.toJson(extract));

         LogHelper.userErrorInfo("提现:支付宝提现CMQ异常：" + new Gson().toJson(response) + ",提现信息" + GsonUtil.toJson(extract));

      }

   }