diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index f91da87ee..bafd2a76b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -609,10 +609,10 @@ public class AdapayService { memberParams.put("zip_code", dto.getZipCode()); memberParams.put("telphone", dto.getTelphone()); memberParams.put("email", dto.getEmail()); - // memberParams.put("bank_code", dto.getBankCode()); - // memberParams.put("bank_acct_type", dto.getBankAcctType()); - // memberParams.put("card_no", dto.getCardNo()); - // memberParams.put("card_name", dto.getCardName()); + memberParams.put("bank_code", dto.getBankCode()); + memberParams.put("bank_acct_type", dto.getBankAcctType()); + memberParams.put("card_no", dto.getCardNo()); + memberParams.put("card_name", dto.getCardName()); memberParams.put("notify_url", ADAPAY_CALLBACK_URL); File file = ZipUtil.createZipFileFromImages(dto.getImgList()); Map member = CorpMember.create(memberParams, file, config.getWechatAppId()); @@ -622,16 +622,16 @@ public class AdapayService { } // 取消自动创建结算账户,手动创建结算账户 - Map settleCount = createSettleAccountRequest(dto, adapayMemberId, dto.getWechatAppId()); - - if (settleCount == null || StringUtils.equals((String) settleCount.get("status"), "failed")) { - String errorMsg = settleCount == null ? "创建汇付结算账户失败" : (String) settleCount.get("error_msg"); - throw new BusinessException("00500001", errorMsg); - } - String settleAccountId = (String) settleCount.get("id"); - // 更新数据库 - adapayMemberAccount.setSettleAccountId(settleAccountId); - adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); + // Map settleCount = createSettleAccountRequest(dto, adapayMemberId, dto.getWechatAppId()); + // + // if (settleCount == null || StringUtils.equals((String) settleCount.get("status"), "failed")) { + // String errorMsg = settleCount == null ? "创建汇付结算账户失败" : (String) settleCount.get("error_msg"); + // throw new BusinessException("00500001", errorMsg); + // } + // String settleAccountId = (String) settleCount.get("id"); + // // 更新数据库 + // adapayMemberAccount.setSettleAccountId(settleAccountId); + // adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index f9732d9a3..45f6d106a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -1,5 +1,6 @@ package com.jsowell.pile.service.impl; +import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.base.Joiner; @@ -645,5 +646,16 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { 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)); + } + }