mindol1004/spring-jwt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(customer-vue, order service): 장바구니 아이템 삭제기능 추가

Browse Source 
- 장바구니 아이템 삭제기능 추가
This commit is contained in:
hoon7566
2022-03-22 21:35:26 +09:00
parent 9c0a27af12
commit f6d439e75a
10 changed files with 150 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
customer-vue/src/api/order.js
View File

@@ -24,5 +24,8 @@ export default {
getOrder() {
return axios.get(process.env.VUE_APP_ORDER_API_URL + "/order/orders");
},
deleteOrderItem(orderItemId){
return axios.delete(process.env.VUE_APP_ORDER_API_URL + "/orderItem/"+orderItemId);
}
}

25
customer-vue/src/router/router.js
View File

@@ -64,12 +64,12 @@ const routes = [
name: 'notification',
component: () => import('../views/NotificationView')
},
{
path: "/item/:itemId",
beforeEnter: authCheck,
name: 'itemDetail',
component: () => import('../views/ItemDetail')
},
// {
// path: "/item/:itemId",
// beforeEnter: authCheck,
// name: 'itemDetail',
// component: () => import('../views/ItemDetail')
// },
{
path: "/order",
beforeEnter: authCheck,
@@ -103,6 +103,19 @@ const routes = [
},
]
},
{
path: '/item',
redirect: 'item',
component: StoreLayout,
children: [
{
path: "/item/:itemId",
beforeEnter: authCheck,
name: 'itemDetail',
component: () => import('../views/ItemDetail')
},
]
},
{
path: '/auth',
name: 'auth',

16
customer-vue/src/views/Layout/StoreLayout.vue
View File

@@ -8,17 +8,6 @@
<router-view
v-on:getStoreId="renderNavigation">
</router-view>
<div align="right" >
<v-btn
color="primary"
dark
right
fab
@click="toOrder"
>
<v-icon>mdi-basket</v-icon>
</v-btn>
</div>
</v-container>
</v-main>
<bottom-navigation></bottom-navigation>
@@ -56,11 +45,6 @@ export default {
const response = await storeApi.requestStore(this.store.id);
this.store = response.data.data;
},
toOrder(){
if(confirm("주문화면으로 이동할까요?")){
this.$router.push("/order")
}
}
}
}

27
customer-vue/src/views/OrderPage.vue
View File

@@ -40,7 +40,7 @@
</v-list-item>
<v-card-actions class="pb-2">
<v-btn block color="warning" @click="message('준비중입니다.')">삭제하기</v-btn>
<v-btn block color="warning" @click="deleteOrderItem(orderItem)">삭제하기</v-btn>
</v-card-actions>
</v-card>
@@ -98,7 +98,6 @@ export default {
getOrder: function(){
orderApi.getOrder()
.then(response=>{
console.log(response)
this.orderData=response.data.data
})
.catch(error=>{
@@ -107,9 +106,27 @@ export default {
console.log(error.response)
})
},
message: function(message){
alert(message)
}
deleteOrderItem: function(orderItem){
var vm = this
const deleteOrderItemId = orderItem.id
console.log(deleteOrderItemId)
orderApi.deleteOrderItem(deleteOrderItemId)
.then(response=>{
console.log(response)
alert(response.data.data+"삭제되었습니다.")
vm.orderData.orderPrice -=orderItem.price
vm.orderData.orderItemDtoList.splice(
vm.orderData.orderItemDtoList.indexOf(orderItem),1
)
if(vm.orderData.orderItemDtoList.length ==0)
this.$router.back()
})
.catch(error=>{
alert("문제가 발생하였습니다.")
console.log(error.response)
})
},
}
}
</script>

16
customer-vue/src/views/StoreView.vue
View File

@@ -54,6 +54,17 @@
<br>
</div>
</div>
<div align="right" >
<v-btn
color="primary"
dark
right
fab
@click="toOrder"
>
<v-icon>mdi-basket</v-icon>
</v-btn>
</div>
</div>
</template>
@@ -94,6 +105,11 @@ export default {
},
itemDetail: function (itemId) {
this.$router.push("/item/"+itemId)
},
toOrder(){
if(confirm("주문화면으로 이동할까요?")){
this.$router.push("/order")
}
}
}
}

14
order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java
View File

@@ -43,7 +43,7 @@ public class Order extends BaseEntity {
private Transaction transaction;
@BatchSize(size = 100)
@OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
@OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true)
private List<OrderItem> orderItems = new ArrayList<>();
public static Order of(Long userId, Long userCouponId, Long storeId, OrderItem orderItem) {
@@ -83,6 +83,13 @@ public class Order extends BaseEntity {
return this;
}
public Order deleteOrderItem(OrderItem orderItem) {
this.orderPrice -= orderItem.getTotalPrice();
this.orderItems.remove(orderItem);
return this;
}
public void setOrderStatus(OrderStatus orderStatus){
this.orderStatus = orderStatus;
}
@@ -105,4 +112,9 @@ public class Order extends BaseEntity {
public void fail() {
this.orderStatus = OrderStatus.FAILED;
}
public void changeOrderDate(LocalDateTime orderTime){
this.orderTime = orderTime;
}
}

2
order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepository.java
View File

@@ -7,5 +7,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface OrderRepository extends JpaRepository<Order, Long> {
Long countByUserIdAndOrderStatus(Long userId, OrderStatus orderStatus);
Optional<Order> findByUserIdAndOrderStatus(Long userId, OrderStatus orderStatus);
}

9
order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java
View File

@@ -175,12 +175,16 @@ public class OrderServiceImpl implements OrderService {
//HARD_CODE
Long userCouponId=0L;
Long countByUserIdAndOrderStatus = orderRepository.countByUserIdAndOrderStatus(userId, OrderStatus.PENDING);
if(countByUserIdAndOrderStatus>=2) throw new OrderException("장바구니 데이터는 2건 이상 일 수 없습니다.");
Optional<Order> optionalOrder = orderRepository.findByUserIdAndOrderStatus(userId, OrderStatus.PENDING);
if(optionalOrder.isPresent()){
if(!optionalOrder.get().addOrderItem(orderItem)
.getStoreId().equals(storeId))
throw new OrderException("장바구니에 여러 카페의 메뉴를 담을수 없습니다.");
}else{
orderRepository.save(Order.of(userId,userCouponId,storeId,orderItem));
}
}
@@ -189,6 +193,9 @@ public class OrderServiceImpl implements OrderService {
public FetchOrderDto fetchOrder(Long userId) {
Order order = orderRepositoryCustom.fetchOrderBasket(userId)
.orElseThrow(() -> new OrderException("장바구니 정보를 찾을 수 없습니다."));
GetStoreResponse store = storeClient.getStore(String.valueOf(order.getStoreId())).getData();
List<GetItemResponse> data = storeClient.getItemAndItemOptions(order.getOrderItems().stream()
@@ -253,8 +260,6 @@ public class OrderServiceImpl implements OrderService {
// 일주일 판매금액( 일별 )
List<DashBoardDto.SellAmountAWeek> sellAmountAWeeks = orderRepositoryCustom.salesAmountBetweenAWeek(storeId);
log.info("asdad");
return DashBoardDto.of(orderPrices , bestSellItem, sellAmountAWeeks);
}
}

41
order-service/src/main/java/com/justpickup/orderservice/domain/orderItem/service/OrderItemService.java Normal file
View File

@@ -0,0 +1,41 @@
package com.justpickup.orderservice.domain.orderItem.service;
import com.justpickup.orderservice.domain.order.entity.Order;
import com.justpickup.orderservice.domain.order.entity.OrderStatus;
import com.justpickup.orderservice.domain.order.exception.OrderException;
import com.justpickup.orderservice.domain.order.repository.OrderRepository;
import com.justpickup.orderservice.domain.order.repository.OrderRepositoryCustom;
import com.justpickup.orderservice.domain.orderItem.entity.OrderItem;
import com.justpickup.orderservice.domain.orderItem.repository.OrderItemRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class OrderItemService {
private final OrderItemRepository orderItemRepository;
private final OrderRepository orderRepository;
private final OrderRepositoryCustom orderRepositoryCustom;
@Transactional
public void deleteOrderItem(Long deleteOrderItemId, Long userId){
Order order = orderRepositoryCustom.fetchOrderBasket(userId)
.orElseThrow(() -> new OrderException("존재하지 않는 장바구니 아이템입니다."));
OrderItem orderItem = orderItemRepository.findById(deleteOrderItemId)
.orElseThrow(() -> new OrderException("존재하지 않는 장바구니 아이템입니다."));
order.deleteOrderItem(orderItem);
if(order.getOrderItems().size() ==0)
orderRepository.delete(order);
}
}

27
order-service/src/main/java/com/justpickup/orderservice/domain/orderItem/web/OrderItemCustomerApiController.java Normal file
View File

@@ -0,0 +1,27 @@
package com.justpickup.orderservice.domain.orderItem.web;
import com.justpickup.orderservice.domain.orderItem.service.OrderItemService;
import com.justpickup.orderservice.global.dto.Result;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/customer/orderItem")
public class OrderItemCustomerApiController {
private final OrderItemService orderItemService;
@DeleteMapping("/{orderItemId}")
public ResponseEntity deleteOrderItem(@PathVariable Long orderItemId,
@RequestHeader(value = "user-id") String userId){
orderItemService.deleteOrderItem(orderItemId,Long.parseLong(userId));
return ResponseEntity.status(HttpStatus.OK).body(Result.createSuccessResult(orderItemId));
}
}