czg_team/cashier-admin-java
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:
SongZhang
2024-09-03 10:42:09 +08:00
parent 1b9b088e43 6e31bb6251
commit d63861ac13
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
View File

@@ -327,11 +327,6 @@ public class TbPayServiceImpl implements TbPayService {
}
private final TbMShopUserMapper shopUserMapper;
private final TbShopUserFlowMapper shopUserFlowMapper;
@Override
public TbOrderInfo vipPay(@NotNull Integer shopId, @NotNull Integer orderId, Double discount, Integer vipUserId) {
@@ -386,6 +381,11 @@ public class TbPayServiceImpl implements TbPayService {
return orderInfo;
}
private final TbMShopUserMapper shopUserMapper;
private final TbShopUserFlowMapper shopUserFlowMapper;
@Override
public TbOrderInfo cashPay(PayDTO payDTO) {
TbOrderInfo orderInfo = orderInfoMapper.selectOne(new LambdaUpdateWrapper<TbOrderInfo>()