Merge remote-tracking branch 'origin/main'

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

@@ -30,6 +30,7 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -150,6 +151,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
         long minutes = TimeUtils.betweenMinutes(userOrders.getStartTime(), LocalDateTime.now());
         //TODO:时间校验：根据规则做时间校验、判断收费多少.需要支付则为待支付状态、不需要则为取消状态
         userOrders.setStatus(OrderStatus.PENDING_PAYMENT);
+        userOrders.setTotalAmount(BigDecimal.ZERO);
         userOrdersMapper.update(userOrders);
         //关锁,并且等待结果
         CompletableFuture<String> stringCompletableFuture = ebikeCoreHandler.executeCommand(ecuInfo, CmdCode.LOCK, Long.valueOf(bikeInfoDto.getBikeId()), userId);