diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index f8c27553f..c43ee2301 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -13,7 +13,6 @@ import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.model.Refund; import com.jsowell.JsowellApplication; import com.jsowell.adapay.service.AdapayMemberService; -import com.jsowell.adapay.vo.AdapayCorpMemberVO; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.entity.SysDictData; @@ -74,6 +73,7 @@ import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @ActiveProfiles("dev") @SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @@ -91,6 +91,9 @@ public class SpringBootTestController { @Autowired private YKCPushCommandService ykcPushCommandService; + @Autowired + private IAdapayMemberAccountService adapayMemberAccountService; + @Autowired private IPileMsgRecordService pileMsgRecordService; @@ -527,15 +530,23 @@ public class SpringBootTestController { @Test public void testQueryCorpMember() { - try { - // Map map = adapayMemberService.selectAdapayMember("5"); - - String adapayMemberId = "ACM29562569"; - AdapayCorpMemberVO adapayCorpMemberVO = adapayMemberService.queryCorpAdapayMemberInfo(adapayMemberId); - System.out.println(adapayCorpMemberVO); - } catch (BaseAdaPayException e) { - throw new RuntimeException(e); + List accountList = adapayMemberAccountService.selectAdapayMemberAccountList(new AdapayMemberAccount()); + if (CollectionUtils.isNotEmpty(accountList)) { + Long[] ids = accountList.stream().map(AdapayMemberAccount::getId).collect(Collectors.toList()).toArray(new Long[]{}); + adapayMemberAccountService.deleteAdapayMemberAccountByIds(ids); } + + // try { + // Map map = adapayMemberService.selectAdapayMember("5"); + // + // String adapayMemberId = "ACM29562569"; + // AdapayCorpMemberVO adapayCorpMemberVO = adapayMemberService.queryCorpAdapayMemberInfo(adapayMemberId); + // System.out.println(adapayCorpMemberVO); + // + // + // } catch (BaseAdaPayException e) { + // throw new RuntimeException(e); + // } } @Test 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 cccb8b08c..97920ae4b 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 @@ -36,6 +36,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Service @@ -413,7 +414,10 @@ public class AdapayMemberService { // 逻辑删除原来审核不通过的记录 List accountList = adapayMemberAccountService.selectAdapayMemberAccountList(dto.getMerchantId()); if (CollectionUtils.isNotEmpty(accountList)) { - Long[] ids = (Long[]) accountList.stream().map(AdapayMemberAccount::getId).toArray(); + Long[] ids = accountList.stream() + .map(AdapayMemberAccount::getId) + .collect(Collectors.toList()) + .toArray(new Long[]{}); adapayMemberAccountService.deleteAdapayMemberAccountByIds(ids); }