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

update 加赠送金额字段

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-27 15:41:53 +08:00
parent f98d1ec959
commit 6facfba88b
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,13 +367,16 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
try { try {
BigDecimal totalAccountAmount = BigDecimal.ZERO; BigDecimal totalAccountAmount = BigDecimal.ZERO;
BigDecimal principalBalance = BigDecimal.ZERO; BigDecimal principalBalance = BigDecimal.ZERO;
BigDecimal giftBalance = BigDecimal.ZERO;
MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(memberId, merchantId); MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(memberId, merchantId);
if (memberWalletInfo != null) { if (memberWalletInfo != null) {
totalAccountAmount = memberWalletInfo.getPrincipalBalance(); totalAccountAmount = memberWalletInfo.getPrincipalBalance();
principalBalance = memberWalletInfo.getPrincipalBalance(); principalBalance = memberWalletInfo.getPrincipalBalance();
giftBalance = memberWalletInfo.getGiftBalance();
} }
vo.setTotalAccountAmount(totalAccountAmount); vo.setTotalAccountAmount(totalAccountAmount);
vo.setPrincipalBalance(principalBalance); vo.setPrincipalBalance(principalBalance);
vo.setGiftBalance(giftBalance);
} catch (Exception e) { } catch (Exception e) {
log.error("查询用户余额异常 memberId:{}, merchantId:{}", memberId, merchantId, e); log.error("查询用户余额异常 memberId:{}, merchantId:{}", memberId, merchantId, e);
} }

33
jsowell-ui/src/views/member/merchantVIP/index.vue
View File

@@ -62,9 +62,15 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="卡号" align="center" prop="walletCode" /> <el-table-column label="卡号" align="center" prop="walletCode" />
<el-table-column label="运营商" align="center" prop="merchantName" /> <el-table-column label="运营商" align="center" prop="merchantName" />
<!--<el-table-column label="" align="center" prop="id" />-->
<!-- <el-table-column label="运营商" align="center" prop="merchantName"/>-->
<el-table-column label="会员id" align="center" prop="memberId" /> <el-table-column label="会员id" align="center" prop="memberId" />
<el-table-column label="头像" align="center" prop="avatarUrl">
<template slot-scope="scope">
<!-- <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />-->
<el-image style="height: 50px;width: 50px"
:src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
:preview-src-list='[scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl]' />
</template>
</el-table-column>
<el-table-column label="昵称" align="center" prop="nickName"> <el-table-column label="昵称" align="center" prop="nickName">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/member/detail/index/' + scope.row.memberId" class="link-type"> <router-link :to="'/member/detail/index/' + scope.row.memberId" class="link-type">
@@ -72,27 +78,10 @@
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:options="dict.type.member_status"
:value="scope.row.status"
/>
</template>
</el-table-column>-->
<el-table-column label="头像" align="center" prop="avatarUrl">
<template slot-scope="scope">
<!-- <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />-->
<el-image style="height: 50px;width: 50px"
:src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
:preview-src-list='[scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl]' />
</template>
</el-table-column>
<el-table-column label="余额" align="center" prop="principalBalance" />
<el-table-column label="手机号" align="center" prop="mobileNumber" /> <el-table-column label="手机号" align="center" prop="mobileNumber" />
<!-- <el-table-column label="本金余额" align="center" prop="principalBalance"/>--> <el-table-column label="本金余额" align="center" prop="principalBalance"/>
<!-- <el-table-column label="赠送余额" align="center" prop="giftBalance" />--> <el-table-column label="赠送余额" align="center" prop="giftBalance" />
<el-table-column label="总余额" align="center" prop="totalAccountAmount" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">