| @@ -7,7 +7,7 @@ import javax.persistence.Transient; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| public class WxCouponOrderCVo extends WxCouponOrder{ | |||||
| public class WxCouponOrderCVo extends WxCouponOrder { | |||||
| /** | /** | ||||
| * | * | ||||
| @@ -101,6 +101,9 @@ public class WxCouponOrderCVo extends WxCouponOrder{ | |||||
| /*面额**/ | /*面额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | ||||
| private Integer price; | private Integer price; | ||||
| /**单位**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") | |||||
| private Integer unit; | |||||
| /*须知**/ | /*须知**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | ||||
| private String detail; | private String detail; | ||||
| @@ -256,6 +259,15 @@ public class WxCouponOrderCVo extends WxCouponOrder{ | |||||
| public void setPrice(Integer _price) { | public void setPrice(Integer _price) { | ||||
| price = _price; | price = _price; | ||||
| } | } | ||||
| public Integer getUnit() { | |||||
| return unit; | |||||
| } | |||||
| public void setUnit(Integer unit) { | |||||
| this.unit = unit; | |||||
| } | |||||
| public String getRemark() { | public String getRemark() { | ||||
| return remark; | return remark; | ||||
| } | } | ||||
| @@ -321,26 +333,16 @@ public class WxCouponOrderCVo extends WxCouponOrder{ | |||||
| public static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | ||||
| TenantId_ASC("`tenant_id` ASC"), | |||||
| TenantId_DESC("`tenant_id` DESC"), | |||||
| CouponId_ASC("`coupon_id` ASC"), | |||||
| CouponId_DESC("`coupon_id` DESC"), | |||||
| CUserId_ASC("`c_user_id` ASC"), | |||||
| CUserId_DESC("`c_user_id` DESC"), | |||||
| BUserId_ASC("`b_user_id` ASC"), | |||||
| BUserId_DESC("`b_user_id` DESC"), | |||||
| OrderId_ASC("`order_id` ASC"), | |||||
| OrderId_DESC("`order_id` DESC"), | |||||
| ExpiredTime_ASC("`expired_time` ASC"), | |||||
| ExpiredTime_DESC("`expired_time` DESC"), | |||||
| CouponOrderStatus_ASC("`coupon_order_status` ASC"), | |||||
| CouponOrderStatus_DESC("`coupon_order_status` DESC"), | |||||
| CreateDate_ASC("`create_date` ASC"), | |||||
| CreateDate_DESC("`create_date` DESC"), | |||||
| UpdateDate_ASC("`update_date` ASC"), | |||||
| UpdateDate_DESC("`update_date` DESC"), | |||||
| CouponPrice_ASC("`coupon_price` ASC"), | |||||
| CouponPrice_DESC("`coupon_price` DESC"); | |||||
| TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | |||||
| CouponId_ASC("`coupon_id` ASC"), CouponId_DESC("`coupon_id` DESC"), | |||||
| CUserId_ASC("`c_user_id` ASC"), UserId_DESC("`c_user_id` DESC"), | |||||
| BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC"), | |||||
| OrderId_ASC("`order_id` ASC"), OrderId_DESC("`order_id` DESC"), | |||||
| ExpiredTime_ASC("`expired_time` ASC"), ExpiredTime_DESC("`expired_time` DESC"), | |||||
| CouponOrderStatus_ASC("`coupon_order_status` ASC"), CouponOrderStatus_DESC("`coupon_order_status` DESC"), | |||||
| CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), | |||||
| UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), | |||||
| CouponPrice_ASC("`coupon_price` ASC"), CouponPrice_DESC("`coupon_price` DESC"); | |||||
| private String value; | private String value; | ||||
| Field(String value) { | Field(String value) { | ||||
| @@ -115,6 +115,9 @@ public class WxOrderCVo extends WxCouponOrder{ | |||||
| /*面额**/ | /*面额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | ||||
| private Integer price; | private Integer price; | ||||
| /**单位**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") | |||||
| private Integer unit; | |||||
| /*须知**/ | /*须知**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | ||||
| private String detail; | private String detail; | ||||
| @@ -288,6 +291,15 @@ public class WxOrderCVo extends WxCouponOrder{ | |||||
| public void setPrice(Integer _price) { | public void setPrice(Integer _price) { | ||||
| price = _price; | price = _price; | ||||
| } | } | ||||
| public Integer getUnit() { | |||||
| return unit; | |||||
| } | |||||
| public void setUnit(Integer unit) { | |||||
| this.unit = unit; | |||||
| } | |||||
| public String getRemark() { | public String getRemark() { | ||||
| return remark; | return remark; | ||||
| } | } | ||||
| @@ -290,6 +290,7 @@ | |||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice" /> | <result column="use_price" jdbcType="INTEGER" property="usePrice" /> | ||||
| <result column="detail" jdbcType="VARCHAR" property="detail" /> | <result column="detail" jdbcType="VARCHAR" property="detail" /> | ||||
| <result column="price" jdbcType="INTEGER" property="price" /> | <result column="price" jdbcType="INTEGER" property="price" /> | ||||
| <result column="unit" jdbcType="INTEGER" property="unit" /> | |||||
| <result column="remark" jdbcType="VARCHAR" property="remark" /> | <result column="remark" jdbcType="VARCHAR" property="remark" /> | ||||
| @@ -143,13 +143,13 @@ | |||||
| <sql id="allCUserOrderListColumns"> | <sql id="allCUserOrderListColumns"> | ||||
| o.id,o.order_number,o.tenant_id,o.c_user_id,o.merchant_id,o.b_user_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | o.id,o.order_number,o.tenant_id,o.c_user_id,o.merchant_id,o.b_user_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | ||||
| co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price, | |||||
| co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.unit, | |||||
| m.name | m.name | ||||
| </sql> | </sql> | ||||
| <sql id="allCUserOrderDetailColumns"> | <sql id="allCUserOrderDetailColumns"> | ||||
| o.id,o.order_number,o.tenant_id,o.c_user_id,o.merchant_id,o.b_user_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | o.id,o.order_number,o.tenant_id,o.c_user_id,o.merchant_id,o.b_user_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | ||||
| co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail,co.remark, | |||||
| co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.unit,co.detail,co.remark, | |||||
| m.img_url,m.name,m.link_phone,m.status, | m.img_url,m.name,m.link_phone,m.status, | ||||
| s.addr,s.shop_number,s.baidu_poi, | s.addr,s.shop_number,s.baidu_poi, | ||||
| mb.building_name,mf.floor_name, | mb.building_name,mf.floor_name, | ||||
| @@ -180,6 +180,7 @@ | |||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | ||||
| <result column="detail" jdbcType="VARCHAR" property="detail"/> | <result column="detail" jdbcType="VARCHAR" property="detail"/> | ||||
| <result column="price" jdbcType="INTEGER" property="price"/> | <result column="price" jdbcType="INTEGER" property="price"/> | ||||
| <result column="unit" jdbcType="INTEGER" property="unit"/> | |||||
| <result column="remark" jdbcType="VARCHAR" property="remark"/> | <result column="remark" jdbcType="VARCHAR" property="remark"/> | ||||
| <result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId"/> | <result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId"/> | ||||