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

Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2026-02-04 11:41:13 +08:00
parent fb619e4027 1a1b72a469
commit cf2a751688
18 changed files with 1862 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,15 +42,20 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService {
// 查询账户余额
BigDecimal acctBalance = BigDecimal.ZERO;
BigDecimal pendingAmount = BigDecimal.ZERO;
try {
AdapayAccountBalanceVO accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId());
if (accountBalanceVO != null && accountBalanceVO.getAcctBalance() != null) {
acctBalance = accountBalanceVO.getAcctBalance();
}
if (accountBalanceVO != null && accountBalanceVO.getPendingAmount() != null) {
pendingAmount = accountBalanceVO.getPendingAmount();
}
} catch (BaseAdaPayException e) {
log.error("查询汇付账户余额异常 merchantId:{}", dto.getMerchantId(), e);
}
result.getMerchantOrderReport().setAcctBalance(acctBalance);
result.getMerchantOrderReport().setPendingAmount(pendingAmount);
// 查询累计提现金额
BigDecimal totalWithdraw = BigDecimal.ZERO;

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -68,7 +69,6 @@ import com.jsowell.pile.vo.uniapp.business.BusinessOrderListVO;
import com.jsowell.pile.vo.uniapp.business.BusinessOrderQueryResultVO;
import com.jsowell.pile.vo.uniapp.customer.*;
import com.jsowell.pile.vo.web.*;
import com.jsowell.pile.vo.web.OrderStatisticsVO;
import com.jsowell.wxpay.common.WeChatPayParameter;
import com.jsowell.wxpay.response.WechatPayRefundRequest;
import com.jsowell.wxpay.response.WechatPayRefundResponse;
@@ -295,6 +295,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
}
dto.setStationDeptIds(authorizedMap.getStationDeptIds());
dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
if (Objects.nonNull(SecurityUtils.getLoginUser())) {
dto.setParams(ImmutableMap.of("roleId", SecurityUtils.getLoginUser().getUserId()));
}
return selectOrderBasicInfoList(dto);
}

1
jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java
View File

@@ -107,6 +107,7 @@ public class UserUtils {
if (Objects.isNull(loginUser)) {
return resultVO;
}
resultVO.setLoginUser(loginUser);
// 获取登录用户对应的user对象
SysUser user = loginUser.getUser();
if (Objects.isNull(user)) {

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.vo.base;
import com.jsowell.common.core.domain.model.LoginUser;
import lombok.Getter;
import lombok.Setter;
@@ -11,6 +12,10 @@ import java.util.List;
@Getter
@Setter
public class LoginUserDetailVO {
/**
* 登录用户
*/
LoginUser loginUser;
/**
* 有权限的一级运营商idList
* 平台级账号有多个一级运营商权限

3
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java
View File

@@ -52,4 +52,7 @@ public class OrderReportDetail {
*/
private BigDecimal totalWithdraw;
// 在途金额
private BigDecimal pendingAmount;
}