commit commit

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -33,6 +33,7 @@ import static org.springframework.data.domain.Sort.Order.desc;
 public class OrderController extends Controller {
     private final TbCfOrderRepository repository;
     private final TbCfCartRecordRRepository cartRepository;
+    private final TbCfAddressRepository addressRepository;
     private final TbCfToicouponRepository toicouponRepository;
     private final TbCfStationItemRepository itemRepository;
     private final TbCfItemCommentRepository commentRepository;
@@ -40,9 +41,10 @@ public class OrderController extends Controller {
     private final TbCfExchangeRepository exchangeRepository;
     private final AuthenticationUser user;
 
-    public OrderController(TbCfOrderRepository repository, TbCfCartRecordRRepository cartRepository, TbCfToicouponRepository toicouponRepository, TbCfStationItemRepository itemRepository, TbCfItemCommentRepository commentRepository, TbCfExpressTemplateRepository templateRepository, @Qualifier("tbCfExchangeRepository") TbCfExchangeRepository exchangeRepository, AuthenticationUser user) {
+    public OrderController(TbCfOrderRepository repository, TbCfCartRecordRRepository cartRepository, TbCfAddressRepository addressRepository, TbCfToicouponRepository toicouponRepository, TbCfStationItemRepository itemRepository, TbCfItemCommentRepository commentRepository, TbCfExpressTemplateRepository templateRepository, @Qualifier("tbCfExchangeRepository") TbCfExchangeRepository exchangeRepository, AuthenticationUser user) {
         this.repository = repository;
         this.cartRepository = cartRepository;
+        this.addressRepository = addressRepository;
         this.toicouponRepository = toicouponRepository;
         this.itemRepository = itemRepository;
         this.commentRepository = commentRepository;
@@ -204,6 +206,10 @@ public class OrderController extends Controller {
 
         if (addressId == null || addressId.isEmpty()) return new Result<>(v_code, "Address id is required");
 
+        Optional<TbCfAddress> addressOptional = addressRepository.findById(addressId);
+
+        if (!addressOptional.isPresent()) return new Result<>(v_code, "Address id is required");
+
 
         if (allByUserId.isEmpty()) {
             return new Result<>(v_code, "There are no items in the shopping cart");
@@ -214,6 +220,13 @@ public class OrderController extends Controller {
 
         order.setUserName(user.display());
 
+        TbCfAddress address = addressOptional.get();
+
+
+        order.setDeliveryAddressId(addressId);
+        order.setDeliveryAddress(address.getAddressDetail());
+        order.setDeliveryName(address.getDeliveryName());
+        order.setDeliveryPhone(address.getPhone());
 
         Optional<TbCfExpressTemplate> templateOptional = templateRepository.findFirstByIsDefault(1);
         templateOptional.ifPresent(order::setDefaultTemplate);