diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java index d7aa177..c13f99b 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java @@ -105,6 +105,10 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl list = new ArrayList<>(); - //TODO:优化封装 - for (int i = 1; i < 4; i++) { - if (i != 2) { - if (i == 1 && !ecuInfo.getBindBattery()) { - EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder() - .operatorId(operatorId) - .inventoryType(i) - .inventoryNum(-1) - .build(); - EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder() - .operatorId(inventoryVo.getOperatorId()) - .inventoryType(inventoryVo.getInventoryType()) - .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum())) - .createdBy(StpUtil.getLoginIdAsLong()) - .build(); - list.add(inventoryRecord); - inventoryService.reduceInventory(inventoryVo); - } else if (i == 3) { - EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder() - .operatorId(operatorId) - .inventoryType(i) - .inventoryNum(-1) - .build(); - EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder() - .operatorId(inventoryVo.getOperatorId()) - .inventoryType(inventoryVo.getInventoryType()) - .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum())) - .createdBy(StpUtil.getLoginIdAsLong()) - .build(); - list.add(inventoryRecord); - inventoryService.reduceInventory(inventoryVo); - } - } else if (bindVo.getHasHelme()) { - EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder() - .operatorId(operatorId) - .inventoryType(i) - .inventoryNum(-1) - .build(); - EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder() - .operatorId(inventoryVo.getOperatorId()) - .inventoryType(inventoryVo.getInventoryType()) - .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum())) - .createdBy(StpUtil.getLoginIdAsLong()) - .build(); - list.add(inventoryRecord); - inventoryService.reduceInventory(inventoryVo); - } + if (!ecuInfo.getBindBattery()){ + EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder() + .operatorId(operatorId) + .inventoryType(1) + .inventoryNum(-1) + .build(); + EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder() + .operatorId(inventoryVo.getOperatorId()) + .inventoryType(inventoryVo.getInventoryType()) + .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum())) + .createdBy(StpUtil.getLoginIdAsLong()) + .build(); + list.add(inventoryRecord); + inventoryService.reduceInventory(inventoryVo); + }else { + ecuInfo.setIsClaim(Boolean.TRUE); + ebikeEcuInfoService.updateById(ecuInfo); } + + if (bindVo.getHasHelme()){ + EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder() + .operatorId(operatorId) + .inventoryType(2) + .inventoryNum(-1) + .build(); + EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder() + .operatorId(inventoryVo.getOperatorId()) + .inventoryType(inventoryVo.getInventoryType()) + .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum())) + .createdBy(StpUtil.getLoginIdAsLong()) + .build(); + list.add(inventoryRecord); + inventoryService.reduceInventory(inventoryVo); + } + + EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder() + .operatorId(operatorId) + .inventoryType(3) + .inventoryNum(-1) + .build(); + EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder() + .operatorId(inventoryVo.getOperatorId()) + .inventoryType(inventoryVo.getInventoryType()) + .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum())) + .createdBy(StpUtil.getLoginIdAsLong()) + .build(); + list.add(inventoryRecord); + inventoryService.reduceInventory(inventoryVo); + recordService.saveBatch(list); //录入最终数据