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

update 查询会员钱包信息

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-03-25 15:04:01 +08:00
parent 99c6a584a3
commit 9f5b032ce1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -343,8 +343,8 @@ public class PayController extends BaseController {
public void adapayCallback(HttpServletRequest request) { public void adapayCallback(HttpServletRequest request) {
try { try {
orderService.adapayCallback(request); orderService.adapayCallback(request);
String type = request.getParameter("type"); // String type = request.getParameter("type");
logger.info("1汇付回调type:{}", type); logger.info("1汇付回调type:{}", request.getParameter("type"));
} catch (Exception e) { } catch (Exception e) {
logger.error("1汇付支付回调失败 error", e); logger.error("1汇付支付回调失败 error", e);
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java
View File

@@ -97,7 +97,7 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
MemberWalletVO memberWalletVO = memberWalletInfoMapper.selectMemberWalletInfo(walletCode); MemberWalletVO memberWalletVO = memberWalletInfoMapper.selectMemberWalletInfo(walletCode);
// 累计消费金额 = 累计充值 + 累计赠送 - 本金余额 - 赠送金余额 // 累计消费金额 = 累计充值 + 累计赠送 - 本金余额 - 赠送金余额
BigDecimal accumulatedConsumptionAmount = memberWalletVO.getAccumulatedRechargeAmount() BigDecimal accumulatedConsumptionAmount = memberWalletVO.getAccumulatedRechargeAmount()
.add(memberWalletVO.getAccumulatedRechargeAmount()) .add(memberWalletVO.getAccumulatedRechargeGift())
.subtract(memberWalletVO.getPrincipalBalance()) .subtract(memberWalletVO.getPrincipalBalance())
.subtract(memberWalletVO.getGiftBalance()); .subtract(memberWalletVO.getGiftBalance());
memberWalletVO.setAccumulatedConsumptionAmount(accumulatedConsumptionAmount); memberWalletVO.setAccumulatedConsumptionAmount(accumulatedConsumptionAmount);