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
cbf2ae17
Commit
cbf2ae17
authored
Nov 15, 2023
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
2dd524be
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
2 deletions
+44
-2
SCleanRecords.java
...stem/src/main/java/share/system/domain/SCleanRecords.java
+4
-0
SOrder.java
share-system/src/main/java/share/system/domain/SOrder.java
+16
-0
SOrderServiceImpl.java
...ain/java/share/system/service/impl/SOrderServiceImpl.java
+23
-1
SConsumerCouponMapper.xml
...rc/main/resources/mapper/system/SConsumerCouponMapper.xml
+1
-1
No files found.
share-system/src/main/java/share/system/domain/SCleanRecords.java
View file @
cbf2ae17
...
...
@@ -56,19 +56,23 @@ public class SCleanRecords extends BaseEntity
/**
* 门店名称
*/
@TableField
(
exist
=
false
)
private
String
storeName
;
/**
* 房间名称
*/
@TableField
(
exist
=
false
)
private
String
roomName
;
/**
* 保洁员姓名
*/
@TableField
(
exist
=
false
)
private
String
cleanName
;
/**
* 保洁员手机号
*/
@TableField
(
exist
=
false
)
private
String
phone
;
@TableField
(
exist
=
false
)
...
...
share-system/src/main/java/share/system/domain/SOrder.java
View file @
cbf2ae17
...
...
@@ -138,4 +138,20 @@ public class SOrder extends BaseEntity
@TableField
(
exist
=
false
)
private
Integer
buyType
;
//优惠卷名称
@TableField
(
exist
=
false
)
private
String
couponName
;
//套餐名称
@TableField
(
exist
=
false
)
private
String
packName
;
//门店名称
@TableField
(
exist
=
false
)
private
String
storeName
;
//房间名称
@TableField
(
exist
=
false
)
private
String
roomName
;
}
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
View file @
cbf2ae17
...
...
@@ -105,7 +105,29 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper,SOrder> implemen
@Override
public
List
<
SOrder
>
selectSOrderList
(
SOrder
sOrder
)
{
return
sOrderMapper
.
selectSOrderList
(
sOrder
);
List
<
SOrder
>
sOrders
=
sOrderMapper
.
selectSOrderList
(
sOrder
);
if
(
CollectionUtils
.
isNotEmpty
(
sOrders
))
{
sOrders
.
stream
().
forEach
(
item
->
{
if
(
ObjectUtil
.
isNotNull
(
item
.
getCouponId
()))
{
SConsumerCoupon
byId
=
consumerCouponService
.
getById
(
item
.
getCouponId
());
item
.
setCouponName
(
byId
.
getName
());
}
if
(
ObjectUtil
.
isNotNull
(
item
.
getPackId
()))
{
SPack
byId
=
packService
.
getById
(
item
.
getPackId
());
item
.
setPackName
(
byId
.
getName
());
}
if
(
ObjectUtil
.
isNotNull
(
item
.
getStoreId
()))
{
SStore
byId
=
storeService
.
getById
(
item
.
getStoreId
());
item
.
setStoreName
(
byId
.
getName
());
}
if
(
ObjectUtil
.
isNotNull
(
item
.
getRoomId
()))
{
SRoom
byId
=
roomService
.
getById
(
item
.
getRoomId
());
item
.
setRoomName
(
byId
.
getName
());
}
});
}
return
sOrders
;
}
/**
...
...
share-system/src/main/resources/mapper/system/SConsumerCouponMapper.xml
View file @
cbf2ae17
...
...
@@ -153,7 +153,7 @@
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"consumerId != null"
>
#{consumerId},
</if>
<if
test=
"couponId != null"
>
#{couponId},
</if>
<if
test=
"dealId != null"
>
#{dealId}
</if>
<if
test=
"dealId != null"
>
#{dealId}
,
</if>
<if
test=
"couponCode != null and couponCode != ''"
>
#{couponCode},
</if>
<if
test=
"name != null and name != ''"
>
#{name},
</if>
<if
test=
"couponType != null"
>
#{couponType},
</if>
...
...
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