diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java index 63a6cf0a..cee2e191 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java @@ -1,19 +1,46 @@ package com.ghy.web.controller.order; +import com.ghy.common.core.controller.BaseController; +import com.ghy.order.domain.OrderTemplate; import com.ghy.order.service.OrderTemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; @Slf4j @Controller @RequestMapping("order/template") -public class OrderTemplateController { +public class OrderTemplateController extends BaseController { @Resource private OrderTemplateService orderTemplateService; + @PostMapping("insert") + public int insert(OrderTemplate orderTemplate) { + Long userId = getUserId(); + Assert.notNull(userId, "UserId is null !"); + orderTemplate.setUserId(userId); + return orderTemplateService.insert(orderTemplate); + } + @DeleteMapping("delete") + public int delete(Long id) { + return orderTemplateService.delete(id); + } + + @PutMapping("update") + public int update(OrderTemplate orderTemplate) { + return orderTemplateService.update(orderTemplate); + } + + @ResponseBody + @GetMapping("selectByUserId") + public List selectByUserId() { + Long userId = getUserId(); + return orderTemplateService.selectByUserId(userId); + } } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderTemplate.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderTemplate.java index 1cd42c0c..93546990 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderTemplate.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderTemplate.java @@ -1,7 +1,6 @@ package com.ghy.order.domain; import com.ghy.common.core.domain.BaseEntity; -import com.ghy.goods.domain.Goods; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java index bf878b0d..66f724a6 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java @@ -6,6 +6,7 @@ import com.ghy.order.mapper.OrderTemplateMapper; import com.ghy.order.service.OrderTemplateService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import javax.annotation.Resource;