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

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
SongZhang
2024-10-29 15:11:00 +08:00
parent b94760f6f5 04fab9ef26
commit d978abc2e1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,8 +438,8 @@ public class TbPayServiceImpl implements TbPayService {
orderInfo.setPayAmount(payMount); orderInfo.setPayAmount(payMount);
orderInfo.setUserId(user.getId().toString()); orderInfo.setUserId(user.getUserId());
orderInfo.setMemberId(memberId); orderInfo.setMemberId(user.getId().toString());
orderInfo.setPayType("deposit"); orderInfo.setPayType("deposit");
orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo())); orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
return orderInfo; return orderInfo;

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -572,7 +572,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
public void depositReturn(Integer userId, Integer shopId, BigDecimal returnAmount) { public void depositReturn(Integer userId, Integer shopId, BigDecimal returnAmount) {
TbShopUser user = tbMShopUserMapper.selectOne(new LambdaQueryWrapper<TbShopUser>() TbShopUser user = tbMShopUserMapper.selectOne(new LambdaQueryWrapper<TbShopUser>()
.eq(TbShopUser::getShopId, shopId) .eq(TbShopUser::getShopId, shopId)
.eq(TbShopUser::getId, userId)); .eq(TbShopUser::getUserId, userId));
if (user == null) { if (user == null) {
throw new BadRequestException("用户信息不存在"); throw new BadRequestException("用户信息不存在");
} }