autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 创建对公账户

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-31 08:52:40 +08:00
parent 6dabf90018
commit 40c3d7cc86
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java
View File

@@ -609,10 +609,10 @@ public class AdapayService {
memberParams.put("zip_code", dto.getZipCode()); memberParams.put("zip_code", dto.getZipCode());
memberParams.put("telphone", dto.getTelphone()); memberParams.put("telphone", dto.getTelphone());
memberParams.put("email", dto.getEmail()); memberParams.put("email", dto.getEmail());
// memberParams.put("bank_code", dto.getBankCode()); memberParams.put("bank_code", dto.getBankCode());
// memberParams.put("bank_acct_type", dto.getBankAcctType()); memberParams.put("bank_acct_type", dto.getBankAcctType());
// memberParams.put("card_no", dto.getCardNo()); memberParams.put("card_no", dto.getCardNo());
// memberParams.put("card_name", dto.getCardName()); memberParams.put("card_name", dto.getCardName());
memberParams.put("notify_url", ADAPAY_CALLBACK_URL); memberParams.put("notify_url", ADAPAY_CALLBACK_URL);
File file = ZipUtil.createZipFileFromImages(dto.getImgList()); File file = ZipUtil.createZipFileFromImages(dto.getImgList());
Map<String, Object> member = CorpMember.create(memberParams, file, config.getWechatAppId()); Map<String, Object> member = CorpMember.create(memberParams, file, config.getWechatAppId());
@@ -622,16 +622,16 @@ public class AdapayService {
} }
// 取消自动创建结算账户，手动创建结算账户 // 取消自动创建结算账户，手动创建结算账户
Map<String, Object> settleCount = createSettleAccountRequest(dto, adapayMemberId, dto.getWechatAppId()); // Map<String, Object> settleCount = createSettleAccountRequest(dto, adapayMemberId, dto.getWechatAppId());
//
if (settleCount == null || StringUtils.equals((String) settleCount.get("status"), "failed")) { // if (settleCount == null || StringUtils.equals((String) settleCount.get("status"), "failed")) {
String errorMsg = settleCount == null ? "创建汇付结算账户失败" : (String) settleCount.get("error_msg"); // String errorMsg = settleCount == null ? "创建汇付结算账户失败" : (String) settleCount.get("error_msg");
throw new BusinessException("00500001", errorMsg); // throw new BusinessException("00500001", errorMsg);
} // }
String settleAccountId = (String) settleCount.get("id"); // String settleAccountId = (String) settleCount.get("id");
// 更新数据库 // // 更新数据库
adapayMemberAccount.setSettleAccountId(settleAccountId); // adapayMemberAccount.setSettleAccountId(settleAccountId);
adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); // adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount);
} }
/** /**

12
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.service.impl; package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
@@ -645,5 +646,16 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
return resultVO; return resultVO;
} }
public static void main(String[] args) {
BigDecimal settleAmount = new BigDecimal("330.37");
// 计算手续费 = 结算金额 * 0.55%
BigDecimal fee = settleAmount.multiply(new BigDecimal(Constants.FEE_RATES));
SplitSettleAmountVO resultVO = new SplitSettleAmountVO();
resultVO.setSettleAmount(settleAmount);
resultVO.setFeeAmount(fee);
resultVO.setTradeAmount(settleAmount.subtract(fee));
System.out.println(JSON.toJSONString(resultVO));
}
} }