1.订单表添加“取消原因”字段

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java

@@ -49,6 +49,9 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "预约时间")
 	private Date appointmentTime;
 
+	@ApiModelProperty(value = "取消原因")
+	private String cancelReason;
+
 	@ApiModelProperty(value = "备注")
 	private String remark;
 

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrderEntity.java

@@ -55,6 +55,10 @@ public class PensionOrderEntity extends BaseEntity {
      * 预约时间
      */
 	private Date appointmentTime;
+	/**
+	 * 取消原因
+	 */
+	private String cancelReason;
     /**
      * 备注
      */

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java

@@ -52,6 +52,9 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "预约时间")
 	private Date appointmentTime;
 
+	@ApiModelProperty(value = "取消原因")
+	private String cancelReason;
+
 	@ApiModelProperty(value = "备注")
 	private String remark;
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrderEntity.java

@@ -55,6 +55,10 @@ public class PensionOrderEntity extends BaseEntity {
      * 预约时间
      */
 	private Date appointmentTime;
+	/**
+	 * 取消原因
+	 */
+	private String cancelReason;
     /**
      * 备注
      */

hmit-api/src/main/resources/mapper/serviceOrder/PensionOrderDao.xml

@@ -35,7 +35,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date
         FROM pension_order po
         WHERE po.id = #{orderId} AND po.status = #{status}
@@ -45,7 +45,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -71,7 +71,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -88,7 +88,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -99,7 +99,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -110,7 +110,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -124,7 +124,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps, tb_user tu
@@ -135,7 +135,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps, tb_user tu
@@ -147,7 +147,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
         po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
         po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-        po.act_price, po.community_name, po.community_id, po.dept_id,
+        po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
         po.creator, po.creator_name, po.creator_tel, po.create_date,
         ps.icon
         FROM pension_order po, pension_service ps