attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:2cfe1795046e8b71b9f042decbf369625d59a2ec
Branches Tags
attiya:main
..
compare: attiya:2e6608483b4328132d9133bee067cfffa0a9152f
Branches Tags
attiya:main

No commits in common. "2cfe1795046e8b71b9f042decbf369625d59a2ec" and "2e6608483b4328132d9133bee067cfffa0a9152f" have entirely different histories.
2cfe179504 ... 2e6608483b

2 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserOrders.java
View File

@ -113,7 +113,6 @@ public class EbikeUserOrders implements Serializable {
/** /**
* 更新时间 * 更新时间
*/ */
@Column(onUpdateValue = "now()")
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
/** /**

2
ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
View File

@ -164,7 +164,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
FeignEbikeRegionDto regionDto = regionResult.getData(); FeignEbikeRegionDto regionDto = regionResult.getData();
ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto = operateJsonResult.getData(); ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto = operateJsonResult.getData();
// costCalculation(feignEbikeSysRcostsetDto, resGpsDto, regionDto, userOrders); costCalculation(feignEbikeSysRcostsetDto, resGpsDto, regionDto, userOrders);
userOrdersMapper.update(userOrders); userOrdersMapper.update(userOrders);
//关锁,并且等待结果 //关锁,并且等待结果
CompletableFuture<String> stringCompletableFuture = ebikeCoreHandler.executeCommand(ecuInfo, CmdCode.LOCK, Long.valueOf(bikeInfoDto.getBikeId()), userId); CompletableFuture<String> stringCompletableFuture = ebikeCoreHandler.executeCommand(ecuInfo, CmdCode.LOCK, Long.valueOf(bikeInfoDto.getBikeId()), userId);