Browse Source

顺道捎 拼团购PC端代码

feature/syp_points
songyunpeng 5 years ago
parent
commit
31c76061c6
  1. 1
      esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/rocketmq/producer/PointsProducer.java
  2. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
  3. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml
  4. 36
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java
  5. 31
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SdsPtgShieldFormDTO.java
  6. 33
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java
  7. 32
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java
  8. 21
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java
  9. 15
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java
  10. 9
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java
  11. 49
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java
  12. 15
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/controller/SdsInfoController.java
  13. 9
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/SdsInfoService.java
  14. 51
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java
  15. 3
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml

1
esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/rocketmq/producer/PointsProducer.java

@ -35,6 +35,7 @@ public class PointsProducer {
log.info("积分埋点发送消息结果:{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId());
} catch (Exception e) {
log.error("积分埋点发送消息异常:{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body);
log.error(e.getMessage());
e.printStackTrace();
}
}

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@ -230,6 +230,10 @@ public class CustomServiceImpl implements CustomService {
@Override
public Result<List<EpdcSelectSdsInfoListResultDTO>> getSdsList(TokenDto tokenDto,EpdcSelectSdsInfoListFormDTO formDTO) {
if(StringUtils.isBlank(tokenDto.getUserId())){
return new Result<List<EpdcSelectSdsInfoListResultDTO>>().error("无效的token");
}
formDTO.setUserId(tokenDto.getUserId());
return customFeignClient.getSdsList(formDTO);
}

5
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml

@ -18,6 +18,11 @@
<artifactId>epdc-commons-tools</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-news-client</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
<build>

36
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java

@ -0,0 +1,36 @@
package com.elink.esua.epdc.constant;
/**
* 发送消息常量
* @Author syp
* @Date 2020/12/7 17:26
*/
public interface SdsPtgNoticeConstant {
/**
* 顺道捎-被修改
*/
String NOTICE_SDS_UPDATE = "顺道捎【内容修改】";
/**
* 顺道捎-被删除
*/
String NOTICE_SDS_DELETE = "顺道捎【被屏蔽】";
/**
* 拼团购-被修改
*/
String NOTICE_PTG_UPDATE = "拼团购【内容修改】";
/**
* 拼团购-被删除
*/
String NOTICE_PTG_DELETE = "拼团购【被屏蔽】";
/**
* 消息所属业务类型SDS_PTG
*/
String NOTICE_BUSINESS_TYPE_SDS_PTG= "sds_ptg";
/**
* 我的消息类型1互动通知
*/
String NOTICE_TYPE_INTERACTIVE_NOTICE = "1";
}

31
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SdsPtgShieldFormDTO.java

@ -0,0 +1,31 @@
package com.elink.esua.epdc.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.io.Serializable;
/**
* 顺道捎拼团购屏蔽表单
*
* @author Liuchuang
* @since 2020/10/23 17:01
*/
@Data
public class SdsPtgShieldFormDTO implements Serializable {
private static final long serialVersionUID = -3686477439903152467L;
/**
* 举报问题ID
*/
@NotBlank(message = "记录ID不能为空")
private String id;
/**
* 屏蔽原因
*/
@NotBlank(message = "屏蔽原因不能为空")
@Size(min = 1, max = 100, message = "屏蔽原因不能为空且在100个字以内")
private String shieldReason;
}

33
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java

@ -0,0 +1,33 @@
package com.elink.esua.epdc.async;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.modules.feign.NewsFeignClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
/**
* 新闻通知消息模块 线程任务
*
* @author work@yujt.net.cn
* @date 2019/9/18 15:39
*/
@Component
public class NewsTask {
@Autowired
private NewsFeignClient newsFeignClient;
/**
* 给用户发送消息
*
* @param informationDto
* @return void
* @author work@yujt.net.cn
* @date 2019/9/18 15:39
*/
@Async
public void insertUserInformation(EpdcInformationFormDTO informationDto) {
newsFeignClient.saveInformation(informationDto);
}
}

32
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java

@ -0,0 +1,32 @@
package com.elink.esua.epdc.modules.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.modules.feign.fallback.NewsFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* 消息模块
*
* @author work@yujt.net.cn
* @date 2019/9/18 15:37
*/
@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class)
public interface NewsFeignClient {
/**
* 给用户发消息
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author work@yujt.net.cn
* @date 2019/9/18 15:40
*/
@PostMapping(value = "news/epdc-app/information/save", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result saveInformation(@RequestBody EpdcInformationFormDTO formDto);
}

21
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java

@ -0,0 +1,21 @@
package com.elink.esua.epdc.modules.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.modules.feign.NewsFeignClient;
import org.springframework.stereotype.Component;
/**
* @author work@yujt.net.cn
* @date 2019/9/18 15:38
*/
@Component
public class NewsFeignClientFallback implements NewsFeignClient {
@Override
public Result saveInformation(EpdcInformationFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "saveInformation", formDto);
}
}

15
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java

@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.GroupBuyInfoDTO;
import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
import com.elink.esua.epdc.modules.groupbuy.excel.GroupBuyInfoExcel;
import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@ -91,4 +92,18 @@ public class GroupBuyInfoController {
ExcelUtils.exportExcelToTarget(response, null, list, GroupBuyInfoExcel.class);
}
/**
* 屏蔽
*
* @param formDto 屏蔽
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author songyunpeng
* @since 2020/12/7 16:41
*/
@PostMapping("shield")
public Result shieldInfo(@RequestBody SdsPtgShieldFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return groupBuyInfoService.modifyGroupBuyShieldFlag(formDto);
}
}

9
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java

@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.GroupBuyInfoDTO;
import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO;
import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO;
import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO;
import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyInfoEntity;
@ -155,4 +156,12 @@ public interface GroupBuyInfoService extends BaseService<GroupBuyInfoEntity> {
* @return void
**/
void modifyOrganizationInfo(OrganizationModifyDTO dto);
/**
* @Description 屏蔽信息
* @Author songyunpeng
* @Date 2020/12/7
* @Param [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result modifyGroupBuyShieldFlag(SdsPtgShieldFormDTO formDto);
}

49
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java

@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.groupbuy.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.async.NewsTask;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@ -31,9 +32,12 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.SdsPtgNoticeConstant;
import com.elink.esua.epdc.dto.GroupBuyInfoDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO;
import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO;
import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
@ -63,6 +67,8 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
@Autowired
private GroupBuyInfoRedis groupBuyInfoRedis;
@Autowired
private NewsTask newsTask;
@Autowired
private AdminFeignClient adminFeignClient;
@ -89,9 +95,17 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
private QueryWrapper<GroupBuyInfoEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
String groupBuyTitle = (String)params.get("groupBuyTitle");
String startTime = (String)params.get("startTime");
String endTime = (String)params.get("endTime");
QueryWrapper<GroupBuyInfoEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.like(StringUtils.isNotBlank(groupBuyTitle), "GROUP_BUY_TITLE", groupBuyTitle.trim());
wrapper.ge(StringUtils.isNotBlank(startTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", startTime);
wrapper.le(StringUtils.isNotBlank(endTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", endTime);
wrapper.orderByAsc("SORT");
wrapper.orderByDesc("CREATED_TIME");
return wrapper;
}
@ -114,6 +128,16 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
public void update(GroupBuyInfoDTO dto) {
GroupBuyInfoEntity entity = ConvertUtils.sourceToTarget(dto, GroupBuyInfoEntity.class);
updateById(entity);
//更新结束后发消息通知到用户
EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
informationFormDTO.setType(SdsPtgNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
informationFormDTO.setUserId(dto.getUserId());
informationFormDTO.setContent("您的拼团购内容被修改,请注意查看。");
informationFormDTO.setTitle(SdsPtgNoticeConstant.NOTICE_PTG_UPDATE);
informationFormDTO.setBusinessType(SdsPtgNoticeConstant.NOTICE_BUSINESS_TYPE_SDS_PTG);
informationFormDTO.setBusinessId(entity.getId());
// 发送消息
newsTask.insertUserInformation(informationFormDTO);
}
@Override
@ -142,6 +166,7 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result publishOrUpdate(EpdcAddGroupBuyInfoFormDTO formDTO) {
//内容审核 - start
Boolean isConReview = formDTO.getIsConReview();
@ -201,12 +226,14 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result deleteGroupBuy(String id) {
this.deleteById(id);
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result callMobile(String id) {
GroupBuyInfoEntity groupBuyInfoEntity = selectById(id);
if(groupBuyInfoEntity==null){
@ -218,6 +245,7 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
}
@Override
@Transactional(rollbackFor = Exception.class)
public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
// 查询需要修改组织机构信息事件
List<GroupBuyInfoDTO> eventsList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
@ -232,6 +260,27 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result modifyGroupBuyShieldFlag(SdsPtgShieldFormDTO formDto) {
GroupBuyInfoEntity entity = new GroupBuyInfoEntity();
entity.setId(formDto.getId());
entity.setShieldReason(formDto.getShieldReason());
entity.setShieldFlag(NumConstant.ONE_STR);
updateById(entity);
//更新结束后发消息通知到用户
EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
informationFormDTO.setType(SdsPtgNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
informationFormDTO.setUserId(entity.getUserId());
informationFormDTO.setContent("您的拼团购内容被屏蔽,屏蔽原因:"+formDto.getShieldReason());
informationFormDTO.setTitle(SdsPtgNoticeConstant.NOTICE_PTG_DELETE);
informationFormDTO.setBusinessType(SdsPtgNoticeConstant.NOTICE_BUSINESS_TYPE_SDS_PTG);
informationFormDTO.setBusinessId(entity.getId());
// 发送消息
newsTask.insertUserInformation(informationFormDTO);
return new Result();
}
@Override
public void rejectActInfo(RejectRecordDTO dto) {
baseDao.deleteById(dto.getRelationId());

15
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/controller/SdsInfoController.java

@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.SdsInfoDTO;
import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
import com.elink.esua.epdc.modules.sds.excel.SdsInfoExcel;
import com.elink.esua.epdc.modules.sds.service.SdsInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@ -90,5 +91,17 @@ public class SdsInfoController {
List<SdsInfoDTO> list = sdsInfoService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, SdsInfoExcel.class);
}
/**
* 屏蔽
*
* @param formDto 屏蔽
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author songyunpeng
* @since 2020/12/7 16:41
*/
@PostMapping("shield")
public Result shieldInfo(@RequestBody SdsPtgShieldFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return sdsInfoService.modifySdsShieldFlag(formDto);
}
}

9
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/SdsInfoService.java

@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.SdsInfoDTO;
import com.elink.esua.epdc.dto.form.EpdcAddSdsFormDTO;
import com.elink.esua.epdc.dto.form.EpdcSelectSdsInfoListFormDTO;
import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoDetailResultDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoListResultDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
@ -155,4 +156,12 @@ public interface SdsInfoService extends BaseService<SdsInfoEntity> {
* @return void
**/
void modifyOrganizationInfo(OrganizationModifyDTO dto);
/**
* @Description 屏蔽
* @Author songyunpeng
* @Date 2020/12/8
* @Param [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result modifySdsShieldFlag(SdsPtgShieldFormDTO formDto);
}

51
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java

@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.sds.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.async.NewsTask;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@ -31,9 +32,12 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.SdsPtgNoticeConstant;
import com.elink.esua.epdc.dto.SdsInfoDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.dto.form.EpdcAddSdsFormDTO;
import com.elink.esua.epdc.dto.form.EpdcSelectSdsInfoListFormDTO;
import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoDetailResultDTO;
import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoListResultDTO;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
@ -67,6 +71,9 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
private AdminFeignClient adminFeignClient;
@Autowired
private NewsTask newsTask;
@Autowired
private ContentSecurityFeignClient contentSecurityFeign;
@ -88,11 +95,20 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
private QueryWrapper<SdsInfoEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
String carryStatus = (String)params.get("carryStatus");
String startTime = (String)params.get("startTime");
String endTime = (String)params.get("endTime");
QueryWrapper<SdsInfoEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.eq(StringUtils.isNotBlank(carryStatus), "CARRY_STATUS", carryStatus);
wrapper.ge(StringUtils.isNotBlank(startTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", startTime);
wrapper.le(StringUtils.isNotBlank(endTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", endTime);
wrapper.orderByAsc("SORT");
wrapper.orderByDesc("CREATED_TIME");
return wrapper;
}
@Override
@ -113,6 +129,16 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
public void update(SdsInfoDTO dto) {
SdsInfoEntity entity = ConvertUtils.sourceToTarget(dto, SdsInfoEntity.class);
updateById(entity);
//更新结束后发消息通知到用户
EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
informationFormDTO.setType(SdsPtgNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
informationFormDTO.setUserId(dto.getUserId());
informationFormDTO.setContent("您的拼团购内容被修改,请注意查看。");
informationFormDTO.setTitle(SdsPtgNoticeConstant.NOTICE_SDS_UPDATE);
informationFormDTO.setBusinessType(SdsPtgNoticeConstant.NOTICE_BUSINESS_TYPE_SDS_PTG);
informationFormDTO.setBusinessId(entity.getId());
// 发送消息
newsTask.insertUserInformation(informationFormDTO);
}
@Override
@ -141,6 +167,7 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result publishOrUpdate(EpdcAddSdsFormDTO formDTO) {
//内容审核 - start
Boolean isConReview = formDTO.getIsConReview();
@ -200,12 +227,14 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result deleteSds(String id) {
this.deleteById(id);
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result callMobile(String id) {
SdsInfoEntity sdsInfoEntity = selectById(id);
if(sdsInfoEntity==null){
@ -217,6 +246,7 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
}
@Override
@Transactional(rollbackFor = Exception.class)
public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
// 查询需要修改组织机构信息事件
List<SdsInfoDTO> eventsList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
@ -231,6 +261,27 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
baseDao.updateGridByDeptId(dto.getNewDeptName(), dto.getDeptId());
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result modifySdsShieldFlag(SdsPtgShieldFormDTO formDto) {
SdsInfoEntity entity = new SdsInfoEntity();
entity.setId(formDto.getId());
entity.setShieldReason(formDto.getShieldReason());
entity.setShieldFlag(NumConstant.ONE_STR);
updateById(entity);
//更新结束后发消息通知到用户
EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
informationFormDTO.setType(SdsPtgNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
informationFormDTO.setUserId(entity.getUserId());
informationFormDTO.setContent("您的拼团购内容被屏蔽,屏蔽原因:"+formDto.getShieldReason());
informationFormDTO.setTitle(SdsPtgNoticeConstant.NOTICE_SDS_DELETE);
informationFormDTO.setBusinessType(SdsPtgNoticeConstant.NOTICE_BUSINESS_TYPE_SDS_PTG);
informationFormDTO.setBusinessId(entity.getId());
// 发送消息
newsTask.insertUserInformation(informationFormDTO);
return new Result();
}
@Override
public void rejectActInfo(RejectRecordDTO dto) {
baseDao.deleteById(dto.getRelationId());

3
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml

@ -48,7 +48,8 @@
</if>
<if test="type!=null and type!='' and type == '1'.toString()">
and t.CARRY_STATUS = '1'
</if> <if test="type!=null and type!='' and type == '2'.toString()">
</if>
<if test="type!=null and type!='' and type == '2'.toString()">
and t.USER_ID = #{userId}
</if>
order by sort,CREATED_TIME desc

Loading…
Cancel
Save