| @@ -13,7 +13,7 @@ CREATE TABLE `wx_coupon_order_reservation` ( | |||||
| `user_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | `user_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | ||||
| `start_date` datetime(0) DEFAULT NULL, | `start_date` datetime(0) DEFAULT NULL, | ||||
| `end_date` datetime(0) DEFAULT NULL, | `end_date` datetime(0) DEFAULT NULL, | ||||
| `describe` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | |||||
| `describe_str` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | |||||
| `describe_img` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | `describe_img` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | ||||
| `status` smallint(1) NOT NULL, | `status` smallint(1) NOT NULL, | ||||
| `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, | ||||
| @@ -37,8 +37,8 @@ public class WxCouponOrderReservation extends TenantEntity { | |||||
| private Date startDate; | private Date startDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "", name = "endDate") | @io.swagger.annotations.ApiModelProperty(value = "", name = "endDate") | ||||
| private Date endDate; | private Date endDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "描述", name = "describe") | |||||
| private String describe; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "描述", name = "describeStr") | |||||
| private String describeStr; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "描述", name = "describeImg") | @io.swagger.annotations.ApiModelProperty(value = "描述", name = "describeImg") | ||||
| private String describeImg; | private String describeImg; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "EnumCouponOrderReservationStatus", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "EnumCouponOrderReservationStatus", name = "status") | ||||
| @@ -96,6 +96,7 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva | |||||
| record.setId(id); | record.setId(id); | ||||
| } | } | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| record.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); | |||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| @@ -15,7 +15,7 @@ | |||||
| <result column="user_address" jdbcType="VARCHAR" property="userAddress" /> | <result column="user_address" jdbcType="VARCHAR" property="userAddress" /> | ||||
| <result column="start_date" jdbcType="TIMESTAMP" property="startDate" /> | <result column="start_date" jdbcType="TIMESTAMP" property="startDate" /> | ||||
| <result column="end_date" jdbcType="TIMESTAMP" property="endDate" /> | <result column="end_date" jdbcType="TIMESTAMP" property="endDate" /> | ||||
| <result column="describe" jdbcType="VARCHAR" property="describe" /> | |||||
| <result column="describe_str" jdbcType="VARCHAR" property="describeStr" /> | |||||
| <result column="describe_img" jdbcType="VARCHAR" property="describeImg" /> | <result column="describe_img" jdbcType="VARCHAR" property="describeImg" /> | ||||
| <result column="status" jdbcType="INTEGER" property="status" /> | <result column="status" jdbcType="INTEGER" property="status" /> | ||||
| <result column="remark" jdbcType="VARCHAR" property="remark" /> | <result column="remark" jdbcType="VARCHAR" property="remark" /> | ||||
| @@ -34,7 +34,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`coupon_order_id`,`coupon_id`,`coupon_title`, | `id`,`tenant_id`,`parent_tenant_id`,`coupon_order_id`,`coupon_id`,`coupon_title`, | ||||
| `c_user_id`,`user_name`,`user_phone`,`user_region`,`user_address`, | `c_user_id`,`user_name`,`user_phone`,`user_region`,`user_address`, | ||||
| `start_date`,`end_date`,`describe`,`describe_img`,`status`,`remark`, | |||||
| `start_date`,`end_date`,`describe_str`,`describe_img`,`status`,`remark`, | |||||
| `btenant_id`,`merchant_id`,`buser_id`,`buser_name`,`buser_phone`,`finish_time`, | `btenant_id`,`merchant_id`,`buser_id`,`buser_name`,`buser_phone`,`finish_time`, | ||||
| `create_date`,`update_date` | `create_date`,`update_date` | ||||
| </sql> | </sql> | ||||