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
5dd55333
Commit
5dd55333
authored
Mar 01, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改原来的保洁短信
parent
f71e95e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
RedisTask.java
share-quartz/src/main/java/share/quartz/task/RedisTask.java
+4
-4
SCleanRecordsServiceImpl.java
...a/share/system/service/impl/SCleanRecordsServiceImpl.java
+10
-10
SOrderServiceImpl.java
...ain/java/share/system/service/impl/SOrderServiceImpl.java
+9
-9
No files found.
share-quartz/src/main/java/share/quartz/task/RedisTask.java
View file @
5dd55333
...
...
@@ -242,10 +242,10 @@ public class RedisTask {
//推送订单结束消息
wechatNewService
.
sendMiniSubscribeMessage
(
sOrder
,
MessageReminderEnum
.
END
);
//通知保洁人员
//
sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
//
// 循环发送短信提示门店保洁打扫卫生
//
smsService.sendSmsCleanRecordsRemind15(item.getPhone(), sStore, sRoom);
//
});
sConsumerService
.
selectListByStoreId
(
sOrder
.
getStoreId
()).
stream
().
forEach
(
item
->
{
// 循环发送短信提示门店保洁打扫卫生
smsService
.
sendSmsCleanRecordsRemind15
(
item
.
getPhone
(),
sStore
,
sRoom
);
});
return
;
}
//判断时间是否在5分钟到4分钟
...
...
share-system/src/main/java/share/system/service/impl/SCleanRecordsServiceImpl.java
View file @
5dd55333
...
...
@@ -152,11 +152,11 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
sCleanRecords
.
setStatus
(
0
);
sCleanRecords
.
setCreateTime
(
DateUtils
.
getNowDate
());
boolean
b
=
0
<
baseMapper
.
insertSCleanRecords
(
sCleanRecords
);
//
if (b) {
//
SStore store = sStoreMapper.selectSStoreById(storeId);
//
SRoom room = sRoomMapper.selectSRoomById(roomId);
//
sendSms(storeId, store, room);
//
}
if
(
b
)
{
SStore
store
=
sStoreMapper
.
selectSStoreById
(
storeId
);
SRoom
room
=
sRoomMapper
.
selectSRoomById
(
roomId
);
sendSms
(
storeId
,
store
,
room
);
}
return
b
;
}
...
...
@@ -366,7 +366,7 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
if
(
consumer
.
getId
().
equals
(
item
.
getConsumerId
()))
{
room
.
setIsDirtyRoom
(
YesNoEnum
.
yes
.
getIndex
());
dirtyRoomList
.
add
(
room
);
//
smsService.sendSmsCleanRecords(consumer.getPhone(), store, room);
smsService
.
sendSmsCleanRecords
(
consumer
.
getPhone
(),
store
,
room
);
}
});
}
...
...
@@ -492,10 +492,10 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
}
private
void
sendSms
(
Long
storeId
,
SStore
store
,
SRoom
room
)
{
//
sConsumerMapper.selectListByStoreId(storeId).stream().forEach(item -> {
//
// 循环发送短信提示门店保洁打扫卫生
//
smsService.sendSmsCleanRecords(item.getPhone(), store, room);
//
});
sConsumerMapper
.
selectListByStoreId
(
storeId
).
stream
().
forEach
(
item
->
{
// 循环发送短信提示门店保洁打扫卫生
smsService
.
sendSmsCleanRecords
(
item
.
getPhone
(),
store
,
room
);
});
}
}
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
View file @
5dd55333
...
...
@@ -605,10 +605,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
cn
.
hutool
.
core
.
date
.
DateUtil
.
format
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
offsetMinute
(
new
Date
(),
1
),
DatePattern
.
NORM_DATETIME_PATTERN
),
"1"
);
SRoom
sRoom
=
roomService
.
getById
(
sOrder
.
getRoomId
());
//通知保洁人员
//
sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
//
// 循环发送短信提示门店保洁打扫卫生
//
smsService.sendSmsCleanRecordsStopRemind(item.getPhone(), stores.stream().filter(store -> store.getId().equals(request.getStoreId())).findFirst().get(), sRoom);
//
});
sConsumerService
.
selectListByStoreId
(
sOrder
.
getStoreId
()).
stream
().
forEach
(
item
->
{
// 循环发送短信提示门店保洁打扫卫生
smsService
.
sendSmsCleanRecordsStopRemind
(
item
.
getPhone
(),
stores
.
stream
().
filter
(
store
->
store
.
getId
().
equals
(
request
.
getStoreId
())).
findFirst
().
get
(),
sRoom
);
});
}
}
Map
<
String
,
String
>
map
=
new
HashMap
<>();
...
...
@@ -1036,12 +1036,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
deviceOpService
.
actionExecute
(
sOrder
.
getRoomId
(),
sOrder
.
getConsumerPhone
(),
VoiceEnum
.
RENEWAL_SUCCESS
.
getCode
(),
cn
.
hutool
.
core
.
date
.
DateUtil
.
format
(
new
Date
(),
DatePattern
.
NORM_DATETIME_PATTERN
),
cn
.
hutool
.
core
.
date
.
DateUtil
.
format
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
offsetMinute
(
new
Date
(),
1
),
DatePattern
.
NORM_DATETIME_PATTERN
),
"1"
);
//
SRoom sRoom = roomService.getById(sOrder.getRoomId());
SRoom
sRoom
=
roomService
.
getById
(
sOrder
.
getRoomId
());
//通知保洁人员
//
sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
//
// 循环发送短信提示门店保洁打扫卫生
//
smsService.sendSmsCleanRecordsStopRemind(item.getPhone(), sStore, sRoom);
//
});
sConsumerService
.
selectListByStoreId
(
sOrder
.
getStoreId
()).
stream
().
forEach
(
item
->
{
// 循环发送短信提示门店保洁打扫卫生
smsService
.
sendSmsCleanRecordsStopRemind
(
item
.
getPhone
(),
sStore
,
sRoom
);
});
}
sConsumptionRecordsService
.
insertSConsumptionRecords
(
sOrder
);
}
...
...
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