ソースを参照

fix: 添加字段

luofeiyun 2 週間 前
コミット
f454e2aaf1

+ 1 - 0
pom.xml

@@ -15,6 +15,7 @@
         <module>ship-server-web</module>
         <module>ship-module-resource</module>
         <module>ship-module-marketing</module>
+        <module>ship-module-miniapplet</module>
     </modules>
 
     <name>${project.artifactId}</name>

+ 91 - 0
ship-module-miniapplet/pom.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ship-ota-server</artifactId>
+        <groupId>com.yc.ship</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+
+    <artifactId>ship-module-miniapplet</artifactId>
+    <description>
+        miniapplet 模块下,我们小程序页面内容相关业务代码。
+    </description>
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>module-infra-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-biz-data-permission</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-biz-ip</artifactId>
+        </dependency>
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-redis</artifactId>
+        </dependency>
+
+        <!-- 消息队列相关 -->
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-mq</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <!-- joda-time相关 -->
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.9.9</version>
+        </dependency>
+    </dependencies>
+
+</project>

+ 18 - 0
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/vo/ResourceRoomModelRespVO.java

@@ -106,6 +106,24 @@ public class ResourceRoomModelRespVO {
     @Schema(description = "备注")
     private String remark;
 
+    /**
+     * 可加床数
+     */
+    @Schema(description = "可加床数")
+    private Integer addBedNum;
+
+    /**
+     * 可加成人数(和儿童二选一)
+     */
+    @Schema(description = "可加成人数(和儿童二选一)")
+    private Integer addAdultNum;
+
+    /**
+     * 可加儿童数(和成人二选一)
+     */
+    @Schema(description = "可加儿童数(和成人二选一)")
+    private Integer addChildNum;
+
     public void setFloorsNumStr(String floorsNum) {
         String[] split = floorsNum.split(",");
         this.floorsNumStr = Arrays.stream(split).map(element -> element + "F").collect(Collectors.joining( ","));

+ 18 - 0
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/vo/ResourceRoomModelSaveReqVO.java

@@ -63,4 +63,22 @@ public class ResourceRoomModelSaveReqVO {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
+    /**
+     * 可加床数
+     */
+    @Schema(description = "可加床数")
+    private Integer addBedNum;
+
+    /**
+     * 可加成人数(和儿童二选一)
+     */
+    @Schema(description = "可加成人数(和儿童二选一)")
+    private Integer addAdultNum;
+
+    /**
+     * 可加儿童数(和成人二选一)
+     */
+    @Schema(description = "可加儿童数(和成人二选一)")
+    private Integer addChildNum;
+
 }

+ 15 - 0
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/roommodel/ResourceRoomModelDO.java

@@ -94,4 +94,19 @@ public class ResourceRoomModelDO extends TenantBaseDO {
      */
     private Integer status;
 
+    /**
+     * 可加床数
+     */
+    private Integer addBedNum;
+
+    /**
+     * 可加成人数(和儿童二选一)
+     */
+    private Integer addAdultNum;
+
+    /**
+     * 可加成人数(和成人二选一)
+     */
+    private Integer addChildNum;
+
 }