From de3d6698921b7ee489a4c1182d6026cc10028a02 Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Sat, 17 Aug 2019 10:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/order/repository/CustomerOrderRepository.java  | 10 ++++++++++
 .../wms/order/rest/CustomerOrderController.java        |  4 ++--
 .../order/service/impl/CustomerOrderServiceImpl.java   |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java
index 477ac6bd..2fa02889 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderRepository.java
@@ -3,10 +3,20 @@ package me.zhengjie.modules.wms.order.repository;
 import me.zhengjie.modules.wms.order.domain.CustomerOrder;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 /**
 * @author jie
 * @date 2019-08-03
 */
 public interface CustomerOrderRepository extends JpaRepository<CustomerOrder, Long>, JpaSpecificationExecutor {
+
+    /**
+     * 删除仓库(逻辑删除)
+     * @param id
+     */
+    @Modifying
+    @Query(value = "update s_customer_order set status = 0 where id = ?1",nativeQuery = true)
+    void deleteCustomerOrder(long id);
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java
index 59562f58..b4976d2e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/rest/CustomerOrderController.java
@@ -37,7 +37,7 @@ public class CustomerOrderController {
     @ApiOperation(value = "新增客户订单")
     @PostMapping(value = "/customerOrder")
     @PreAuthorize("hasAnyRole('ADMIN','SCUSTOMERORDER_ALL','SCUSTOMERORDER_CREATE')")
-    public ResponseEntity create(@Validated @RequestBody CustomerOrder resources){
+    public ResponseEntity create(@RequestBody CustomerOrder resources){
         return new ResponseEntity(customerOrderService.create(resources),HttpStatus.CREATED);
     }
 
@@ -45,7 +45,7 @@ public class CustomerOrderController {
     @ApiOperation(value = "修改SCustomerOrder")
     @PutMapping(value = "/customerOrder")
     @PreAuthorize("hasAnyRole('ADMIN','SCUSTOMERORDER_ALL','SCUSTOMERORDER_EDIT')")
-    public ResponseEntity update(@Validated @RequestBody CustomerOrder resources){
+    public ResponseEntity update(@RequestBody CustomerOrder resources){
         customerOrderService.update(resources);
         return new ResponseEntity(HttpStatus.NO_CONTENT);
     }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java
index fdb13684..21592d6f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java
@@ -52,6 +52,7 @@ public class CustomerOrderServiceImpl implements CustomerOrderService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CustomerOrderDTO create(CustomerOrder resources) {
+        resources.setStatus(true);
         return customerOrderMapper.toDto(customerOrderRepository.save(resources));
     }
 
@@ -68,6 +69,6 @@ public class CustomerOrderServiceImpl implements CustomerOrderService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long id) {
-        customerOrderRepository.deleteById(id);
+        customerOrderRepository.deleteCustomerOrder(id);
     }
 }
\ No newline at end of file