autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-30 08:00:00 +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 
# Conflicts:
#	jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java
This commit is contained in:
Lemon
2025-11-20 11:05:45 +08:00
parent 3a0ba80c5c 59d6e69a26
commit a025b1bdd3
24 changed files with 2472 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayUnsplitRecordService.java
View File

@@ -1,6 +1,8 @@
package com.jsowell.pile.service;
import com.jsowell.pile.domain.AdapayUnsplitRecord;
import com.jsowell.pile.vo.AdapayUnsplitRecordVO;
import java.util.List;
public interface AdapayUnsplitRecordService{
@@ -27,4 +29,6 @@ public interface AdapayUnsplitRecordService{
int batchInsert(List<AdapayUnsplitRecord> list);
List<AdapayUnsplitRecord> queryUnsplitOrders(String startTime, String endTime);
List<AdapayUnsplitRecordVO> queryList();
}

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

@@ -43,4 +43,5 @@ public interface ClearingWithdrawInfoService{
PageResponse queryWithdrawList(QueryWithdrawListDTO dto) throws BaseAdaPayException;
BigDecimal queryTotalWithdraw(String merchantId);
}

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java
View File

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.jsowell.adapay.dto.QueryWithdrawListDTO;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.util.DateUtils;
@@ -13,11 +12,9 @@ import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.ClearingWithdrawInfo;
import com.jsowell.pile.mapper.ClearingWithdrawInfoMapper;
import com.jsowell.pile.service.ClearingWithdrawInfoService;
import com.jsowell.pile.service.PileMerchantInfoService;
import com.jsowell.pile.vo.web.ClearingBillVO;
import com.jsowell.pile.vo.web.WithdrawInfoVO;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -642,11 +642,26 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
List<String> merchantIdList = merchantInfoVOList.stream()
.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
List<String> queryMerchantIds;
// 权限校验一下
if (StringUtils.isNotBlank(dto.getMerchantId())) {
if (!merchantIdList.contains(dto.getMerchantId())) {
throw new BusinessException("403", "没有权限查询该运营商数据");
}
// 只查当前筛选的运营商
queryMerchantIds = Collections.singletonList(dto.getMerchantId());
} else {
// 查全部权限内的运营商
queryMerchantIds = merchantIdList;
}
// 分页
int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
PageHelper.startPage(pageNum, pageSize);
List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto);
List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(queryMerchantIds, dto);
if (CollectionUtils.isNotEmpty(resultList)) {
for (MerchantVipVO merchantVipVO : resultList) {
BigDecimal principalBalance = merchantVipVO.getPrincipalBalance() == null ? BigDecimal.ZERO : merchantVipVO.getPrincipalBalance();