stjdydayou пре 4 година
родитељ
комит
14f7e844c3

+ 0 - 1
src/main/java/com/zhiqiyun/open/core/models/bz/BaseDataInfo.java

@@ -24,7 +24,6 @@ public class BaseDataInfo {
     private String address;
     private String contacts;
     private String contactNumber;
-    private String businessHours;
     private BigDecimal lng;
     private BigDecimal lat;
 }

+ 2 - 0
src/main/java/com/zhiqiyun/open/core/models/bz/VenueInfo.java

@@ -12,6 +12,8 @@ public class VenueInfo {
     @TableId(type = IdType.INPUT)
     private Long id;
 
+    private String businessHours;
+
     @TableField(exist = false)
     private BaseDataInfo baseDataInfo;
 }

+ 3 - 2
src/main/java/com/zhiqiyun/open/mvc/controller/VenueInfoController.java

@@ -10,7 +10,7 @@ import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.core.service.VenueInfoService;
 import com.zhiqiyun.open.mvc.Result;
 import com.zhiqiyun.open.mvc.params.QueryVenueInfoParams;
-import com.zhiqiyun.open.mvc.params.SaveVenueInfoParams;
+import com.zhiqiyun.open.mvc.params.bz.SaveVenueInfoParams;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,8 +84,9 @@ public class VenueInfoController {
 
         VenueInfo entity = new VenueInfo();
         BaseDataInfo baseDataInfo = new BaseDataInfo();
+
         BeanUtils.copyProperties(params, entity);
-        BeanUtils.copyProperties(params, baseDataInfo);
+        BeanUtils.copyProperties(params.getBaseDataInfo(), baseDataInfo);
 
         entity.setBaseDataInfo(baseDataInfo);
         entity.setId(id);

+ 2 - 3
src/main/java/com/zhiqiyun/open/mvc/params/SaveVenueInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/bz/BaseDataInfoParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.params;
+package com.zhiqiyun.open.mvc.params.bz;
 
 import lombok.Data;
 
@@ -6,7 +6,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 @Data
-public class SaveVenueInfoParams {
+public class BaseDataInfoParam {
     private String name;
     private List<String> litpics;
     private String describe;
@@ -14,7 +14,6 @@ public class SaveVenueInfoParams {
     private String address;
     private String contacts;
     private String contactNumber;
-    private String businessHours;
     private BigDecimal lng;
     private BigDecimal lat;
 }

+ 12 - 0
src/main/java/com/zhiqiyun/open/mvc/params/bz/SaveVenueInfoParams.java

@@ -0,0 +1,12 @@
+package com.zhiqiyun.open.mvc.params.bz;
+
+import lombok.Data;
+
+@Data
+public class SaveVenueInfoParams {
+
+    private BaseDataInfoParam baseDataInfo;
+
+    private String businessHours;
+
+}

+ 3 - 2
src/main/resources/db/migration/V1.0.3__bz.sql

@@ -9,7 +9,6 @@ CREATE TABLE `bz_base_info`
     `address`        VARCHAR(100)   NULL     DEFAULT NULL COMMENT '地址',
     `contacts`       VARCHAR(50)    NULL     DEFAULT NULL COMMENT '联系人',
     `contact_number` VARCHAR(50)    NULL     DEFAULT NULL COMMENT '联系电话',
-    `business_hours` VARCHAR(200)   NULL     DEFAULT NULL COMMENT '开放时间',
     `lng`            DECIMAL(20, 6) NOT NULL DEFAULT '0.000000' COMMENT '经度(坐标)',
     `lat`            DECIMAL(20, 6) NOT NULL DEFAULT '0.000000' COMMENT '纬度(坐标)',
     `created_time`   VARCHAR(200)   NULL     DEFAULT NULL COMMENT '创建时间',
@@ -54,13 +53,15 @@ DROP TABLE IF EXISTS `bz_tourist_info`;
 CREATE TABLE `bz_tourist_info`
 (
     `id` BIGINT(20) NOT NULL COMMENT 'ID',
+    `business_hours` VARCHAR(200) NULL DEFAULT NULL COMMENT '营业时间',
     PRIMARY KEY (`id`)
 ) COMMENT ='旅行社扩展信息表' ENGINE = InnoDB;
 
 DROP TABLE IF EXISTS `bz_venue_info`;
 CREATE TABLE `bz_venue_info`
 (
-    `id` BIGINT(20) NOT NULL COMMENT 'ID',
+    `id`             BIGINT(20)   NOT NULL COMMENT 'ID',
+    `business_hours` VARCHAR(200) NULL DEFAULT NULL COMMENT '开放时间',
     PRIMARY KEY (`id`)
 ) COMMENT ='场馆扩展信息表' ENGINE = InnoDB;