|
|
@@ -12,6 +12,7 @@ import com.fs.common.core.redis.RedisCache;
|
|
|
import com.fs.common.utils.CloudHostUtils;
|
|
|
import com.fs.common.utils.PubFun;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
+import com.fs.common.utils.date.DateUtil;
|
|
|
import com.fs.company.domain.Company;
|
|
|
import com.fs.company.domain.CompanyMiniapp;
|
|
|
import com.fs.company.domain.CompanyUser;
|
|
|
@@ -754,7 +755,7 @@ public class SopWxLogsTaskServiceImpl implements SopWxLogsTaskService {
|
|
|
WxSopLogs wxSopLogs = new WxSopLogs();
|
|
|
|
|
|
// 基础信息
|
|
|
- wxSopLogs.setSendTime(formattedSendTime);
|
|
|
+ wxSopLogs.setSendTime(DateUtil.stringToLocalDateTime(formattedSendTime));
|
|
|
wxSopLogs.setAccountId(Long.valueOf(logVo.getCustomerId())); // 个微账号ID
|
|
|
wxSopLogs.setType(logVo.getType());
|
|
|
wxSopLogs.setFsUserId(fsUserId);
|
|
|
@@ -1032,7 +1033,7 @@ public class SopWxLogsTaskServiceImpl implements SopWxLogsTaskService {
|
|
|
try {
|
|
|
if (sopLogs.getFsUserId() != null && !Objects.equals(0L, sopLogs.getFsUserId())) {
|
|
|
sopLogs.setSendStatus(5);
|
|
|
- sopLogs.setReceivingStatus(0);
|
|
|
+// sopLogs.setReceivingStatus(0);
|
|
|
sopLogs.setRemark("已经注册过的客户不发送");
|
|
|
}
|
|
|
if (ObjectUtil.isNotEmpty(setting.getValue())) {
|
|
|
@@ -2392,7 +2393,7 @@ public class SopWxLogsTaskServiceImpl implements SopWxLogsTaskService {
|
|
|
watchLog.setCourseId(courseId != null ? courseId.longValue() : null);
|
|
|
watchLog.setCompanyUserId(companyUserId != null ? Long.valueOf(companyUserId) : null);
|
|
|
watchLog.setCompanyId(companyId != null ? Long.valueOf(companyId) : null);
|
|
|
- watchLog.setCreateTime(convertStringToDate(sopLogs.getSendTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ watchLog.setCreateTime(DateUtil.stringToDate(DateUtil.formatLocalDateTime(sopLogs.getSendTime())));
|
|
|
watchLog.setUpdateTime(new Date());
|
|
|
watchLog.setLogType(3);
|
|
|
watchLog.setUserId(sopLogs.getFsUserId());
|
|
|
@@ -3350,7 +3351,7 @@ public class SopWxLogsTaskServiceImpl implements SopWxLogsTaskService {
|
|
|
private void setSopLogsStatus(WxSopLogs sopLogs, Integer sendStatus, Integer receivingStatus, String remark) {
|
|
|
if (sopLogs != null) {
|
|
|
sopLogs.setSendStatus(sendStatus);
|
|
|
- sopLogs.setReceivingStatus(receivingStatus);
|
|
|
+// sopLogs.setReceivingStatus(receivingStatus);
|
|
|
sopLogs.setRemark(remark);
|
|
|
}
|
|
|
}
|