Skip to content
Extraits de code Groupes Projets
Valider 4899ea0b rédigé par Mohamed Lemine BAILLAHI's avatar Mohamed Lemine BAILLAHI
Parcourir les fichiers

Merge branch 'fix/MS-99' into 'develop'

fix delete after restore order

Closes MS-99

See merge request !124
parents 403d7ad2 7ed6183f
Branches
1 requête de fusion!124fix delete after restore order
Pipeline #16571 en échec avec les étapes
in 41 secondes
## [1.0.78-RELEASE]
### Added
- New features that have been added.
### Changed
- Changes in existing functionality.
### Deprecated
- Soon-to-be removed features.
### Removed
- Features that have been removed.
### Fixed
- fix delete after restore order
### Security
- Any security improvements.
## [1.0.77-RELEASE] ## [1.0.77-RELEASE]
### Added ### Added
- New features that have been added. - New features that have been added.
......
...@@ -22,4 +22,8 @@ public interface SessionOrderRepository extends JpaRepository<SessionOrder,Long> ...@@ -22,4 +22,8 @@ public interface SessionOrderRepository extends JpaRepository<SessionOrder,Long>
@Param("expirationDate") LocalDateTime expirationDate); @Param("expirationDate") LocalDateTime expirationDate);
List<SessionOrder> findAll(); List<SessionOrder> findAll();
SessionOrder findSessionOrderByItemCart_Id(Long id); SessionOrder findSessionOrderByItemCart_Id(Long id);
@Modifying
@Query("DELETE SessionOrder s WHERE s.id = :id")
void deleteSessionOrderByOrderId(Long id);
} }
...@@ -423,18 +423,14 @@ public class SaleSessionServiceImp implements SaleSessionService { ...@@ -423,18 +423,14 @@ public class SaleSessionServiceImp implements SaleSessionService {
itemRequestDTO.setUgs(sessionOrder.getItemCart().getUgs()); itemRequestDTO.setUgs(sessionOrder.getItemCart().getUgs());
itemRequestDTO.setUseWebStockForLive(true); itemRequestDTO.setUseWebStockForLive(true);
if (sessionOrder.getItemCart().getProductType() != null && sessionOrder.getItemCart().getProductType().equals(ProductType.GIFT_CARD)) { if (sessionOrder.getItemCart().getProductType() != null && sessionOrder.getItemCart().getProductType().equals(ProductType.GIFT_CARD)) {
itemRequestDTO.setGiftCardDTO(externalApiService.getGiftCardById(sessionOrder.getItemCart().getProductId())); itemRequestDTO.setGiftCardDTO(externalApiService.getGiftCardById(sessionOrder.getItemCart().getProductId()));
itemRequestDTO.setUseWebStockForLive(false); itemRequestDTO.setUseWebStockForLive(false);
} }
itemRequestDTO.setLiveId(sessionOrder.getSaleSession().getLive()); itemRequestDTO.setLiveId(sessionOrder.getSaleSession().getLive());
CompletableFuture<SessionOrderDTO> sessionOrderDTO = (sessionOrder.isRegisteredClient()) ? addProductToCartFromLive(itemRequestDTO) : addProductToUnregisteredCartFromLive(itemRequestDTO); CompletableFuture<SessionOrderDTO> sessionOrderDTO = (sessionOrder.isRegisteredClient()) ? addProductToCartFromLive(itemRequestDTO) : addProductToUnregisteredCartFromLive(itemRequestDTO);
orderRepository.deleteById(orderId); sessionOrderRepository.deleteSessionOrderByOrderId(orderId);
return sessionOrderDTO; return sessionOrderDTO;
} }
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter