新增查询基酒列表接口

.gitignore

@@ -1,5 +1,5 @@
 # maven #
-target
+target/
 
 logs
 

src/main/java/org/springblade/modules/api/controller/CustomWineController.java

@@ -3,6 +3,7 @@ package org.springblade.modules.api.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springblade.common.constant.CommonConstant;
@@ -45,9 +46,12 @@ public class CustomWineController extends BladeController {
     private IWineBoxStuffingService wineBoxStuffingService;
     @Autowired
     private IWineCaseStuffingService wineCaseStuffingService;
+    @Autowired
+    private IBaseWineService baseWineService;
 
 
     @GetMapping("/bottleBody/list")
+    @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取瓶身列表")
     public R<List<BottleBody>> getBottleBodyList(Query query) {
         LambdaQueryWrapper<BottleBody> wrapper = Wrappers.lambdaQuery(BottleBody.class)
@@ -57,6 +61,7 @@ public class CustomWineController extends BladeController {
     }
 
     @GetMapping("/bottleCap/list")
+    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取酒盖列表")
     public R<List<BottleCap>> getBottleCapList(Query query) {
         LambdaQueryWrapper<BottleCap> wrapper = Wrappers.lambdaQuery(BottleCap.class)
@@ -66,6 +71,7 @@ public class CustomWineController extends BladeController {
     }
 
     @GetMapping("/bottleLabel/list")
+    @ApiOperationSupport(order = 3)
     @ApiOperation(value = "获取标贴列表")
     public R<List<BottleLabel>> getBottleLabelList(Query query) {
         LambdaQueryWrapper<BottleLabel> wrapper = Wrappers.lambdaQuery(BottleLabel.class)
@@ -75,6 +81,7 @@ public class CustomWineController extends BladeController {
     }
 
     @GetMapping("/wineBox/list")
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "获取酒盒列表")
     public R<List<WineBox>> getWineBoxList(Query query) {
         LambdaQueryWrapper<WineBox> wrapper = Wrappers.lambdaQuery(WineBox.class)
@@ -84,6 +91,7 @@ public class CustomWineController extends BladeController {
     }
 
     @GetMapping("/wineCase/list")
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "获取酒箱列表")
     public R<List<WineCase>> getWineCaseList(Query query) {
         LambdaQueryWrapper<WineCase> wrapper = Wrappers.lambdaQuery(WineCase.class)
@@ -93,6 +101,7 @@ public class CustomWineController extends BladeController {
     }
 
     @GetMapping("/wineCaseStuffing/list")
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "获取酒箱填充物列表")
     public R<List<WineCaseStuffing>> getWineCaseStuffingList(Query query) {
         LambdaQueryWrapper<WineCaseStuffing> wrapper = Wrappers.lambdaQuery(WineCaseStuffing.class)
@@ -102,6 +111,7 @@ public class CustomWineController extends BladeController {
     }
 
     @GetMapping("/wineBoxStuffing/list")
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "获取酒盒填充物列表")
     public R<List<WineBoxStuffing>> getWineBoxStuffingList(Query query) {
         LambdaQueryWrapper<WineBoxStuffing> wrapper = Wrappers.lambdaQuery(WineBoxStuffing.class)
@@ -109,4 +119,14 @@ public class CustomWineController extends BladeController {
         IPage<WineBoxStuffing> page = wineBoxStuffingService.page(Condition.getPage(query), wrapper);
         return data(page.getRecords());
     }
+
+    @GetMapping("/baseWine/list")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "获取基酒列表")
+    public R<List<BaseWine>> getBaseWineList(Query query) {
+        LambdaQueryWrapper<BaseWine> wrapper = Wrappers.lambdaQuery(BaseWine.class)
+                .eq(BaseWine::getStatus, StatusEnum.ENABLE.getValue()).eq(BaseWine::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<BaseWine> page = baseWineService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
 }

src/main/java/org/springblade/modules/custom/entity/BaseWine.java

@@ -57,6 +57,14 @@ public class BaseWine extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态 0-禁用 1-启用")
 	private Integer status;
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum;
 
 
+	public Integer getSalesVolume() {
+		return salesVolume == null ? 0 : salesVolume;
+	}
 }