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 9ec4eae0d..556572d5a 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 @@ -189,6 +189,7 @@ public class AdapayMemberController extends BaseController { public AjaxResult drawCash(@RequestBody WithdrawDTO dto) { AjaxResult result; try { + dto.setFeeAmt("5"); adapayService.drawCash(dto); result = AjaxResult.success(); } catch (BusinessException e) { diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/parking/ParkingCommonParam.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/parking/ParkingCommonParam.java index 27c730204..351045a2c 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/parking/ParkingCommonParam.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/parking/ParkingCommonParam.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; /** - * 停车场公告参数 + * 停车场公共参数 */ @Data public class ParkingCommonParam { diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/dto/WithdrawDTO.java b/jsowell-pile/src/main/java/com/jsowell/adapay/dto/WithdrawDTO.java index bd71164d0..4cfc94244 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/dto/WithdrawDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/dto/WithdrawDTO.java @@ -14,6 +14,9 @@ public class WithdrawDTO { // 提现金额 private String cashAmt; + // 手续费 + private String feeAmt; + // 微信小程序appId private String wechatAppId; } 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 60b345106..6a7da9900 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 @@ -811,8 +811,9 @@ public class AdapayService { throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_MEMBER_IS_NULL_ERROR); } - // 提现手续费 每笔固定5元 - BigDecimal feeAmt = new BigDecimal("5"); + // 提现手续费 每笔固定5元 2025年2月13日11点47分手续费改为参数传入 + // BigDecimal feeAmt = new BigDecimal("5"); + BigDecimal feeAmt = new BigDecimal(dto.getFeeAmt()); // 实际提现到账金额 BigDecimal cashAmt = adapayAccountBalanceVO.getAvlBalance().subtract(feeAmt); diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index f9925c124..c26833dbb 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -1,6 +1,8 @@ package com.jsowell.quartz.task; -import com.google.common.collect.Lists; +import com.huifu.adapay.core.exception.BaseAdaPayException; +import com.jsowell.adapay.dto.WithdrawDTO; +import com.jsowell.adapay.service.AdapayService; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.redis.RedisCache; @@ -16,14 +18,11 @@ import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.thirdparty.amap.service.AMapService; -import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService; import com.jsowell.thirdparty.platform.service.impl.GuiZhouPlatformServiceImpl; -import com.jsowell.thirdparty.service.ThirdpartySecretInfoService; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; import java.math.BigDecimal; @@ -60,6 +59,9 @@ public class JsowellTask { @Autowired private AMapService aMapService; + @Autowired + private AdapayService adapayService; + @Autowired private SettleOrderReportService settleOrderReportService; @@ -220,5 +222,23 @@ public class JsowellTask { log.error("处理订单分账异常, merchantId:{}", merchant.getId(), e); } }); + + + // TODO 换为实时分账后, 此方法改为 自动提现并计算前一天的分账信息 } + + /** + * 自动提现并计算前一天的分账信息 + * automaticPayouts + */ + private void automaticPayouts(String merchantId) { + WithdrawDTO dto = new WithdrawDTO(); + dto.setMerchantId(merchantId); + dto.setFeeAmt("0"); + try { + adapayService.drawCash(dto); + } catch (BaseAdaPayException e) { + throw new RuntimeException(e); + } + } }