From 10d1eea607095b82a1379b10b176ef7fe6e5cb5e Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 10 Dec 2020 18:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=20=E9=A1=BA?=
 =?UTF-8?q?=E9=81=93=E6=8D=8E=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groupbuy/service/impl/GroupBuyInfoServiceImpl.java   | 5 +++--
 .../modules/sds/service/impl/SdsInfoServiceImpl.java     | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java
index a78764bb..f0a2b32f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java
@@ -268,14 +268,15 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
         entity.setShieldReason(formDto.getShieldReason());
         entity.setShieldFlag(NumConstant.ONE_STR);
         updateById(entity);
+        GroupBuyInfoEntity entityDetail = selectById(formDto.getId());
         //更新结束后发消息通知到用户
         EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
         informationFormDTO.setType(SdsPtgNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
-        informationFormDTO.setUserId(entity.getUserId());
+        informationFormDTO.setUserId(entityDetail.getUserId());
         informationFormDTO.setContent("您的拼团购内容被屏蔽，屏蔽原因："+formDto.getShieldReason());
         informationFormDTO.setTitle(SdsPtgNoticeConstant.NOTICE_PTG_DELETE);
         informationFormDTO.setBusinessType(SdsPtgNoticeConstant.NOTICE_BUSINESS_TYPE_SDS_PTG);
-        informationFormDTO.setBusinessId(entity.getId());
+        informationFormDTO.setBusinessId(entityDetail.getId());
         // 发送消息
         newsTask.insertUserInformation(informationFormDTO);
         return new Result();
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java
index 58d6fdd5..d9f46ad5 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java
@@ -133,7 +133,7 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
         EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
         informationFormDTO.setType(SdsPtgNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
         informationFormDTO.setUserId(dto.getUserId());
-        informationFormDTO.setContent("您的拼团购内容被修改，请注意查看。");
+        informationFormDTO.setContent("您的顺道捎内容被修改，请注意查看。");
         informationFormDTO.setTitle(SdsPtgNoticeConstant.NOTICE_SDS_UPDATE);
         informationFormDTO.setBusinessType(SdsPtgNoticeConstant.NOTICE_BUSINESS_TYPE_SDS_PTG);
         informationFormDTO.setBusinessId(entity.getId());
@@ -269,14 +269,15 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
         entity.setShieldReason(formDto.getShieldReason());
         entity.setShieldFlag(NumConstant.ONE_STR);
         updateById(entity);
+        SdsInfoEntity entityDetail = selectById(formDto.getId());
         //更新结束后发消息通知到用户
         EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
         informationFormDTO.setType(SdsPtgNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
-        informationFormDTO.setUserId(entity.getUserId());
-        informationFormDTO.setContent("您的拼团购内容被屏蔽，屏蔽原因："+formDto.getShieldReason());
+        informationFormDTO.setUserId(entityDetail.getUserId());
+        informationFormDTO.setContent("您的顺道捎内容被屏蔽，屏蔽原因："+formDto.getShieldReason());
         informationFormDTO.setTitle(SdsPtgNoticeConstant.NOTICE_SDS_DELETE);
         informationFormDTO.setBusinessType(SdsPtgNoticeConstant.NOTICE_BUSINESS_TYPE_SDS_PTG);
-        informationFormDTO.setBusinessId(entity.getId());
+        informationFormDTO.setBusinessId(entityDetail.getId());
         // 发送消息
         newsTask.insertUserInformation(informationFormDTO);
         return new Result();