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

update添加在途金额字段

Browse Source
This commit is contained in:
Guoqs
2025-10-15 15:59:40 +08:00
parent b7c3e35144
commit 8fa310acf8
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -25,6 +25,7 @@ import com.jsowell.adapay.factory.AdapayConfigFactory;
import com.jsowell.adapay.operation.PaymentReverseOperation; import com.jsowell.adapay.operation.PaymentReverseOperation;
import com.jsowell.adapay.response.*; import com.jsowell.adapay.response.*;
import com.jsowell.adapay.service.AdapayService; import com.jsowell.adapay.service.AdapayService;
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
import com.jsowell.adapay.vo.AdapayCorpMemberVO; import com.jsowell.adapay.vo.AdapayCorpMemberVO;
import com.jsowell.adapay.vo.DrawCashDetailVO; import com.jsowell.adapay.vo.DrawCashDetailVO;
import com.jsowell.adapay.vo.PaymentInfo; import com.jsowell.adapay.vo.PaymentInfo;
@@ -121,7 +122,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ActiveProfiles("dev") @ActiveProfiles("pre")
@SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
public class SpringBootTestController { public class SpringBootTestController {
@@ -309,6 +310,12 @@ public class SpringBootTestController {
private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(10, JsowellThreadFactory.forName("test-thread-factory")); private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(10, JsowellThreadFactory.forName("test-thread-factory"));
@Test
public void queryAdapayAccountBalanceTest() throws BaseAdaPayException {
AdapayAccountBalanceVO adapayAccountBalanceVO = adapayService.queryAdapayAccountBalance("459");
System.out.println(adapayAccountBalanceVO);
}
@Test @Test
public void testBatteryReport() throws InterruptedException { public void testBatteryReport() throws InterruptedException {
String orderCode = "C25787997784"; String orderCode = "C25787997784";

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

@@ -684,6 +684,7 @@ public class AdapayService {
// 在途金额 // 在途金额
BigDecimal pendingAmount = BigDecimal.ZERO; BigDecimal pendingAmount = BigDecimal.ZERO;
List<WithdrawInfoVO> withdrawInfoVOS = clearingWithdrawInfoService.selectByMerchantId(merchantId); List<WithdrawInfoVO> withdrawInfoVOS = clearingWithdrawInfoService.selectByMerchantId(merchantId);
log.info("==查询提现在途金额param:{}, result:{}", JSON.toJSONString(withdrawInfoVOS), JSON.toJSONString(pendingAmount));
if (CollectionUtils.isNotEmpty(withdrawInfoVOS)) { if (CollectionUtils.isNotEmpty(withdrawInfoVOS)) {
pendingAmount = withdrawInfoVOS.stream() pendingAmount = withdrawInfoVOS.stream()
.filter(item -> "pending".equals(item.getStatusDesc())) .filter(item -> "pending".equals(item.getStatusDesc()))