From 6479c3d89d4bb73c236ab8c193822571cf190abd Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 8 Jun 2023 15:46:41 +0800 Subject: [PATCH] =?UTF-8?q?//=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V2023060500002_wx_coupon_order_reservation.sql | 2 +- .../java/com/iformall/domain/po/WxCouponOrderReservation.java | 4 ++-- .../service/impl/WxCouponOrderReservationServiceImpl.java | 1 + .../main/resources/mapper/WxCouponOrderReservationMapper.xml | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023060500002_wx_coupon_order_reservation.sql b/mallinkAdmin/src/main/resources/db/migration/V2023060500002_wx_coupon_order_reservation.sql index 4560e957d..82680bd14 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023060500002_wx_coupon_order_reservation.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023060500002_wx_coupon_order_reservation.sql @@ -13,7 +13,7 @@ CREATE TABLE `wx_coupon_order_reservation` ( `user_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, `start_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, `status` smallint(1) NOT NULL, `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java index 95ba7e52e..3493b49e4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java @@ -37,8 +37,8 @@ public class WxCouponOrderReservation extends TenantEntity { private Date startDate; @io.swagger.annotations.ApiModelProperty(value = "", name = "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") private String describeImg; @io.swagger.annotations.ApiModelProperty(value = "EnumCouponOrderReservationStatus", name = "status") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java index 888025307..42a41f4d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java @@ -96,6 +96,7 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva record.setId(id); } if (record.getId() == null) { + record.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml index 5fb3a3cfe..fd363a4fd 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml @@ -15,7 +15,7 @@ - + @@ -34,7 +34,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`coupon_order_id`,`coupon_id`,`coupon_title`, `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`, `create_date`,`update_date`