Merge remote-tracking branch 'origin/main'

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

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

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

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