autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-07 15:38:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-07-17 16:05:01 +08:00
parent bea095671e cb5ac32f7b
commit bd85ac961e
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
View File

@@ -51,6 +51,7 @@ public class AdapayMemberController extends BaseController {
logger.error("创建结算账户接口error", e); logger.error("创建结算账户接口error", e);
result = AjaxResult.error("创建结算账户接口异常:" + e.getMessage()); result = AjaxResult.error("创建结算账户接口异常:" + e.getMessage());
} }
logger.info("创建结算账户接口 result:{}", JSON.toJSONString(result));
return result; return result;
} }
/** /**

3
jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java
View File

@@ -17,7 +17,8 @@ public class ZipUtil {
if (CollectionUtils.isEmpty(imageUrls)) { if (CollectionUtils.isEmpty(imageUrls)) {
return null; 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)) { try (FileOutputStream fos = new FileOutputStream(zipFile); ZipOutputStream zos = new ZipOutputStream(fos)) {
for (int i = 0; i < imageUrls.size(); i++) { for (int i = 0; i < imageUrls.size(); i++) {
String imageUrl = imageUrls.get(i); String imageUrl = imageUrls.get(i);

1
jsowell-pile/src/main/java/com/jsowell/adapay/dto/SettleAccountDTO.java
View File

@@ -113,6 +113,7 @@ public class SettleAccountDTO {
private String adapayMemberId; private String adapayMemberId;
// 图片列表
private List<String> imgList; private List<String> imgList;
} }

7
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
View File

@@ -32,7 +32,6 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -52,7 +51,7 @@ public class AdapayMemberService {
@Autowired @Autowired
private IAdapayMemberAccountService adapayMemberAccountService; private IAdapayMemberAccountService adapayMemberAccountService;
public void createSettleAccount(SettleAccountDTO dto) throws Exception { public void createSettleAccount(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException {
String bankAcctType = dto.getBankAcctType(); String bankAcctType = dto.getBankAcctType();
if (StringUtils.equals(bankAcctType, Constants.ONE)) { if (StringUtils.equals(bankAcctType, Constants.ONE)) {
createCorpMember(dto); createCorpMember(dto);
@@ -68,7 +67,7 @@ public class AdapayMemberService {
* @throws Exception * @throws Exception
*/ */
@Transactional(readOnly = false, propagation = Propagation.REQUIRED) @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()); AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(dto.getMerchantId());
if (adapayMemberAccount != null) { if (adapayMemberAccount != null) {
log.error("通过merchantId:{}, 没有查询到结算账户配置", dto.getMerchantId()); 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<String, Object> memberParams = Maps.newHashMap(); Map<String, Object> memberParams = Maps.newHashMap();
String adapayMemberId = Constants.ADAPAY_CORP_MEMBER_PREFIX + IdUtils.getMemberId(); String adapayMemberId = Constants.ADAPAY_CORP_MEMBER_PREFIX + IdUtils.getMemberId();
memberParams.put("member_id", adapayMemberId); memberParams.put("member_id", adapayMemberId);

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
View File

@@ -67,9 +67,8 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
} }
/** /**
* 新增【请填写功能名称】 * 新增
* * @param adapayMemberAccount
* @param adapayMemberAccount 【请填写功能名称】
* @return 结果 * @return 结果
*/ */
@Override @Override