客户订单

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);
 }

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);
     }

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);
     }
 }