update 2miner 专用网络和手续费问题修复

This commit is contained in:
yyb
2026-01-30 15:01:43 +08:00
parent 8be7e9794d
commit c1c2ccd0d8

View File

@@ -134,6 +134,11 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
return Result.fail("谷歌验证码错误"); return Result.fail("谷歌验证码错误");
} }
LeaseShop byId = getById(shopVo.getId());
if (byId.getDel()){
return Result.fail("修改失败,店铺已被删除");
}
LeaseShop leaseShop = LeaseShop.builder() LeaseShop leaseShop = LeaseShop.builder()
.id(shopVo.getId()) .id(shopVo.getId())
.userEmail(SecurityUtils.getUsername()) .userEmail(SecurityUtils.getUsername())
@@ -141,19 +146,14 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
.image(shopVo.getImage()) .image(shopVo.getImage())
.description(shopVo.getDescription()) .description(shopVo.getDescription())
.state(shopVo.getState()) .state(shopVo.getState())
.feeRate(shopVo.getFeeRate())
.authId(SecurityUtils.getUserId()) .authId(SecurityUtils.getUserId())
.feeRate(shopVo.getFeeRate())
.isOpen(shopVo.getIsOpen()) .isOpen(shopVo.getIsOpen())
.build(); .build();
LeaseShop byId = getById(shopVo.getId());
if (byId.getDel()){ if (byId.getIsOpen() != shopVo.getIsOpen()){
return Result.fail("修改失败,店铺已被删除");
}
if (shopVo.getIsOpen() != null && !byId.getIsOpen().equals(shopVo.getIsOpen())){
if (shopVo.getIsOpen()){ if (shopVo.getIsOpen()){
leaseShop.setFeeRate(leaseShop.getFeeRate().add(BigDecimal.valueOf(0.02))); leaseShop.setFeeRate(shopVo.getFeeRate().add(BigDecimal.valueOf(0.02)));
}else{
leaseShop.setFeeRate(leaseShop.getFeeRate().subtract(BigDecimal.valueOf(0.02)));
} }
} }
@@ -204,6 +204,7 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
.description(leaseShop.getDescription()) .description(leaseShop.getDescription())
.state(leaseShop.getState()) .state(leaseShop.getState())
.isOpen(leaseShop.getIsOpen()) .isOpen(leaseShop.getIsOpen())
.feeRate(leaseShop.getFeeRate())
.networkFee(BigDecimal.ZERO) .networkFee(BigDecimal.ZERO)
.del(leaseShop.getDel()) .del(leaseShop.getDel())
.build(); .build();