diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index e8578bec..d1bfaf7a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -5,6 +5,8 @@ import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; + +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; @@ -322,6 +324,9 @@ public class PayWorkingGroupSubItemController extends JeroController{ log.info(p.getChargeProject() + "=============发送消息"); // 发送消息 -// SendMessageDTO sendMessageDTO = new SendMessageDTO(); -// if(!StringUtils.isBlank(p.getEmail())){ -// sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); -// } -// if(!StringUtils.isBlank(p.getPhone())){ -// sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); -// sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); -// } -// HashMap map = new HashMap<>(); -// map.put("projectName",p.getChargeProject()); -// sendMessageDTO.setFromUser(ProjectCommon.ADMIN); -// sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode()); -// sendMessageDTO.setTemplateParam(map); -// sendMessageService.SendMessageService(sendMessageDTO); + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + if(!StringUtils.isBlank(p.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("projectName",p.getChargeProject()); + sendMessageDTO.setFromUser(ProjectCommon.ADMIN); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode()); + sendMessageDTO.setTemplateParam(map); + JSONObject json = new JSONObject(); + json.put("id",p.getId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); }); } }