czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
牛叉闪闪
2024-08-29 16:52:23 +08:00
parent adb1c28bb8 e504c26978
commit 84e4a21064
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -810,7 +810,7 @@ public class PayService {
TbShopUserFlow userFlow = new TbShopUserFlow(); TbShopUserFlow userFlow = new TbShopUserFlow();
userFlow.setAmount((payAmount != null && discountAmount != null) ? payAmount : orderInfo.getOrderAmount()); userFlow.setAmount((payAmount != null && discountAmount != null) ? payAmount : orderInfo.getOrderAmount());
userFlow.setBalance(shopUser.getAmount()); userFlow.setBalance(shopUser.getAmount().subtract((payAmount != null && discountAmount != null) ? payAmount : orderInfo.getOrderAmount()));
userFlow.setShopUserId(shopUser.getId()); userFlow.setShopUserId(shopUser.getId());
userFlow.setBizCode("vipCardCash"); userFlow.setBizCode("vipCardCash");
userFlow.setBizName("余额支付"); userFlow.setBizName("余额支付");