浏览代码

Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207

release_toaliyun_real
xhxu 3 年前
父节点
当前提交
3d5f234938
共有 2 个文件被更改,包括 19 次插入12 次删除
  1. +8
    -8
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  2. +11
    -4
      mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java

+ 8
- 8
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java 查看文件

@@ -203,12 +203,12 @@ public class WxCashOutController extends BaseController {
// return wxCashOutService.reCashout(buser, wxCashOut,EnumPayWay.PAY_WAY_WECHAT);
// }
@AuthIgnore
@GetMapping("test")
public String test() {
TenantEntity te = new TenantEntity();
te.setTenantId("789");
wxCashOutService.cashOutToWx(EnumPayWay.PAY_WAY_WECHAT,te, 714465978943332352L);
return "ok";
}
// @AuthIgnore
// @GetMapping("test")
// public String test() {
// TenantEntity te = new TenantEntity();
// te.setTenantId("789");
// wxCashOutService.cashOutToWx(EnumPayWay.PAY_WAY_WECHAT,te, 714465978943332352L);
// return "ok";
// }
}

+ 11
- 4
mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java 查看文件

@@ -1,5 +1,6 @@
package com.iformall.service.pay.service.cashout.wx;

import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -223,7 +224,7 @@ public class WxCashOutAdapterService implements CashOutAdapterService{
response = WxPay.merchantTranferChange(payService,generateWxCashOutPV3(payAccount, appInfo, cashOut));
} catch (Exception e) {
log.error("零钱支付异常: " + e.getMessage(),e);
return new CashOutAdapterResult(false, EnumCashOutStatus.FAIL.getCode(), "微信零钱支付接口调用异常."+e.getMessage(), null);
return new CashOutAdapterResult(false, EnumCashOutStatus.FAIL.getCode(), "微信零钱支付接口调用异常:"+e.getMessage(), null);
}
log.info("微信零钱支付:, response: " + response.toString());
return generateResult(response,cashOut);
@@ -237,8 +238,14 @@ public class WxCashOutAdapterService implements CashOutAdapterService{
WxCashOutPV3 wxCashOutPv3 = new WxCashOutPV3();
wxCashOutPv3.setAppid(appInfo.getAppId());
wxCashOutPv3.setOut_batch_no(String.valueOf(cashOut.getId()));
wxCashOutPv3.setBatch_name(cashOut.getMerchantName()+"提现");
wxCashOutPv3.setBatch_remark("提现编号:"+cashOut.getId());
StringBuffer bn = new StringBuffer(cashOut.getMerchantName()).append("提现");
try {
wxCashOutPv3.setBatch_name(new String(bn.toString().getBytes("ISO-8859-1"), "UTF-8"));
} catch (UnsupportedEncodingException e) {
wxCashOutPv3.setBatch_name("tixian");
}
wxCashOutPv3.setBatch_remark("From FM WxMiniApp");
wxCashOutPv3.setTotal_amount(cashOut.getTotalFee());
wxCashOutPv3.setTotal_num(1);
List<WxCashOutPV3Item> itemList = new ArrayList<WxCashOutPV3Item>();
@@ -246,7 +253,7 @@ public class WxCashOutAdapterService implements CashOutAdapterService{
item.setOut_detail_no(Utility.generate32UUID());
item.setOpenid(cashOut.getReciveOpenId());
item.setTransfer_amount(cashOut.getTotalFee());
item.setTransfer_remark(cashOut.getMerchantName()+"提现");
item.setTransfer_remark("From FM WxMiniApp Tranfer.");
item.setUser_name(cashOut.getRealName());
itemList.add(item);
wxCashOutPv3.setTransfer_detail_list(itemList);


正在加载...
取消
保存