diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java index f2d44c1bc..4949d1602 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java @@ -51,6 +51,7 @@ public class AdapayMemberController extends BaseController { logger.error("创建结算账户接口error", e); result = AjaxResult.error("创建结算账户接口异常:" + e.getMessage()); } + logger.info("创建结算账户接口 result:{}", JSON.toJSONString(result)); return result; } /** diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java index 3ae26fb8d..6525ad366 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java @@ -17,7 +17,8 @@ public class ZipUtil { if (CollectionUtils.isEmpty(imageUrls)) { return null; } - File zipFile = new File("images.zip"); + String fileName = "images-" + System.currentTimeMillis() + ".zip"; + File zipFile = new File(fileName); try (FileOutputStream fos = new FileOutputStream(zipFile); ZipOutputStream zos = new ZipOutputStream(fos)) { for (int i = 0; i < imageUrls.size(); i++) { String imageUrl = imageUrls.get(i); diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/dto/SettleAccountDTO.java b/jsowell-pile/src/main/java/com/jsowell/adapay/dto/SettleAccountDTO.java index ac94040ac..ce2f7bd2c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/dto/SettleAccountDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/dto/SettleAccountDTO.java @@ -113,6 +113,7 @@ public class SettleAccountDTO { private String adapayMemberId; + // 图片列表 private List imgList; } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 20042de67..004c956e1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -32,7 +32,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.io.File; -import java.io.IOException; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -52,7 +51,7 @@ public class AdapayMemberService { @Autowired private IAdapayMemberAccountService adapayMemberAccountService; - public void createSettleAccount(SettleAccountDTO dto) throws Exception { + public void createSettleAccount(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException { String bankAcctType = dto.getBankAcctType(); if (StringUtils.equals(bankAcctType, Constants.ONE)) { createCorpMember(dto); @@ -68,7 +67,7 @@ public class AdapayMemberService { * @throws Exception */ @Transactional(readOnly = false, propagation = Propagation.REQUIRED) - public void createMember(SettleAccountDTO dto) throws Exception { + public void createMember(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException { AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(dto.getMerchantId()); if (adapayMemberAccount != null) { log.error("通过merchantId:{}, 没有查询到结算账户配置", dto.getMerchantId()); @@ -377,7 +376,7 @@ public class AdapayMemberService { /** * 创建企业用户 */ - public void createCorpMember(SettleAccountDTO dto) throws BaseAdaPayException, IOException { + public void createCorpMember(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException { Map memberParams = Maps.newHashMap(); String adapayMemberId = Constants.ADAPAY_CORP_MEMBER_PREFIX + IdUtils.getMemberId(); memberParams.put("member_id", adapayMemberId); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index 75624d7e4..171d8da68 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -67,9 +67,8 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi } /** - * 新增【请填写功能名称】 - * - * @param adapayMemberAccount 【请填写功能名称】 + * 新增 + * @param adapayMemberAccount * @return 结果 */ @Override