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

update 会员钱包明细

Browse Source
This commit is contained in:
Lemon
2023-07-22 15:23:31 +08:00
parent 42f2b18b99
commit a17412968c
11 changed files with 175 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-pile/src/main/java/com/jsowell/pile/dto/UniAppQueryMemberBalanceDTO.java
View File

@@ -22,6 +22,16 @@ public class UniAppQueryMemberBalanceDTO extends BaseMemberDTO{
*/
private String type;
/**
* 交易时间(如：2023-07),只到月份，查询当月数据
*/
private String tradeDate;
/**
* 结束时间
*/
private String endDate;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)

8
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.MemberWalletLog;
import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -30,4 +31,11 @@ public interface MemberWalletLogMapper {
* @param type 1-进账；2-出账 不传查全部
*/
List<MemberWalletLogVO> getMemberBalanceChanges(@Param("memberId") String memberId, @Param("type") String type);
/**
* 小程序查询会员余额明细
* @param dto
* @return
*/
List<MemberWalletLogVO> getMemberWalletDetail(@Param("dto") UniAppQueryMemberBalanceDTO dto);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.pile.service;
import com.jsowell.pile.domain.MemberBasicInfo;
import com.jsowell.pile.dto.PlatformTesterDTO;
import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
@@ -121,4 +122,10 @@ public interface IMemberBasicInfoService {
void updatePlatformTester(PlatformTesterDTO dto);
PlatformTesterVO selectPlatformTesterStatus(String memberId);
/**
* 小程序查询会员钱包明细
* @return
*/
List<MemberWalletLogVO> getMemberWalletDetail(UniAppQueryMemberBalanceDTO dto);
}

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

@@ -11,6 +11,7 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.MemberWalletInfo;
import com.jsowell.pile.domain.MemberWalletLog;
import com.jsowell.pile.dto.PlatformTesterDTO;
import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
import com.jsowell.pile.mapper.MemberBasicInfoMapper;
import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper;
import com.jsowell.pile.mapper.MemberWalletInfoMapper;
@@ -320,5 +321,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
return vo;
}
/**
* 小程序查询会员钱包明细
* @param dto
* @return
*/
@Override
public List<MemberWalletLogVO> getMemberWalletDetail(UniAppQueryMemberBalanceDTO dto) {
return memberWalletLogMapper.getMemberWalletDetail(dto);
}
}

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

@@ -613,8 +613,8 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
}
log.info("后管首页基本信息查询 authorizedMap:{}, dto:{}", JSONObject.toJSONString(authorizedMap), JSONObject.toJSONString(dto));
dto.setStationIdList(stationIdList);
// IndexGeneralSituationVO generalSituation = pileBasicInfoMapper.getGeneralSituation(dto);
IndexGeneralSituationVO generalInfo = pileBasicInfoMapper.getGeneralSituationInfo(dto);
IndexGeneralSituationVO generalInfo = pileBasicInfoMapper.getGeneralSituation(dto);
// IndexGeneralSituationVO generalInfo = pileBasicInfoMapper.getGeneralSituationInfo(dto);
List<PileInfoVO> pileInfoVOS = queryPileDetailList(stationIdList);
// 对集合根据pileSn进行去重

20
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletLogVO.java
View File

@@ -44,4 +44,24 @@ public class MemberWalletLogVO {
* 余额类型（1-本金，2-赠送）
*/
private String category;
/**
* 关联订单
*/
private String relatedOrderCode;
/**
* 支付金额
*/
private BigDecimal payAmount;
/**
* 订单金额
*/
private BigDecimal orderAmount;
/**
* 退款金额
*/
private BigDecimal refundAmount;
}