提交 14d3a122 编写于 作者: X xinlaa

Merge branch 'master' of https://gitee.com/LinkWeChat/link-wechat into master

...@@ -130,7 +130,8 @@ public class WeCustomerMessagePushServiceImpl implements IWeCustomerMessagePushS ...@@ -130,7 +130,8 @@ public class WeCustomerMessagePushServiceImpl implements IWeCustomerMessagePushS
WeCustomerMessgaeResult customerMessgaeResult = new WeCustomerMessgaeResult(); WeCustomerMessgaeResult customerMessgaeResult = new WeCustomerMessgaeResult();
customerMessgaeResult.setMessgaeResultId(SnowFlakeUtil.nextId()); customerMessgaeResult.setMessgaeResultId(SnowFlakeUtil.nextId());
customerMessgaeResult.setMessageId(messageId); customerMessgaeResult.setMessageId(messageId);
customerMessgaeResult.setSendTime(customerMessagePushDto.getSettingTime()); //这个是实际发送时间
customerMessgaeResult.setSendTime(null);
customerMessgaeResult.setSendType(customerMessgaeResult.getSettingTime() == null ? customerMessagePushDto.getPushType() : "2"); customerMessgaeResult.setSendType(customerMessgaeResult.getSettingTime() == null ? customerMessagePushDto.getPushType() : "2");
customerMessgaeResult.setExternalUserid(customer.getExternalUserid()); customerMessgaeResult.setExternalUserid(customer.getExternalUserid());
customerMessgaeResult.setExternalName(customer.getName()); customerMessgaeResult.setExternalName(customer.getName());
......
...@@ -5,10 +5,21 @@ ...@@ -5,10 +5,21 @@
<mapper namespace="com.linkwechat.wecom.mapper.WeCustomerMessageOriginalMapper"> <mapper namespace="com.linkwechat.wecom.mapper.WeCustomerMessageOriginalMapper">
<select id="selectCustomerMessagePushs" resultType="com.linkwechat.wecom.domain.vo.CustomerMessagePushVo"> <select id="selectCustomerMessagePushs" resultType="com.linkwechat.wecom.domain.vo.CustomerMessagePushVo">
SELECT SELECT
wcmo.push_type,wcmo.message_type,wcmo.push_range,wcm.create_by sender,wcmo.create_time wcmo.push_type,
sendTime,wcm.message_id,wcm.content,wcm.send_info wcmo.message_type,
FROM we_customer_messageOriginal wcmo LEFT JOIN we_customer_message wcm ON wcmo.push_range,
wcmo.message_original_Id=wcm.original_id wcm.create_by sender,
wcmo.create_time sendTime,
wcm.message_id,
wcm.content,
wcm.chat_type,
wcm.setting_time,
wcm.expect_send,
wcm.actual_send,
wcm.timed_task
FROM
we_customer_messageOriginal wcmo
LEFT JOIN we_customer_message wcm ON wcmo.message_original_Id = wcm.original_id
<where> <where>
<if test="sender!=null and sender!=''"> <if test="sender!=null and sender!=''">
AND wcmo.create_by LIKE CONCAT('%',#{sender},'%') AND wcmo.create_by LIKE CONCAT('%',#{sender},'%')
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册