Skip to content

G
gxpt_ht
Commit 34209c26 by 吕明尚
Options

保洁、管理员、客服短信和公众号消息分开

parent 07bc5910
Showing with 60 additions and 30 deletions
share-front/src/main/java/share/web/controller/system/WeChatController.java
......@@ -12,10 +12,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import share.common.core.domain.R;
import share.common.core.redis.RedisUtil;
import share.common.enums.MessageReminderEnum;
import share.common.utils.JsonConvertUtil;
import share.system.domain.SConsumerToken;
import share.system.domain.SOrder;
import share.system.domain.TemplateMessage;
import share.system.request.RegisterThirdSConsumerRequest;
import share.system.request.WxBindingPhoneRequest;
......@@ -199,13 +197,13 @@ public class WeChatController {
logger.debug("更新完成的消费者令牌列表: {}", sConsumerTokenList);
}
@GetMapping("/test1")
public void test(String orderNo) {
SOrder byOrderN = sOrderService.getByOrderNo(orderNo);
wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.CLEANING, byOrderN.getConsumerId());
wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.ORDER_RESERVE, byOrderN.getConsumerId());
}
// @GetMapping("/test1")
// public void test(String orderNo) {
// SOrder byOrderN = sOrderService.getByOrderNo(orderNo);
// wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.CLEANING, byOrderN.getConsumerId());
// wechatNewService.sendPublicTemplateMessage(byOrderN, MessageReminderEnum.ORDER_RESERVE, byOrderN.getConsumerId());
//
// }
}
......
share-quartz/src/main/java/share/quartz/task/RedisTask.java
......@@ -296,10 +296,14 @@ public class RedisTask {
logger.debug("保洁工单派单通知发送开始");
//通知保洁人员
sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
// 循环发送短信提示门店保洁打扫卫生
smsService.sendSmsCleanRecordsRemind15(item.getPhone(), sStore, sRoom);
//公众号发送保洁工单派单通知
wechatNewService.sendPublicTemplateMessage(finalSOrder, MessageReminderEnum.CLEANING, item.getId());
if (item.getTextMessage().equals(YesNoEnum.yes.getIndex())) {
// 循环发送短信提示门店保洁打扫卫生
smsService.sendSmsCleanRecordsRemind15(item.getPhone(), sStore, sRoom);
}
if (item.getOfficialAccount().equals(YesNoEnum.yes.getIndex())) {
//公众号发送保洁工单派单通知
wechatNewService.sendPublicTemplateMessage(finalSOrder, MessageReminderEnum.CLEANING, item.getId());
}
});
logger.debug("保洁工单派单通知发送结束");
return;
......
share-system/src/main/java/share/system/domain/SConsumer.java
......@@ -108,4 +108,10 @@ public class SConsumer implements Serializable
@TableField(exist = false)
private Integer position;
@TableField(exist = false)
private Integer textMessage;
@TableField(exist = false)
private Integer officialAccount;
}
share-system/src/main/java/share/system/domain/SStoreConsumer.java
......@@ -18,10 +18,10 @@ public class SStoreConsumer {
private Integer position;
//电控 是否接收公众号
//电控
private Integer controller;
//门控 是否接收短信
//门控
private Integer gating;
//是否接收短信
private Integer textMessage;
......
share-system/src/main/java/share/system/domain/vo/SConsumerVo.java
......@@ -29,6 +29,10 @@ public class SConsumerVo extends SConsumer {
private Integer controller;
private Integer gating;
//是否接收短信
private Integer textMessage;
//是否接收公众号
private Integer officialAccount;
private ConsumerMember consumerMember;
......
share-system/src/main/java/share/system/service/impl/SCleanRecordsServiceImpl.java
......@@ -526,8 +526,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);
if (item.getTextMessage().equals(YesNoEnum.yes.getIndex())) {
// 循环发送短信提示门店保洁打扫卫生
smsService.sendSmsCleanRecords(item.getPhone(), store, room);
}
});
}
......
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
......@@ -977,8 +977,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
// 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(), room);
if (item.getTextMessage().equals(YesNoEnum.yes.getIndex())) {
// 循环发送短信提示门店保洁打扫卫生
smsService.sendSmsCleanRecordsStopRemind(item.getPhone(), stores.stream().filter(store -> store.getId().equals(request.getStoreId())).findFirst().get(), room);
}
});
}
}
......@@ -1039,10 +1041,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
consumers.forEach(o -> {
SStoreConsumer sStoreConsumer = consumerMap.get(o.getId());
if (ObjectUtil.isNotEmpty(sStoreConsumer)) {
if (sStoreConsumer.getGating().equals(YesNoEnum.yes.getIndex())) {
if (sStoreConsumer.getTextMessage().equals(YesNoEnum.yes.getIndex())) {
phones.add(o.getPhone());
}
if (sStoreConsumer.getController().equals(YesNoEnum.yes.getIndex())) {
if (sStoreConsumer.getOfficialAccount().equals(YesNoEnum.yes.getIndex())) {
//公众号发送订单预订成功通知
wechatNewService.sendPublicTemplateMessage(sOrder, MessageReminderEnum.ORDER_RESERVE, o.getId());
}
......@@ -1966,8 +1968,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
DeviceOpSourceEnum.DEVICE_SOURCE_20.getCode());
//通知保洁人员
sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
// 循环发送短信提示门店保洁打扫卫生
smsService.sendSmsCleanRecordsStopRemind(item.getPhone(), sStore, sRoom);
if (item.getTextMessage().equals(YesNoEnum.yes.getIndex())) {
// 循环发送短信提示门店保洁打扫卫生
smsService.sendSmsCleanRecordsStopRemind(item.getPhone(), sStore, sRoom);
}
});
deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(), OpTypeEnum.GET_ELECTRIC.getCode(), true, 5L,
DeviceOpSourceEnum.DEVICE_SOURCE_20.getCode());
......@@ -1990,10 +1994,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
consumers.forEach(o -> {
SStoreConsumer sStoreConsumer = consumerMap.get(o.getId());
if (ObjectUtil.isNotEmpty(sStoreConsumer)) {
if (sStoreConsumer.getGating().equals(YesNoEnum.yes.getIndex())) {
if (sStoreConsumer.getTextMessage().equals(YesNoEnum.yes.getIndex())) {
phones.add(o.getPhone());
}
if (sStoreConsumer.getController().equals(YesNoEnum.yes.getIndex())) {
if (sStoreConsumer.getOfficialAccount().equals(YesNoEnum.yes.getIndex())) {
//公众号发送订单预订成功通知
wechatNewService.sendPublicTemplateMessage(sOrder, MessageReminderEnum.ORDER_RESERVE, o.getId());
}
......
share-system/src/main/resources/mapper/system/SConsumerMapper.xml
......@@ -26,6 +26,8 @@
<result property="controller" column="controller"/>
<result property="gating" column="gating"/>
<result property="position" column="position"/>
<result property="textMessage" column="text_message"/>
<result property="officialAccount" column="official_account"/>
</resultMap>
<sql id="selectSConsumerVo">
......@@ -112,7 +114,15 @@
t1.sex,
t1.addres,
t1.amount,
t1.free_amount, t1.total_times, t1.duration, t1.status, t1.pwd, t1.create_time, t1.last_login_time
t1.free_amount,
t1.total_times,
t1.duration,
t1.status,
t1.pwd,
t1.create_time,
t1.last_login_time,
t2.text_message,
t2.official_account
from s_consumer t1
left join s_store_consumer t2 on t2.consumer_id = t1.id
where t1.role_type = '1'
......
share-system/src/main/resources/mapper/system/SStoreConsumerMapper.xml
......@@ -15,10 +15,12 @@
</resultMap>
<update id="updateBySStoreConsumer">
update s_store_consumer
set controller = #{controller},
gating = #{gating},
text_message = #{textMessage},
official_account = #{officialAccount}
<trim prefix="SET" suffixOverrides=",">
<if test="controller != null">controller = #{controller},</if>
<if test="gating != null">gating = #{gating},</if>
<if test="textMessage != null">text_message = #{textMessage},</if>
<if test="officialAccount != null">official_account = #{officialAccount},</if>
</trim>
where store_id = #{storeId}
and consumer_id = #{consumerId}
and position = #{position}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment