Commit 7ba4210f by wuchao

修复bug

parent 841d207f
package org.scrm.service.impl; package org.scrm.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.cp.api.WxCpService;
import me.chanjar.weixin.cp.bean.message.WxCpMessage; import me.chanjar.weixin.cp.bean.message.WxCpMessage;
import me.chanjar.weixin.cp.bean.message.WxCpMessageSendResult; import me.chanjar.weixin.cp.bean.message.WxCpMessageSendResult;
import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
import org.scrm.base.constant.Constants; import org.scrm.base.constant.Constants;
import org.scrm.base.exception.wecom.WeComException; import org.scrm.base.exception.wecom.WeComException;
import org.scrm.base.utils.StringUtils; import org.scrm.base.utils.StringUtils;
...@@ -32,7 +35,7 @@ import java.util.Objects; ...@@ -32,7 +35,7 @@ import java.util.Objects;
/** /**
* 应用消息表(WeAgentMsg) * 应用消息表(WeAgentMsg)
* *
* *
* @since 2022-11-04 17:08:08 * @since 2022-11-04 17:08:08
*/ */
@Service @Service
...@@ -56,7 +59,7 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent ...@@ -56,7 +59,7 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent
try { try {
WeAgentMsg weAgentMsg = WeAgentMsg.builder(query); WeAgentMsg weAgentMsg = WeAgentMsg.builder(query);
log.info("应用消息WeAgentMsg:{}", JSONObject.toJSONString(weAgentMsg));
this.sendMsg(weAgentMsg,query.getPromotionEntity(),weAgentMsg.getSendType().equals(1)); this.sendMsg(weAgentMsg,query.getPromotionEntity(),weAgentMsg.getSendType().equals(1));
return weAgentMsg; return weAgentMsg;
...@@ -71,14 +74,23 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent ...@@ -71,14 +74,23 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent
public void sendMsg(WeAgentMsg weAgentMsg, PromotionEntity promotionEntity,boolean isSendMsg) throws Exception { public void sendMsg(WeAgentMsg weAgentMsg, PromotionEntity promotionEntity,boolean isSendMsg) throws Exception {
try { try {
if (saveOrUpdate(weAgentMsg) && Objects.equals(1, weAgentMsg.getStatus())) { boolean saveResult = saveOrUpdate(weAgentMsg);
log.info("应用发送消息,保存或更新结果1,saveResult:{}, weAgentMsg:{}, isSendMsg:{}", saveResult, JSONObject.toJSONString(weAgentMsg), isSendMsg);
if (saveResult && Objects.equals(1, weAgentMsg.getStatus())) {
log.info("应用发送消息,开始构建发送实体2");
WxCpMessage wxCpMessage = WeAgentMsg.buildAgentMsg(weAgentMsg); WxCpMessage wxCpMessage = WeAgentMsg.buildAgentMsg(weAgentMsg);
log.info("应用消息发送实体:"+wxCpMessage); log.info("应用消息发送实体3:{}", JSONObject.toJSONString(wxCpMessage));
if(null != wxCpMessage){ if(null != wxCpMessage){
if(isSendMsg){ if(isSendMsg){
WxCpMessageSendResult sendResult = weCorpAccountService.findWxcpserviceByAgentId(weAgentMsg.getAgentId()).getMessageService().send(wxCpMessage); log.info("应用消息开始发送消息4");
log.info("应用消息结果实体:"+wxCpMessage); // WxCpMessageSendResult sendResult = weCorpAccountService.findWxcpserviceByAgentId(weAgentMsg.getAgentId()).getMessageService().send(wxCpMessage);
WxCpService wxCpService = weCorpAccountService.findWxcpserviceByAgentId(weAgentMsg.getAgentId());
WxCpDefaultConfigImpl config = (WxCpDefaultConfigImpl) wxCpService.getWxCpConfigStorage();
config.setBaseApiUrl("http://192.168.166.6:8243");
WxCpMessageSendResult sendResult = wxCpService.getMessageService().send(wxCpMessage);
log.info("应用消息结果实体5:{}", JSONObject.toJSONString(sendResult));
if(StringUtils.isNotEmpty(sendResult.getMsgId())){ if(StringUtils.isNotEmpty(sendResult.getMsgId())){
weAgentMsg.setMsgId(sendResult.getMsgId()); weAgentMsg.setMsgId(sendResult.getMsgId());
weAgentMsg.setStatus(2); weAgentMsg.setStatus(2);
...@@ -86,13 +98,19 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent ...@@ -86,13 +98,19 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent
}else{ }else{
weAgentMsg.setStatus(3); weAgentMsg.setStatus(3);
} }
} else {
log.info("应用消息构不发送信息6");
} }
this.updateById(weAgentMsg); this.updateById(weAgentMsg);
} else {
log.info("应用消息构建发送实体失败7");
} }
} else {
log.info("应用发送消息失败保存或更新失败,或者发送状态不为1,weAgentMsg: {}", JSONObject.toJSONString(weAgentMsg));
} }
}catch (Exception e){ }catch (Exception e){
log.error("应用消息发送失败",e); log.error("应用消息发送失败8",e);
throw e; throw e;
} }
...@@ -148,7 +166,7 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent ...@@ -148,7 +166,7 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent
if(null != agentMsg && null != agentMsg.getAgentId() && StringUtils.isNotEmpty(agentMsg.getMsgId())){ if(null != agentMsg && null != agentMsg.getAgentId() && StringUtils.isNotEmpty(agentMsg.getMsgId())){
weCorpAccountService weCorpAccountService
.findWxcpserviceByAgentId(agentMsg.getAgentId()).getMessageService().recall(agentMsg.getMsgId()); .findWxcpserviceByAgentId(agentMsg.getAgentId()).getMessageService().recall(agentMsg.getMsgId());
agentMsg.setStatus(4); agentMsg.setStatus(4);
...@@ -175,7 +193,7 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent ...@@ -175,7 +193,7 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent
.eq(WeAgentMsg::getSendType, 2) .eq(WeAgentMsg::getSendType, 2)
.apply("date_format (send_time,'%Y-%m-%d %H:%i') <= date_format ({0},'%Y-%m-%d %H:%i')",new Date()) .apply("date_format (send_time,'%Y-%m-%d %H:%i') <= date_format ({0},'%Y-%m-%d %H:%i')",new Date())
.eq(WeAgentMsg::getDelFlag, Constants.COMMON_STATE); .eq(WeAgentMsg::getDelFlag, Constants.COMMON_STATE);
return list(wrapper); return list(wrapper);
} }
@Override @Override
...@@ -186,4 +204,4 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent ...@@ -186,4 +204,4 @@ public class WeAgentMsgServiceImpl extends ServiceImpl<WeAgentMsgMapper, WeAgent
return this.baseMapper.getMsgList(query); return this.baseMapper.getMsgList(query);
} }
} }
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论