菜单 子集

存酒
购买须知
团购商品
用户列表
现金统计
订单详情 储值卡支付
商品排序 分组排序

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java

@@ -1,35 +1,17 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.controller.product;
 
 import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.dto.product.TbProductSortCriteria;
 import cn.ysk.cashier.vo.TbProductVo;
 import cn.ysk.cashier.service.product.TbProductService;
 import cn.ysk.cashier.dto.product.TbProductQueryCriteria;
-import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
-import java.io.IOException;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
 
 /**
 * @website https://eladmin.vip
@@ -67,6 +49,12 @@ public class TbProductController {
         return tbProductService.findByProductList(productList);
     }
 
+    @PostMapping("/upProSort")
+    @ApiOperation("修改商品排序")
+    public ResponseEntity<Object> upProSort(@RequestBody TbProductSortCriteria param){
+        tbProductService.upProSort(param);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 
     @PostMapping
     @Log("新增商品:#resources.name")

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java

@@ -1,21 +1,7 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.controller.product;
 
 import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.dto.product.TbProductSortCriteria;
 import cn.ysk.cashier.service.product.TbProductService;
 import cn.ysk.cashier.dto.product.TbProductQueryCriteria;
 import cn.ysk.cashier.pojo.product.TbProductGroup;
@@ -69,6 +55,13 @@ public class TbProductGroupController {
         return new ResponseEntity<>(tbProductGroupService.findByIdProduct(productGroup),HttpStatus.OK);
     }
 
+    @PostMapping("/upGroupSort")
+    @ApiOperation("修改分组排序")
+    public ResponseEntity<Object> upProSort(@RequestBody TbProductSortCriteria param){
+        tbProductGroupService.upSort(param);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 
     @PostMapping
     @Log("新增商品分组:#resources.name")

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java

@@ -1,34 +1,15 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.controller.product;
 
 import cn.ysk.cashier.annotation.Log;
 import cn.ysk.cashier.pojo.product.TbShopCategory;
 import cn.ysk.cashier.service.product.TbShopCategoryService;
 import cn.ysk.cashier.dto.product.TbShopCategoryQueryCriteria;
-import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 /**
 * @website https://eladmin.vip

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopStorageController.java

@@ -5,9 +5,9 @@ import cn.ysk.cashier.dto.shop.TbShopStorageNumDto;
 import cn.ysk.cashier.dto.shop.TbShopStorageQueryCriteria;
 import cn.ysk.cashier.dto.shop.TbShopStorageRecordQueryCriteria;
 import cn.ysk.cashier.pojo.shop.TbShopStorage;
-import cn.ysk.cashier.pojo.shop.TbShopStorageRecord;
 import cn.ysk.cashier.service.shop.TbShopStorageRecordService;
 import cn.ysk.cashier.service.shop.TbShopStorageService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
@@ -17,13 +17,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "存酒管理")
 @RequestMapping("/api/storage")
+@Slf4j
 public class TbShopStorageController {
 
     private final TbShopStorageService tbShopStorageService;
@@ -62,4 +61,11 @@ public class TbShopStorageController {
     public ResponseEntity<Object> queryTbShopStorageRecord(TbShopStorageRecordQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbShopStorageRecordService.queryAll(criteria,pageable),HttpStatus.OK);
     }
+
+    @PostMapping("countRecord")
+    @ApiOperation("存酒统计")
+    public ResponseEntity<Object> queryTbOrderPayCount(@RequestBody TbShopStorageQueryCriteria criteria){
+        Pageable pageable = PageRequest.of(criteria.getPage(), criteria.getSize());
+        return new ResponseEntity<>(tbShopStorageService.countStorage(criteria,pageable),HttpStatus.OK);
+    }
 }