Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pseer
gxpt_ht
Commits
526d8d18
Commit
526d8d18
authored
Oct 23, 2023
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单表字段
parent
3359a3f6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
182 additions
and
210 deletions
+182
-210
SConsumerCoupon.java
...em/src/main/java/share/system/domain/SConsumerCoupon.java
+3
-1
SCoupon.java
share-system/src/main/java/share/system/domain/SCoupon.java
+10
-112
SConsumerCouponMapper.xml
...rc/main/resources/mapper/system/SConsumerCouponMapper.xml
+6
-1
SCouponMapper.xml
...system/src/main/resources/mapper/system/SCouponMapper.xml
+11
-1
SOrderMapper.xml
...-system/src/main/resources/mapper/system/SOrderMapper.xml
+152
-95
No files found.
share-system/src/main/java/share/system/domain/SConsumerCoupon.java
View file @
526d8d18
...
@@ -52,7 +52,9 @@ public class SConsumerCoupon extends BaseEntity
...
@@ -52,7 +52,9 @@ public class SConsumerCoupon extends BaseEntity
@Excel
(
name
=
"房间类型(1:标间,2:豪华间,3:总统套房,4:商务套房,5:行政套房,6:其他)"
)
@Excel
(
name
=
"房间类型(1:标间,2:豪华间,3:总统套房,4:商务套房,5:行政套房,6:其他)"
)
private
String
roomType
;
private
String
roomType
;
/** 门槛时长 */
@Excel
(
name
=
"门槛时长"
)
private
String
minDuration
;
/** 折扣最大时长 */
/** 折扣最大时长 */
@Excel
(
name
=
"折扣最大时长"
)
@Excel
(
name
=
"折扣最大时长"
)
...
...
share-system/src/main/java/share/system/domain/SCoupon.java
View file @
526d8d18
...
@@ -3,6 +3,7 @@ package share.system.domain;
...
@@ -3,6 +3,7 @@ package share.system.domain;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
share.common.annotation.Excel
;
import
share.common.annotation.Excel
;
...
@@ -14,6 +15,7 @@ import share.common.core.domain.BaseEntity;
...
@@ -14,6 +15,7 @@ import share.common.core.domain.BaseEntity;
* @author ruoyi
* @author ruoyi
* @date 2023-09-27
* @date 2023-09-27
*/
*/
@Data
public
class
SCoupon
extends
BaseEntity
public
class
SCoupon
extends
BaseEntity
{
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -29,6 +31,14 @@ public class SCoupon extends BaseEntity
...
@@ -29,6 +31,14 @@ public class SCoupon extends BaseEntity
@Excel
(
name
=
"优惠券类型(1:折扣券,2,团购券,3:满减券,4:核销券,5:充值送金额)"
)
@Excel
(
name
=
"优惠券类型(1:折扣券,2,团购券,3:满减券,4:核销券,5:充值送金额)"
)
private
Integer
couponType
;
private
Integer
couponType
;
/** 门槛时长 */
@Excel
(
name
=
"门槛时长"
)
private
String
minDuration
;
/** 折扣最大时长 */
@Excel
(
name
=
"折扣最大时长"
)
private
String
maxDuration
;
/** 时长 */
/** 时长 */
@Excel
(
name
=
"时长"
)
@Excel
(
name
=
"时长"
)
private
String
duration
;
private
String
duration
;
...
@@ -58,116 +68,4 @@ public class SCoupon extends BaseEntity
...
@@ -58,116 +68,4 @@ public class SCoupon extends BaseEntity
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"有效期结束"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"有效期结束"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
endDate
;
private
Date
endDate
;
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
Long
getId
()
{
return
id
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getName
()
{
return
name
;
}
public
void
setCouponType
(
Integer
couponType
)
{
this
.
couponType
=
couponType
;
}
public
Integer
getCouponType
()
{
return
couponType
;
}
public
void
setDuration
(
String
duration
)
{
this
.
duration
=
duration
;
}
public
String
getDuration
()
{
return
duration
;
}
public
void
setMinPrice
(
BigDecimal
minPrice
)
{
this
.
minPrice
=
minPrice
;
}
public
BigDecimal
getMinPrice
()
{
return
minPrice
;
}
public
void
setSubPrice
(
BigDecimal
subPrice
)
{
this
.
subPrice
=
subPrice
;
}
public
BigDecimal
getSubPrice
()
{
return
subPrice
;
}
public
void
setPlatform
(
String
platform
)
{
this
.
platform
=
platform
;
}
public
String
getPlatform
()
{
return
platform
;
}
public
void
setPlatformType
(
Integer
platformType
)
{
this
.
platformType
=
platformType
;
}
public
Integer
getPlatformType
()
{
return
platformType
;
}
public
void
setStartDate
(
Date
startDate
)
{
this
.
startDate
=
startDate
;
}
public
Date
getStartDate
()
{
return
startDate
;
}
public
void
setEndDate
(
Date
endDate
)
{
this
.
endDate
=
endDate
;
}
public
Date
getEndDate
()
{
return
endDate
;
}
@Override
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"id"
,
getId
())
.
append
(
"name"
,
getName
())
.
append
(
"couponType"
,
getCouponType
())
.
append
(
"duration"
,
getDuration
())
.
append
(
"minPrice"
,
getMinPrice
())
.
append
(
"subPrice"
,
getSubPrice
())
.
append
(
"platform"
,
getPlatform
())
.
append
(
"platformType"
,
getPlatformType
())
.
append
(
"startDate"
,
getStartDate
())
.
append
(
"endDate"
,
getEndDate
())
.
append
(
"createBy"
,
getCreateBy
())
.
append
(
"createTime"
,
getCreateTime
())
.
append
(
"updateBy"
,
getUpdateBy
())
.
append
(
"updateTime"
,
getUpdateTime
())
.
append
(
"remark"
,
getRemark
())
.
toString
();
}
}
}
share-system/src/main/resources/mapper/system/SConsumerCouponMapper.xml
View file @
526d8d18
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
<result
property=
"couponCode"
column=
"coupon_code"
/>
<result
property=
"couponCode"
column=
"coupon_code"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"couponType"
column=
"coupon_type"
/>
<result
property=
"couponType"
column=
"coupon_type"
/>
<result
property=
"minDuration"
column=
"min_duration"
/>
<result
property=
"maxDuration"
column=
"max_duration"
/>
<result
property=
"maxDuration"
column=
"max_duration"
/>
<result
property=
"duration"
column=
"duration"
/>
<result
property=
"duration"
column=
"duration"
/>
<result
property=
"minPrice"
column=
"min_price"
/>
<result
property=
"minPrice"
column=
"min_price"
/>
...
@@ -34,7 +35,7 @@
...
@@ -34,7 +35,7 @@
</resultMap>
</resultMap>
<sql
id=
"selectSConsumerCouponVo"
>
<sql
id=
"selectSConsumerCouponVo"
>
select id, consumer_id, coupon_id, coupon_code, name, coupon_type, max_duration, duration, min_price, sub_price, source_type, platform_type, start_date, end_date, use_date, use_status, is_delete, create_by, create_time, update_by, update_time, delete_by, delete_time, remark,room_type,store_type from s_consumer_coupon
select id, consumer_id, coupon_id, coupon_code, name, coupon_type, max_duration,
min_duration,
duration, min_price, sub_price, source_type, platform_type, start_date, end_date, use_date, use_status, is_delete, create_by, create_time, update_by, update_time, delete_by, delete_time, remark,room_type,store_type from s_consumer_coupon
</sql>
</sql>
<select
id=
"selectSConsumerCouponList"
parameterType=
"SConsumerCoupon"
resultMap=
"SConsumerCouponResult"
>
<select
id=
"selectSConsumerCouponList"
parameterType=
"SConsumerCoupon"
resultMap=
"SConsumerCouponResult"
>
...
@@ -46,6 +47,7 @@
...
@@ -46,6 +47,7 @@
<if
test=
"name != null and name != ''"
>
and name like concat('%', #{name}, '%')
</if>
<if
test=
"name != null and name != ''"
>
and name like concat('%', #{name}, '%')
</if>
<if
test=
"couponType != null and couponType != ''"
>
and coupon_type = #{couponType}
</if>
<if
test=
"couponType != null and couponType != ''"
>
and coupon_type = #{couponType}
</if>
<if
test=
"maxDuration != null and maxDuration != ''"
>
and max_duration = #{maxDuration}
</if>
<if
test=
"maxDuration != null and maxDuration != ''"
>
and max_duration = #{maxDuration}
</if>
<if
test=
"minDuration != null and minDuration != ''"
>
and min_duration = #{minDuration}
</if>
<if
test=
"duration != null and duration != ''"
>
and duration = #{duration}
</if>
<if
test=
"duration != null and duration != ''"
>
and duration = #{duration}
</if>
<if
test=
"minPrice != null "
>
and min_price = #{minPrice}
</if>
<if
test=
"minPrice != null "
>
and min_price = #{minPrice}
</if>
<if
test=
"subPrice != null "
>
and sub_price = #{subPrice}
</if>
<if
test=
"subPrice != null "
>
and sub_price = #{subPrice}
</if>
...
@@ -75,6 +77,7 @@
...
@@ -75,6 +77,7 @@
<if
test=
"name != null and name != ''"
>
name,
</if>
<if
test=
"name != null and name != ''"
>
name,
</if>
<if
test=
"couponType != null"
>
coupon_type,
</if>
<if
test=
"couponType != null"
>
coupon_type,
</if>
<if
test=
"maxDuration != null"
>
max_duration,
</if>
<if
test=
"maxDuration != null"
>
max_duration,
</if>
<if
test=
"minDuration != null"
>
min_duration,
</if>
<if
test=
"duration != null and duration != ''"
>
duration,
</if>
<if
test=
"duration != null and duration != ''"
>
duration,
</if>
<if
test=
"minPrice != null"
>
min_price,
</if>
<if
test=
"minPrice != null"
>
min_price,
</if>
<if
test=
"subPrice != null"
>
sub_price,
</if>
<if
test=
"subPrice != null"
>
sub_price,
</if>
...
@@ -102,6 +105,7 @@
...
@@ -102,6 +105,7 @@
<if
test=
"name != null and name != ''"
>
#{name},
</if>
<if
test=
"name != null and name != ''"
>
#{name},
</if>
<if
test=
"couponType != null"
>
#{couponType},
</if>
<if
test=
"couponType != null"
>
#{couponType},
</if>
<if
test=
"maxDuration != null"
>
#{maxDuration},
</if>
<if
test=
"maxDuration != null"
>
#{maxDuration},
</if>
<if
test=
"minDuration != null"
>
#{minDuration},
</if>
<if
test=
"duration != null and duration != ''"
>
#{duration},
</if>
<if
test=
"duration != null and duration != ''"
>
#{duration},
</if>
<if
test=
"minPrice != null"
>
#{minPrice},
</if>
<if
test=
"minPrice != null"
>
#{minPrice},
</if>
<if
test=
"subPrice != null"
>
#{subPrice},
</if>
<if
test=
"subPrice != null"
>
#{subPrice},
</if>
...
@@ -133,6 +137,7 @@
...
@@ -133,6 +137,7 @@
<if
test=
"name != null and name != ''"
>
name = #{name},
</if>
<if
test=
"name != null and name != ''"
>
name = #{name},
</if>
<if
test=
"couponType != null"
>
coupon_type = #{couponType},
</if>
<if
test=
"couponType != null"
>
coupon_type = #{couponType},
</if>
<if
test=
"maxDuration != null"
>
max_duration = #{maxDuration},
</if>
<if
test=
"maxDuration != null"
>
max_duration = #{maxDuration},
</if>
<if
test=
"minDuration != null"
>
min_duration = #{minDuration},
</if>
<if
test=
"duration != null and duration != ''"
>
duration = #{duration},
</if>
<if
test=
"duration != null and duration != ''"
>
duration = #{duration},
</if>
<if
test=
"minPrice != null"
>
min_price = #{minPrice},
</if>
<if
test=
"minPrice != null"
>
min_price = #{minPrice},
</if>
<if
test=
"subPrice != null"
>
sub_price = #{subPrice},
</if>
<if
test=
"subPrice != null"
>
sub_price = #{subPrice},
</if>
...
...
share-system/src/main/resources/mapper/system/SCouponMapper.xml
View file @
526d8d18
...
@@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"name"
column=
"name"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"couponType"
column=
"coupon_type"
/>
<result
property=
"couponType"
column=
"coupon_type"
/>
<result
property=
"duration"
column=
"duration"
/>
<result
property=
"duration"
column=
"duration"
/>
<result
property=
"minDuration"
column=
"min_duration"
/>
<result
property=
"maxDuration"
column=
"max_duration"
/>
<result
property=
"minPrice"
column=
"min_price"
/>
<result
property=
"minPrice"
column=
"min_price"
/>
<result
property=
"subPrice"
column=
"sub_price"
/>
<result
property=
"subPrice"
column=
"sub_price"
/>
<result
property=
"platform"
column=
"platform"
/>
<result
property=
"platform"
column=
"platform"
/>
...
@@ -23,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -23,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
</resultMap>
<sql
id=
"selectSCouponVo"
>
<sql
id=
"selectSCouponVo"
>
select id, name, coupon_type, duration, min_price, sub_price, platform, platform_type, start_date, end_date, create_by, create_time, update_by, update_time, remark from s_coupon
select id, name, coupon_type, duration,
min_duration,max_duration,
min_price, sub_price, platform, platform_type, start_date, end_date, create_by, create_time, update_by, update_time, remark from s_coupon
</sql>
</sql>
<select
id=
"selectSCouponList"
parameterType=
"SCoupon"
resultMap=
"SCouponResult"
>
<select
id=
"selectSCouponList"
parameterType=
"SCoupon"
resultMap=
"SCouponResult"
>
...
@@ -32,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -32,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"name != null and name != ''"
>
and name like concat('%', #{name}, '%')
</if>
<if
test=
"name != null and name != ''"
>
and name like concat('%', #{name}, '%')
</if>
<if
test=
"couponType != null "
>
and coupon_type = #{couponType}
</if>
<if
test=
"couponType != null "
>
and coupon_type = #{couponType}
</if>
<if
test=
"duration != null and duration != ''"
>
and duration = #{duration}
</if>
<if
test=
"duration != null and duration != ''"
>
and duration = #{duration}
</if>
<if
test=
"minDuration != null and minDuration != ''"
>
and min_duration = #{minDuration},
</if>
<if
test=
"maxDuration != null and maxDuration != ''"
>
and max_duration = #{maxDuration},
</if>
<if
test=
"minPrice != null "
>
and min_price = #{minPrice}
</if>
<if
test=
"minPrice != null "
>
and min_price = #{minPrice}
</if>
<if
test=
"subPrice != null "
>
and sub_price = #{subPrice}
</if>
<if
test=
"subPrice != null "
>
and sub_price = #{subPrice}
</if>
<if
test=
"platform != null and platform != ''"
>
and platform = #{platform}
</if>
<if
test=
"platform != null and platform != ''"
>
and platform = #{platform}
</if>
...
@@ -52,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -52,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"name != null and name != ''"
>
name,
</if>
<if
test=
"name != null and name != ''"
>
name,
</if>
<if
test=
"couponType != null"
>
coupon_type,
</if>
<if
test=
"couponType != null"
>
coupon_type,
</if>
<if
test=
"duration != null and duration != ''"
>
duration,
</if>
<if
test=
"duration != null and duration != ''"
>
duration,
</if>
<if
test=
"minDuration != null and minDuration != ''"
>
min_duration = #{minDuration},
</if>
<if
test=
"maxDuration != null and maxDuration != ''"
>
max_duration = #{maxDuration},
</if>
<if
test=
"minPrice != null"
>
min_price,
</if>
<if
test=
"minPrice != null"
>
min_price,
</if>
<if
test=
"subPrice != null"
>
sub_price,
</if>
<if
test=
"subPrice != null"
>
sub_price,
</if>
<if
test=
"platform != null"
>
platform,
</if>
<if
test=
"platform != null"
>
platform,
</if>
...
@@ -68,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -68,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"name != null and name != ''"
>
#{name},
</if>
<if
test=
"name != null and name != ''"
>
#{name},
</if>
<if
test=
"couponType != null"
>
#{couponType},
</if>
<if
test=
"couponType != null"
>
#{couponType},
</if>
<if
test=
"duration != null and duration != ''"
>
#{duration},
</if>
<if
test=
"duration != null and duration != ''"
>
#{duration},
</if>
<if
test=
"minDuration != null and minDuration != ''"
>
#{minDuration},
</if>
<if
test=
"maxDuration != null and maxDuration != ''"
>
#{maxDuration},
</if>
<if
test=
"minPrice != null"
>
#{minPrice},
</if>
<if
test=
"minPrice != null"
>
#{minPrice},
</if>
<if
test=
"subPrice != null"
>
#{subPrice},
</if>
<if
test=
"subPrice != null"
>
#{subPrice},
</if>
<if
test=
"platform != null"
>
#{platform},
</if>
<if
test=
"platform != null"
>
#{platform},
</if>
...
@@ -88,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -88,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"name != null and name != ''"
>
name = #{name},
</if>
<if
test=
"name != null and name != ''"
>
name = #{name},
</if>
<if
test=
"couponType != null"
>
coupon_type = #{couponType},
</if>
<if
test=
"couponType != null"
>
coupon_type = #{couponType},
</if>
<if
test=
"duration != null and duration != ''"
>
duration = #{duration},
</if>
<if
test=
"duration != null and duration != ''"
>
duration = #{duration},
</if>
<if
test=
"minDuration != null and minDuration != ''"
>
min_duration = #{minDuration},
</if>
<if
test=
"maxDuration != null and maxDuration != ''"
>
max_duration = #{maxDuration},
</if>
<if
test=
"minPrice != null"
>
min_price = #{minPrice},
</if>
<if
test=
"minPrice != null"
>
min_price = #{minPrice},
</if>
<if
test=
"subPrice != null"
>
sub_price = #{subPrice},
</if>
<if
test=
"subPrice != null"
>
sub_price = #{subPrice},
</if>
<if
test=
"platform != null"
>
platform = #{platform},
</if>
<if
test=
"platform != null"
>
platform = #{platform},
</if>
...
...
share-system/src/main/resources/mapper/system/SOrderMapper.xml
View file @
526d8d18
...
@@ -6,54 +6,90 @@
...
@@ -6,54 +6,90 @@
<resultMap
type=
"SOrder"
id=
"SOrderResult"
>
<resultMap
type=
"SOrder"
id=
"SOrderResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"id"
column=
"id"
/>
<result
property=
"orderNo"
column=
"order_no"
/>
<result
property=
"orderType"
column=
"order_type"
/>
<result
property=
"orderType"
column=
"order_type"
/>
<result
property=
"serialNumber"
column=
"serial_number"
/>
<result
property=
"payType"
column=
"pay_type"
/>
<result
property=
"payStatus"
column=
"pay_status"
/>
<result
property=
"storeId"
column=
"store_id"
/>
<result
property=
"roomId"
column=
"room_id"
/>
<result
property=
"consumerId"
column=
"consumer_id"
/>
<result
property=
"consumerId"
column=
"consumer_id"
/>
<result
property=
"consumerName"
column=
"consumer_name"
/>
<result
property=
"consumerName"
column=
"consumer_name"
/>
<result
property=
"description"
column=
"description"
/>
<result
property=
"consumerPhone"
column=
"consumer_phone"
/>
<result
property=
"originalPrice"
column=
"original_price"
/>
<result
property=
"packId"
column=
"pack_id"
/>
<result
property=
"payWays"
column=
"pay_ways"
/>
<result
property=
"packPrice"
column=
"pack_price"
/>
<result
property=
"realPrice"
column=
"real_price"
/>
<result
property=
"isUseCoupon"
column=
"is_use_coupon"
/>
<result
property=
"couponType"
column=
"coupon_type"
/>
<result
property=
"couponName"
column=
"coupon_name"
/>
<result
property=
"couponId"
column=
"coupon_id"
/>
<result
property=
"couponId"
column=
"coupon_id"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"couponPrice"
column=
"coupon_price"
/>
<result
property=
"totalPrice"
column=
"total_price"
/>
<result
property=
"payPrice"
column=
"pay_price"
/>
<result
property=
"payTime"
column=
"pay_time"
/>
<result
property=
"timeLong"
column=
"time_long"
/>
<result
property=
"preStartDate"
column=
"pre_start_date"
/>
<result
property=
"preEndDate"
column=
"pre_end_date"
/>
<result
property=
"startDate"
column=
"start_date"
/>
<result
property=
"startDate"
column=
"start_date"
/>
<result
property=
"endDate"
column=
"end_date"
/>
<result
property=
"endDate"
column=
"end_date"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"refundStatus"
column=
"refund_status"
/>
<result
property=
"refundReason"
column=
"refund_reason"
/>
<result
property=
"refundReasonTime"
column=
"refund_reason_time"
/>
<result
property=
"refundPrice"
column=
"refund_price"
/>
<result
property=
"isDelete"
column=
"is_delete"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"preStartDate"
column=
"pre_start_date"
/>
<result
property=
"preEndDate"
column=
"pre_end_date"
/>
</resultMap>
</resultMap>
<sql
id=
"selectSOrderVo"
>
<sql
id=
"selectSOrderVo"
>
select id, order_type, serial_number, consumer_id, consumer_name, description, original_price, pay_ways, real_price, is_use_coupon, coupon_type, coupon_name, coupon_id, status, start_date, end_date, create_by, create_time, update_by, update_time, remark, pre_start_date, pre_end_date from s_order
select id, order_no, order_type,
pay_type, pay_status, store_id,
room_id, consumer_id, consumer_name,
consumer_phone, pack_id, pack_price,
coupon_id, coupon_price, total_price,
pay_price, pay_time, time_long,
pre_start_date, pre_end_date, start_date,
end_date, status, refund_status,
refund_reason, refund_reason_time, refund_price,
is_delete, create_by, create_time,
update_by, update_time, remark from s_order
</sql>
</sql>
<select
id=
"selectSOrderList"
parameterType=
"SOrder"
resultMap=
"SOrderResult"
>
<select
id=
"selectSOrderList"
parameterType=
"SOrder"
resultMap=
"SOrderResult"
>
<include
refid=
"selectSOrderVo"
/>
<include
refid=
"selectSOrderVo"
/>
<where>
<where>
<if
test=
"orderType != null "
>
and order_type = #{orderType}
</if>
1=1
<if
test=
"serialNumber != null "
>
and serial_number = #{serialNumber}
</if>
<if
test=
"orderNo != null and orderNo != ''"
>
and order_no = #{orderNo}
</if>
<if
test=
"consumerId != null "
>
and consumer_id = #{consumerId}
</if>
<if
test=
"orderType != null and orderType != ''"
>
and order_type = #{orderType}
</if>
<if
test=
"consumerName != null and consumerName != ''"
>
and consumer_name like concat('%', #{consumerName}, '%')
</if>
<if
test=
"payType != null and payType != ''"
>
and pay_type = #{payType}
</if>
<if
test=
"description != null and description != ''"
>
and description = #{description}
</if>
<if
test=
"payStatus != null and payStatus != ''"
>
and pay_status = #{payStatus},
</if>
<if
test=
"originalPrice != null "
>
and original_price = #{originalPrice}
</if>
<if
test=
"storeId != null and storeId != ''"
>
and store_id = #{storeId},
</if>
<if
test=
"payWays != null "
>
and pay_ways = #{payWays}
</if>
<if
test=
"roomId != null and roomId != ''"
>
and room_id = #{roomId},
</if>
<if
test=
"realPrice != null "
>
and real_price = #{realPrice}
</if>
<if
test=
"consumerId != null and consumerId != ''"
>
and consumer_id = #{consumerId},
</if>
<if
test=
"isUseCoupon != null "
>
and is_use_coupon = #{isUseCoupon}
</if>
<if
test=
"consumerName != null and consumerName != ''"
>
and consumer_name = #{consumerName},
</if>
<if
test=
"couponType != null and couponType != ''"
>
and coupon_type = #{couponType}
</if>
<if
test=
"consumerPhone != null and consumerPhone != ''"
>
and consumer_phone = #{consumerPhone},
</if>
<if
test=
"couponName != null and couponName != ''"
>
and coupon_name like concat('%', #{couponName}, '%')
</if>
<if
test=
"packId != null and packId != ''"
>
and pack_id = #{packId},
</if>
<if
test=
"couponId != null and couponId != ''"
>
and coupon_id = #{couponId}
</if>
<if
test=
"packPrice != null and packPrice != ''"
>
and pack_price = #{packPrice},
</if>
<if
test=
"status != null "
>
and status = #{status}
</if>
<if
test=
"couponId != null and couponId != ''"
>
and coupon_id = #{couponId},
</if>
<if
test=
"startDate != null "
>
and start_date = #{startDate}
</if>
<if
test=
"couponPrice != null and couponPrice != ''"
>
and coupon_price = #{couponPrice},
</if>
<if
test=
"endDate != null "
>
and end_date = #{endDate}
</if>
<if
test=
"totalPrice != null and totalPrice != ''"
>
and total_price = #{totalPrice},
</if>
<if
test=
"preStartDate != null "
>
and pre_start_date = #{preStartDate}
</if>
<if
test=
"payPrice != null and payPrice != ''"
>
and pay_price = #{payPrice},
</if>
<if
test=
"preEndDate != null "
>
and pre_end_date = #{preEndDate}
</if>
<if
test=
"payTime != null and payTime != ''"
>
and pay_time = #{payTime},
</if>
<if
test=
"timeLong != null and timeLong != ''"
>
and time_long = #{timeLong},
</if>
<if
test=
"preStartDate != null and preStartDate != ''"
>
and pre_start_date = #{preStartDate},
</if>
<if
test=
"preEndDate != null and preEndDate != ''"
>
and pre_end_date = #{preEndDate},
</if>
<if
test=
"startDate != null and startDate != ''"
>
and start_date = #{startDate},
</if>
<if
test=
"endDate != null and endDate != ''"
>
and end_date = #{endDate},
</if>
<if
test=
"status != null and status != ''"
>
and status = #{status},
</if>
<if
test=
"refundStatus != null and refundStatus != ''"
>
and refund_status = #{refundStatus},
</if>
<if
test=
"refundReason != null and refundReason != ''"
>
and refund_reason = #{refundReason},
</if>
<if
test=
"refundReasonTime != null and refundReasonTime != ''"
>
and refund_reason_time = #{refundReasonTime},
</if>
<if
test=
"refundPrice != null and refundPrice != ''"
>
and refund_price = #{refundPrice},
</if>
<if
test=
"isDelete != null and isDelete != ''"
>
and is_delete = #{isDelete},
</if>
<if
test=
"createBy != null and createBy != ''"
>
and create_by = #{createBy},
</if>
<if
test=
"createTime != null and createTime != ''"
>
and create_time = #{createTime},
</if>
<if
test=
"updateBy != null and updateBy != ''"
>
and update_by = #{updateBy},
</if>
<if
test=
"updateTime != null and updateTime != ''"
>
and update_time = #{updateTime},
</if>
<if
test=
"remark != null and remark != ''"
>
and remark = #{remark},
</if>
</where>
</where>
</select>
</select>
...
@@ -65,80 +101,101 @@
...
@@ -65,80 +101,101 @@
<insert
id=
"insertSOrder"
parameterType=
"SOrder"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
<insert
id=
"insertSOrder"
parameterType=
"SOrder"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
insert into s_order
insert into s_order
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"orderType != null"
>
order_type,
</if>
<if
test=
"orderNo != null"
>
order_no = #{orderNo},
</if>
<if
test=
"serialNumber != null"
>
serial_number,
</if>
<if
test=
"orderType != null"
>
order_type = #{orderType},
</if>
<if
test=
"consumerId != null"
>
consumer_id,
</if>
<if
test=
"payType != null"
>
pay_type = #{payType},
</if>
<if
test=
"consumerName != null"
>
consumer_name,
</if>
<if
test=
"payStatus != null"
>
pay_status = #{payStatus},
</if>
<if
test=
"description != null"
>
description,
</if>
<if
test=
"storeId != null"
>
store_id = #{storeId},
</if>
<if
test=
"originalPrice != null"
>
original_price,
</if>
<if
test=
"roomId != null"
>
room_id = #{roomId},
</if>
<if
test=
"payWays != null"
>
pay_ways,
</if>
<if
test=
"consumerId != null"
>
consumer_id = #{consumerId},
</if>
<if
test=
"realPrice != null"
>
real_price,
</if>
<if
test=
"consumerName != null"
>
consumer_name = #{consumerName},
</if>
<if
test=
"isUseCoupon != null"
>
is_use_coupon,
</if>
<if
test=
"consumerPhone != null"
>
consumer_phone = #{consumerPhone},
</if>
<if
test=
"couponType != null"
>
coupon_type,
</if>
<if
test=
"packId != null"
>
pack_id = #{packId},
</if>
<if
test=
"couponName != null"
>
coupon_name,
</if>
<if
test=
"packPrice != null"
>
pack_price = #{packPrice},
</if>
<if
test=
"couponId != null"
>
coupon_id,
</if>
<if
test=
"couponId != null"
>
coupon_id = #{couponId},
</if>
<if
test=
"status != null"
>
status,
</if>
<if
test=
"couponPrice != null"
>
coupon_price = #{couponPrice},
</if>
<if
test=
"startDate != null"
>
start_date,
</if>
<if
test=
"totalPrice != null"
>
total_price = #{totalPrice},
</if>
<if
test=
"endDate != null"
>
end_date,
</if>
<if
test=
"payPrice != null"
>
pay_price = #{payPrice},
</if>
<if
test=
"createBy != null"
>
create_by,
</if>
<if
test=
"payTime != null"
>
pay_time = #{payTime},
</if>
<if
test=
"createTime != null"
>
create_time,
</if>
<if
test=
"timeLong != null"
>
time_long = #{timeLong},
</if>
<if
test=
"updateBy != null"
>
update_by,
</if>
<if
test=
"preStartDate != null"
>
pre_start_date = #{preStartDate},
</if>
<if
test=
"updateTime != null"
>
update_time,
</if>
<if
test=
"preEndDate != null"
>
pre_end_date = #{preEndDate},
</if>
<if
test=
"remark != null"
>
remark,
</if>
<if
test=
"startDate != null"
>
start_date = #{startDate},
</if>
<if
test=
"preStartDate != null"
>
pre_start_date,
</if>
<if
test=
"endDate != null"
>
end_date = #{endDate},
</if>
<if
test=
"preEndDate != null"
>
pre_end_date,
</if>
<if
test=
"status != null"
>
status = #{status},
</if>
<if
test=
"refundStatus != null"
>
refund_status = #{refundStatus},
</if>
<if
test=
"refundReason != null"
>
refund_reason = #{refundReason},
</if>
<if
test=
"refundReasonTime != null"
>
refund_reason_time = #{refundReasonTime},
</if>
<if
test=
"refundPrice != null"
>
refund_price = #{refundPrice},
</if>
<if
test=
"isDelete != null"
>
is_delete = #{isDelete},
</if>
<if
test=
"createBy != null"
>
create_by = #{createBy},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"orderType != null"
>
#{orderType},
</if>
<if
test=
"orderNo != null"
>
#{orderNo},
</if>
<if
test=
"serialNumber != null"
>
#{serialNumber},
</if>
<if
test=
"orderType != null"
>
#{orderType},
</if>
<if
test=
"consumerId != null"
>
#{consumerId},
</if>
<if
test=
"payType != null"
>
#{payType},
</if>
<if
test=
"consumerName != null"
>
#{consumerName},
</if>
<if
test=
"payStatus != null"
>
#{payStatus},
</if>
<if
test=
"description != null"
>
#{description},
</if>
<if
test=
"storeId != null"
>
#{storeId},
</if>
<if
test=
"originalPrice != null"
>
#{originalPrice},
</if>
<if
test=
"roomId != null"
>
#{roomId},
</if>
<if
test=
"payWays != null"
>
#{payWays},
</if>
<if
test=
"consumerId != null"
>
#{consumerId},
</if>
<if
test=
"realPrice != null"
>
#{realPrice},
</if>
<if
test=
"consumerName != null"
>
#{consumerName},
</if>
<if
test=
"isUseCoupon != null"
>
#{isUseCoupon},
</if>
<if
test=
"consumerPhone != null"
>
#{consumerPhone},
</if>
<if
test=
"couponType != null"
>
#{couponType},
</if>
<if
test=
"packId != null"
>
#{packId},
</if>
<if
test=
"couponName != null"
>
#{couponName},
</if>
<if
test=
"packPrice != null"
>
#{packPrice},
</if>
<if
test=
"couponId != null"
>
#{couponId},
</if>
<if
test=
"couponId != null"
>
#{couponId},
</if>
<if
test=
"status != null"
>
#{status},
</if>
<if
test=
"couponPrice != null"
>
#{couponPrice},
</if>
<if
test=
"startDate != null"
>
#{startDate},
</if>
<if
test=
"totalPrice != null"
>
#{totalPrice},
</if>
<if
test=
"endDate != null"
>
#{endDate},
</if>
<if
test=
"payPrice != null"
>
#{payPrice},
</if>
<if
test=
"createBy != null"
>
#{createBy},
</if>
<if
test=
"payTime != null"
>
#{payTime},
</if>
<if
test=
"createTime != null"
>
#{createTime},
</if>
<if
test=
"timeLong != null"
>
#{timeLong},
</if>
<if
test=
"updateBy != null"
>
#{updateBy},
</if>
<if
test=
"preStartDate != null"
>
#{preStartDate},
</if>
<if
test=
"updateTime != null"
>
#{updateTime},
</if>
<if
test=
"preEndDate != null"
>
#{preEndDate},
</if>
<if
test=
"remark != null"
>
#{remark},
</if>
<if
test=
"startDate != null"
>
#{startDate},
</if>
<if
test=
"preStartDate != null"
>
#{preStartDate},
</if>
<if
test=
"endDate != null"
>
#{endDate},
</if>
<if
test=
"preEndDate != null"
>
#{preEndDate},
</if>
<if
test=
"status != null"
>
#{status},
</if>
<if
test=
"refundStatus != null"
>
#{refundStatus},
</if>
<if
test=
"refundReason != null"
>
#{refundReason},
</if>
<if
test=
"refundReasonTime != null"
>
#{refundReasonTime},
</if>
<if
test=
"refundPrice != null"
>
#{refundPrice},
</if>
<if
test=
"isDelete != null"
>
0,
</if>
<if
test=
"createBy != null"
>
#{createBy},
</if>
<if
test=
"createTime != null"
>
NOW(),
</if>
</trim>
</trim>
</insert>
</insert>
<update
id=
"updateSOrder"
parameterType=
"SOrder"
>
<update
id=
"updateSOrder"
parameterType=
"SOrder"
>
update s_order
update s_order
<trim
prefix=
"SET"
suffixOverrides=
","
>
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"orderType != null"
>
order_type = #{orderType},
</if>
<if
test=
"orderNo != null"
>
order_no = #{orderNo},
</if>
<if
test=
"serialNumber != null"
>
serial_number = #{serialNumber},
</if>
<if
test=
"orderType != null"
>
order_type = #{orderType},
</if>
<if
test=
"consumerId != null"
>
consumer_id = #{consumerId},
</if>
<if
test=
"payType != null"
>
pay_type = #{payType},
</if>
<if
test=
"consumerName != null"
>
consumer_name = #{consumerName},
</if>
<if
test=
"payStatus != null"
>
pay_status = #{payStatus},
</if>
<if
test=
"description != null"
>
description = #{description},
</if>
<if
test=
"storeId != null"
>
store_id = #{storeId},
</if>
<if
test=
"originalPrice != null"
>
original_price = #{originalPrice},
</if>
<if
test=
"roomId != null"
>
room_id = #{roomId},
</if>
<if
test=
"payWays != null"
>
pay_ways = #{payWays},
</if>
<if
test=
"consumerId != null"
>
consumer_id = #{consumerId},
</if>
<if
test=
"realPrice != null"
>
real_price = #{realPrice},
</if>
<if
test=
"consumerName != null"
>
consumer_name = #{consumerName},
</if>
<if
test=
"isUseCoupon != null"
>
is_use_coupon = #{isUseCoupon},
</if>
<if
test=
"consumerPhone != null"
>
consumer_phone = #{consumerPhone},
</if>
<if
test=
"couponType != null"
>
coupon_type = #{couponType},
</if>
<if
test=
"packId != null"
>
pack_id = #{packId},
</if>
<if
test=
"couponName != null"
>
coupon_name = #{couponName},
</if>
<if
test=
"packPrice != null"
>
pack_price = #{packPrice},
</if>
<if
test=
"couponId != null"
>
coupon_id = #{couponId},
</if>
<if
test=
"couponId != null"
>
coupon_id = #{couponId},
</if>
<if
test=
"status != null"
>
status = #{status},
</if>
<if
test=
"couponPrice != null"
>
coupon_price = #{couponPrice},
</if>
<if
test=
"startDate != null"
>
start_date = #{startDate},
</if>
<if
test=
"totalPrice != null"
>
total_price = #{totalPrice},
</if>
<if
test=
"endDate != null"
>
end_date = #{endDate},
</if>
<if
test=
"payPrice != null"
>
pay_price = #{payPrice},
</if>
<if
test=
"createBy != null"
>
create_by = #{createBy},
</if>
<if
test=
"payTime != null"
>
pay_time = #{payTime},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
<if
test=
"timeLong != null"
>
time_long = #{timeLong},
</if>
<if
test=
"updateBy != null"
>
update_by = #{updateBy},
</if>
<if
test=
"preStartDate != null"
>
pre_start_date = #{preStartDate},
</if>
<if
test=
"updateTime != null"
>
update_time = #{updateTime},
</if>
<if
test=
"preEndDate != null"
>
pre_end_date = #{preEndDate},
</if>
<if
test=
"remark != null"
>
remark = #{remark},
</if>
<if
test=
"startDate != null"
>
start_date = #{startDate},
</if>
<if
test=
"preStartDate != null"
>
pre_start_date = #{preStartDate},
</if>
<if
test=
"endDate != null"
>
end_date = #{endDate},
</if>
<if
test=
"preEndDate != null"
>
pre_end_date = #{preEndDate},
</if>
<if
test=
"status != null"
>
status = #{status},
</if>
<if
test=
"refundStatus != null"
>
refund_status = #{refundStatus},
</if>
<if
test=
"refundReason != null"
>
refund_reason = #{refundReason},
</if>
<if
test=
"refundReasonTime != null"
>
refund_reason_time = #{refundReasonTime},
</if>
<if
test=
"refundPrice != null"
>
refund_price = #{refundPrice},
</if>
<if
test=
"isDelete != null"
>
is_delete = #{isDelete},
</if>
<if
test=
"updateBy != null"
>
update_by = #{updateBy},
</if>
<if
test=
"updateTime != null"
>
update_time = NOW(),
</if>
</trim>
</trim>
where id = #{id}
where id = #{id}
</update>
</update>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment