fix:转账最小余额改为50元
This commit is contained in:
1 parent
33c551e30f
commit
97ff8289e2
4 files changed
+13
-7
No files matched your search
+2
-1
@@ -22,7 +22,8 @@ public class HardAdminRefundDto {
|
||||
@Schema(description = "相关描述")
|
||||
private String applyDescription;
|
||||
|
||||
@Schema(description="补充凭证图片")
|
||||
@Schema(description = "补充凭证图片")
|
||||
@NotNull(message = "补充凭证图片不能为空")
|
||||
private String applyPicUrls;
|
||||
|
||||
}
|
||||
+2
-1
@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -39,7 +40,7 @@ public class HardSpuJoinServiceImpl extends ServiceImpl<HardSpuJoinMapper, HardS
|
||||
.isNotNull(ObjectUtil.isNotEmpty(dto.getIsSpu()) && dto.getIsSpu(), HardSpuJoinEntity::getSpuId)
|
||||
.orderByDesc(HardSpuJoinEntity::getSpuId)
|
||||
);
|
||||
if (ObjectUtil.isEmpty(list)) return List.of();
|
||||
if (ObjectUtil.isEmpty(list)) return new ArrayList<>();
|
||||
List<HardSpuJoinVo> joinList = BeanUtils.toBean(list, HardSpuJoinVo.class);
|
||||
List<Long> spuIds = joinList.stream().map(HardSpuJoinVo::getSpuId).toList();
|
||||
// 查询商品
|
||||
|
||||
+7
-3
@@ -120,7 +120,7 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
|
||||
for (int i = 1; i <= doorCount; i++) {
|
||||
HardSpuJoinDto spuJoinDto = new HardSpuJoinDto();
|
||||
spuJoinDto.setHardDoorNumber(i);
|
||||
spuJoinDto.setHardDoorId(hardId);
|
||||
spuJoinDto.setHardDoorId(doorManagerVo.getId());
|
||||
spuJoinDto.setCabinetNo(cabinetNo);
|
||||
List<HardSpuJoinVo> storeySpu = hardSpuJoinService.scopeList(spuJoinDto);
|
||||
int storeySpuSize = storeySpu.size();
|
||||
@@ -128,10 +128,14 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
|
||||
for (int j = 0; j < emptyStoreySpuSize; j++) {
|
||||
HardSpuJoinEntity hardSpuJoinEntity = new HardSpuJoinEntity();
|
||||
hardSpuJoinEntity.setCabinetNo(cabinetNo);
|
||||
hardSpuJoinEntity.setHardDoorId(hardId);
|
||||
hardSpuJoinEntity.setHardDoorId(doorManagerVo.getId());
|
||||
hardSpuJoinEntity.setHardDoorNumber(i);
|
||||
hardSpuJoinService.save(hardSpuJoinEntity);
|
||||
HardSpuJoinVo hardSpuJoinVo = BeanUtil.toBean(hardSpuJoinEntity, HardSpuJoinVo.class);
|
||||
HardSpuJoinVo hardSpuJoinVo = new HardSpuJoinVo();
|
||||
hardSpuJoinVo.setId(hardSpuJoinEntity.getId());
|
||||
hardSpuJoinVo.setCabinetNo(hardSpuJoinEntity.getCabinetNo());
|
||||
hardSpuJoinVo.setHardDoorId(hardSpuJoinEntity.getHardDoorId());
|
||||
hardSpuJoinVo.setHardDoorNumber(hardSpuJoinEntity.getHardDoorNumber());
|
||||
if (ObjectUtil.isNotEmpty(hardSpuJoinVo)) {
|
||||
storeySpu.add(hardSpuJoinVo);
|
||||
}
|
||||
|
||||
+2
-2
@@ -73,8 +73,8 @@ public class WalletRuleTransactionServiceImpl extends ServiceImpl<WalletRuleTran
|
||||
}
|
||||
// 查询源饭卡
|
||||
if (ObjectUtil.equals(userConfig.getSourceWalletUniqueCode(), WalletTypeEnum.EAT.getCode())) {
|
||||
if (price < 4000) {
|
||||
throw new RuntimeException(WalletTypeEnum.EAT.getDesc() + "余额必须留40元用于公午餐");
|
||||
if (price < 5000) {
|
||||
throw new RuntimeException(WalletTypeEnum.EAT.getDesc() + "余额必须留50元用于公午餐");
|
||||
}
|
||||
}
|
||||
// 是否已经超过最大限制
|
||||
|
||||
Reference in new issue
Block a user