cid

fs-service/src/main/java/com/fs/company/service/impl/CompanyVoiceRoboticCallLogCallphoneServiceImpl.java

@@ -150,16 +150,16 @@ public class CompanyVoiceRoboticCallLogCallphoneServiceImpl extends ServiceImpl<
             // 写入其他记录
             JSONObject telData = dialogMap.getTelData();
             companyVoiceRoboticCallLog.setRecordPath((String) telData.getOrDefault("recordPath", ""));
-            companyVoiceRoboticCallLog.setContentList((String) telData.getOrDefault("contentList", ""));
+            companyVoiceRoboticCallLog.setContentList(telData.containsKey("contentList")?telData.getJSONArray("contentList").toJSONString() : "");
             companyVoiceRoboticCallLog.setCallerNum((String) telData.getOrDefault("callerNum", ""));
             companyVoiceRoboticCallLog.setCalleeNum((String) telData.getOrDefault("calleeNum", ""));
             companyVoiceRoboticCallLog.setUuid((String) telData.getOrDefault("uuid", ""));
-            Long createTime = (Long) telData.getOrDefault("createTime", null);
+            Long createTime =  telData.getLong("createTime");
             companyVoiceRoboticCallLog.setCallCreateTime(createTime);
-            Long answerTime = (Long) telData.getOrDefault("answerTime", null);
+            Long answerTime =  telData.getLong("answerTime");
             companyVoiceRoboticCallLog.setCallAnswerTime(answerTime);
             companyVoiceRoboticCallLog.setIntention((String) telData.getOrDefault("intention", ""));
-            companyVoiceRoboticCallLog.setCallTime((Long) telData.getOrDefault("duration", null));
+            companyVoiceRoboticCallLog.setCallTime( telData.getLong("duration"));
 
             baseMapper.updateCompanyVoiceRoboticCallLogCallphone(companyVoiceRoboticCallLog);
         } catch (Exception ex) {

fs-service/src/main/java/com/fs/company/service/impl/CompanyVoiceRoboticServiceImpl.java

@@ -337,7 +337,7 @@ public class CompanyVoiceRoboticServiceImpl extends ServiceImpl<CompanyVoiceRobo
 //                        return R.ok("短信提交成功，正在发送中...");
                     }
                     else{
-                        log.error("剩余短信数量不足，请充值:task:{},companyId:{}",roboticId,robotic.getCompanyId());
+                        log.error("剩余短信数量不足，请充值:task:{},companyId:{}",roboticId,wxAccount.getCompanyId());
                         throw new RuntimeException("剩余短信数量不足，请充值");
                     }
                 }

fs-wx-task/src/main/java/com/fs/app/service/WxTaskService.java

@@ -403,7 +403,11 @@ public class WxTaskService {
         if (StringUtils.isNotBlank(data.getRunTaskFlow()) && StringUtils.isNotBlank(taskFlow)) {
             nextTask = getNextTaskOptimized(taskFlow, data.getRunTaskFlow());
         } else {
-            return null;
+            //如果个人任务流程没有维护，执行当前个人在任务流程中的任务流程节点
+            nextTask = getNextTaskOptimized(robotic.getTaskFlow(), robotic.getRunTaskFlow());
+            taskFlow = robotic.getTaskFlow();
+            data.setRunTaskFlow(robotic.getRunTaskFlow());
+//            return null;
         }
         if(StringUtils.isBlank(nextTask)){
             log.error("任务没有下个执行任务,标记完成，roboticId：{}",roboticId);