autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-19 18:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

提现手续费改为参数传入

Browse Source
This commit is contained in:
Guoqs
2025-02-13 11:49:52 +08:00
parent cbff91cada
commit cd3aced52f
5 changed files with 32 additions and 7 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

@@ -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) {

2
jsowell-common/src/main/java/com/jsowell/common/core/domain/parking/ParkingCommonParam.java
View File

@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.Map;
/**
* 停车场公告参数
* 停车场公共参数
*/
@Data
public class ParkingCommonParam {

3
jsowell-pile/src/main/java/com/jsowell/adapay/dto/WithdrawDTO.java
View File

@@ -14,6 +14,9 @@ public class WithdrawDTO {
// 提现金额
private String cashAmt;
// 手续费
private String feeAmt;
// 微信小程序appId
private String wechatAppId;
}

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

@@ -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);

28
jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
View File

@@ -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);
}
}
}