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

linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerMessagePushServiceImpl.java

@@ -130,7 +130,8 @@ public class WeCustomerMessagePushServiceImpl implements IWeCustomerMessagePushS
                     WeCustomerMessgaeResult customerMessgaeResult = new WeCustomerMessgaeResult();
                     customerMessgaeResult.setMessgaeResultId(SnowFlakeUtil.nextId());
                     customerMessgaeResult.setMessageId(messageId);
-                    customerMessgaeResult.setSendTime(customerMessagePushDto.getSettingTime());
+                    //这个是实际发送时间
+                    customerMessgaeResult.setSendTime(null);
                     customerMessgaeResult.setSendType(customerMessgaeResult.getSettingTime() == null ? customerMessagePushDto.getPushType() : "2");
                     customerMessgaeResult.setExternalUserid(customer.getExternalUserid());
                     customerMessgaeResult.setExternalName(customer.getName());

linkwe-wecom/src/main/resources/mapper/wecom/WeCustomerMessageOriginalMapper.xml

@@ -5,10 +5,21 @@
 <mapper namespace="com.linkwechat.wecom.mapper.WeCustomerMessageOriginalMapper">
     <select id="selectCustomerMessagePushs" resultType="com.linkwechat.wecom.domain.vo.CustomerMessagePushVo">
         SELECT
-        wcmo.push_type,wcmo.message_type,wcmo.push_range,wcm.create_by sender,wcmo.create_time
-        sendTime,wcm.message_id,wcm.content,wcm.send_info
-        FROM we_customer_messageOriginal wcmo LEFT JOIN we_customer_message wcm ON
-        wcmo.message_original_Id=wcm.original_id
+        wcmo.push_type,
+        wcmo.message_type,
+        wcmo.push_range,
+        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>
             <if test="sender!=null and sender!=''">
                 AND wcmo.create_by LIKE CONCAT('%',#{sender},'%')