autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-23 04:25:21 +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
2025-08-18 11:13:42 +08:00
parent faa01235ac f25a6b9b5e
commit a4215e0839
16 changed files with 437 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.jsowell.pile.service;
import com.jsowell.pile.domain.MemberWalletLog;
import com.jsowell.pile.vo.MemberWalletLogVO2;
import java.util.List;
@@ -30,5 +31,7 @@ public interface MemberWalletLogService {
int batchInsert(List<MemberWalletLog> list);
List<MemberWalletLog> getOrderRecord(String orderCode, String type);
List<MemberWalletLogVO2> getByMemberId(String memberId);
}

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

@@ -36,10 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -612,9 +609,16 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
*/
@Override
public List<MemberWalletLogVO> getMemberWalletDetail(UniAppQueryMemberBalanceDTO dto) {
return memberWalletLogMapper.getMemberWalletDetail(dto);
List<MemberWalletLogVO> memberWalletDetail = memberWalletLogMapper.getMemberWalletDetail(dto);
for (MemberWalletLogVO log : memberWalletDetail) {
if ("2".equals(log.getType()) && "21".equals(log.getSubType())) {
log.setAmount(null);
}
}
return memberWalletDetail;
}
@Override
public List<MemberWalletLogVO> getMemberWalletDetailV2(UniAppQueryMemberBalanceDTO dto) {
return memberWalletLogMapper.getMemberWalletDetailV2(dto);

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java
View File

@@ -1,12 +1,21 @@
package com.jsowell.pile.service.impl;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.pile.domain.MemberWalletLog;
import com.jsowell.pile.dto.QueryMemberInfoDTO;
import com.jsowell.pile.mapper.MemberWalletLogMapper;
import com.jsowell.pile.service.MemberWalletLogService;
import com.jsowell.pile.vo.MemberWalletLogVO2;
import com.jsowell.pile.vo.uniapp.customer.MemberVO;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
public class MemberWalletLogServiceImpl implements MemberWalletLogService {
@@ -73,5 +82,11 @@ public class MemberWalletLogServiceImpl implements MemberWalletLogService {
public int batchInsert(List<MemberWalletLog> list) {
return memberWalletLogMapper.batchInsert(list);
}
@Override
public List<MemberWalletLogVO2> getByMemberId(String memberId) {
return memberWalletLogMapper.getByMemberId(memberId);
}
}

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

@@ -557,6 +557,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
resultVO.setDateDescription("结算时间 " + startSettleTime + " - " + endSettleTime);
resultList.add(resultVO);
}
// 前端总结算金额取sumActualReceivedAmount字段
resultList.forEach(resultVO -> {
resultVO.setSumActualReceivedAmount(YKCUtils.getMinBigDecimal(resultVO.getSumSettleAmount(), resultVO.getSumActualReceivedAmount()));
});
return resultList;
}