Merge remote-tracking branch 'origin/master'

fs-admin/src/main/java/com/fs/company/controller/CompanyDeductController.java

@@ -133,15 +133,7 @@ public class CompanyDeductController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if(deduct.getIsAudit()==1){
             Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
-
-            // 同步redis缓存
-            R r = companyRechargeService.syncUpdateRedisCompanyRecharge(company, deduct.getMoney(), 2);
-            if(!"200".equals(r.get("code").toString())){
-                return r;
-            }
-            // 充值后，需要同步更新余额到数据库，否则余额与缓存中的不一致
-            String newMoney = r.get("newMoney").toString();
-            company.setMoney(new BigDecimal(newMoney));
+            company.setMoney(company.getMoney().subtract(deduct.getMoney()));
             companyService.updateCompany(company);
             CompanyMoneyLogs log=new CompanyMoneyLogs();
             log.setCompanyId(deduct.getCompanyId());

fs-admin/src/main/java/com/fs/company/controller/CompanyRechargeController.java

@@ -122,16 +122,7 @@ public class CompanyRechargeController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if(companyRecharge.getIsAudit()==1){
             Company company=companyService.selectCompanyById(companyRecharge.getCompanyId());
-
-            // 同步redis缓存
-            // 注意：在进行充值审核之前，需要先执行一下定时任务同步缓存数据到数据库，再进行后续操作，否则金额不正确
-            R r = companyRechargeService.syncUpdateRedisCompanyRecharge(company, companyRecharge.getMoney(), 1);
-            if(!"200".equals(r.get("code").toString())){
-                return r;
-            }
-            // 充值后，需要同步更新余额到数据库，否则余额与缓存中的不一致
-            String newMoney = r.get("newMoney").toString();
-            company.setMoney(new BigDecimal(newMoney));
+            company.setMoney(company.getMoney().add(companyRecharge.getMoney()));
             companyService.updateCompany(company);
             CompanyMoneyLogs log=new CompanyMoneyLogs();
             log.setCompanyId(companyRecharge.getCompanyId());

fs-company/src/main/java/com/fs/company/controller/qw/QwSopTempController.java

@@ -24,6 +24,7 @@ import com.fs.sop.service.IQwSopTempService;
 import com.fs.sop.vo.UpdateRedVo;
 import com.fs.voice.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,6 +51,8 @@ public class QwSopTempController extends BaseController
     @Autowired
     private IQwUserService iQwUserService;
 
+    @Value("${cloud_host.company_name}")
+    private String signProjectName;
 
     @Autowired
     private CompanyDeptServiceImpl companyDeptService;
@@ -141,6 +144,10 @@ public class QwSopTempController extends BaseController
     public TableDataInfo deptList(QwSopTemp qwSopTemp)
     {
 
+        if ("济南联志健康".equals(signProjectName)) {
+            return list(qwSopTemp);
+        }
+
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         qwSopTemp.setCompanyId(loginUser.getCompany().getCompanyId());
 

fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -429,6 +429,8 @@ public class QwMsgController {
                         }
                     } else if (recordType==2){
                         log.info("id:{}, 通话挂断", id);
+                    }else if (recordType==3){
+                        log.info("通话未接听");
                     }else {
                         break;
                     }

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -179,6 +179,10 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
     @Autowired
     private IFsUserCompanyBindService fsUserCompanyBindService;
 
+
+    @Autowired
+    private IQwSopTempVoiceService sopTempVoiceService;
+
     @PostConstruct
     public void init() {
         loadCourseConfig();
@@ -2019,6 +2023,24 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         //完课后若是小程序发送另外一堂课
         saveWacthLogOfCourseLink(settings,sopLogs,newTimeString,finishLog,finishTemp);
         // 处理音频内容
+        for (QwSopCourseFinishTempSetting.Setting st : settings) {
+            if (st.getContentType().equals("7")) {
+                Long companyUserId = finishLog.getCompanyUserId();
+                QwSopTempVoice qwSopTempVoice = sopTempVoiceService.selectQwSopTempVoiceByCompanyUserIdAndVoiceTxt(companyUserId, st.getValue());
+                if (qwSopTempVoice != null && qwSopTempVoice.getVoiceUrl() != null && qwSopTempVoice.getRecordType() == 1) {
+                    st.setVoiceUrl(qwSopTempVoice.getVoiceUrl());
+                    st.setVoiceDuration(String.valueOf(qwSopTempVoice.getDuration()));
+                } else if (qwSopTempVoice == null) {
+                    if(companyUserId != null && st.getValue() != null){
+                        qwSopTempVoice = new QwSopTempVoice();
+                        qwSopTempVoice.setCompanyUserId(companyUserId);
+                        qwSopTempVoice.setVoiceTxt(st.getValue());
+                        qwSopTempVoice.setRecordType(0);
+                        sopTempVoiceService.insertQwSopTempVoice(qwSopTempVoice);
+                    }
+                }
+            }
+        }
 //        for (QwSopCourseFinishTempSetting.Setting st : settings) {
 //            if (st.getContentType().equals("7")) {
 //                try {

fs-service/src/main/java/com/fs/course/service/impl/FsCourseFinishTempParentServiceImpl.java

@@ -4,8 +4,11 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.common.utils.StringUtils;
 import com.fs.course.domain.FsCourseFinishTemp;
 import com.fs.course.domain.FsUserCourse;
 import com.fs.course.domain.FsUserCourseVideo;
@@ -13,7 +16,10 @@ import com.fs.course.service.IFsCourseFinishTempService;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.course.service.IFsUserCourseVideoService;
 import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.fs.course.mapper.FsCourseFinishTempParentMapper;
 import com.fs.course.domain.FsCourseFinishTempParent;
@@ -26,9 +32,13 @@ import com.fs.course.service.IFsCourseFinishTempParentService;
  * @date 2025-05-22
  */
 @Service
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFinishTempParentMapper, FsCourseFinishTempParent> implements IFsCourseFinishTempParentService {
 
+
+    @Value("${cloud_host.company_name}")
+    private String signProjectName;
+
     private final IFsUserCourseService fsUserCourseService;
     private final IFsUserCourseVideoService fsUserCourseVideoService;
     private final IFsCourseFinishTempService fsCourseFinishTempService;
@@ -71,10 +81,11 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
         List<FsUserCourseVideo> videoList = fsUserCourseVideoService.selectFsUserCourseVideoListByCourseId(fsUserCourseVideo);
         int insert = baseMapper.insert(fsCourseFinishTempParent);
         fsCourseFinishTempParent.setCreateTime(DateUtils.getNowDate());
+        Long currentStatus = "济南联志健康".equals(signProjectName) ? fsCourseFinishTempParent.getStatus() : 0L;
         videoList.forEach(e -> {
             FsCourseFinishTemp temp = new FsCourseFinishTemp();
             temp.setName(e.getFileName());
-            temp.setStatus(0L);
+            temp.setStatus(currentStatus);
             temp.setSetting(fsCourseFinishTempParent.getSetting());
             temp.setChatSetting(fsCourseFinishTempParent.getChatSetting());
             temp.setCompanyId(fsCourseFinishTempParent.getCompanyId());

fs-service/src/main/java/com/fs/course/service/impl/FsCourseRedPacketLogServiceImpl.java

@@ -361,7 +361,7 @@ public class FsCourseRedPacketLogServiceImpl implements IFsCourseRedPacketLogSer
                         fsCourseRedPacketLog.setLogId(redPacket.getLogId());
                         fsCourseRedPacketLog.setStatus(1); // 已发送
                         fsCourseRedPacketLog.setUpdateTime(new Date());
-//                        updateFsCourseRedPacketLog(fsCourseRedPacketLog);
+                        updateFsCourseRedPacketLog(fsCourseRedPacketLog);
                     }
                 } catch (WxPayException e) {
                     logger.error(e.getMessage());

fs-service/src/main/java/com/fs/qw/mapper/QwFriendWelcomeMapper.java

@@ -85,7 +85,7 @@ public interface QwFriendWelcomeMapper
             "           SELECT 1 FROM qw_user qu " +
             "           JOIN company_user cu ON cu.user_id = qu.company_user_id " +
             "           WHERE FIND_IN_SET(qu.id, REPLACE(REPLACE(REPLACE(qfw.qw_user_ids, '[', ''), ']', ''), ' ', '')) > 0 " +
-            "           AND qu.id = #{qwUserIds} " +
+            "           AND qu.qw_user_id = #{qwUserIds} " +
             "       ) AND " +
             "   </if>" +
             "   <if test=\"isSendMsg != null\"> qfw.is_send_msg = #{isSendMsg} AND </if>" +

fs-service/src/main/java/com/fs/qw/service/impl/QwUserVoiceLogServiceImpl.java

@@ -217,6 +217,9 @@ public class QwUserVoiceLogServiceImpl extends ServiceImpl<QwUserVoiceLogMapper,
                 if (recordType == 2) {//2是未接通的处理
                     qwUserVoiceLog.setStatus(recordType);
                     qwUserVoiceLog.setTitle("通话拒接");
+                }else if(recordType == 3){
+                    qwUserVoiceLog.setStatus(recordType);
+                    qwUserVoiceLog.setTitle("通话未接听");
                 } else {
                     qwUserVoiceLog.setStatus(1);
                     if (totalSeconds != null) {

fs-user-app/src/main/java/com/fs/app/controller/CommonController.java

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fs.ai.service.IBaiduAIService;
 import com.fs.ai.vo.BaiduAIMsgResultVO;
 import com.fs.app.param.SignParam;
+import com.fs.app.param.TestMoneyParam;
 import com.fs.app.utils.CityTreeUtil;
 import com.fs.app.utils.JwtUtils;
 import com.fs.app.vo.CityVO;
@@ -28,6 +29,8 @@ import com.fs.common.exception.file.OssException;
 import com.fs.common.utils.file.FileUploadUtils;
 import com.fs.common.utils.http.HttpUtils;
 import com.fs.common.utils.sign.Md5Utils;
+import com.fs.company.domain.CompanyMoneyLogs;
+import com.fs.company.service.ICompanyMoneyLogsService;
 import com.fs.core.utils.OrderCodeUtils;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.service.IHuaweiVodService;
@@ -73,6 +76,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
+import java.math.BigDecimal;
 import java.util.*;
 
 import static com.fs.common.utils.SecurityUtils.getUserId;
@@ -142,6 +146,26 @@ public class CommonController {
 //		return R.ok();
 //	}
 
+	@Autowired
+	ICompanyMoneyLogsService logsService;
+	@ApiOperation("同步企业金额")
+	@PostMapping("testUpdateCompanyMoney")
+	public R testUpdateCompanyMoney(@RequestBody TestMoneyParam param) throws Exception
+	{
+		List<CompanyMoneyLogs> logs=logsService.selectCompanyMoneyLogsByCompanyId(param.getCompanyId(),param.getLogsId().toString());
+		if(logs!=null){
+			BigDecimal companyMoney=param.getMoney();
+			for(CompanyMoneyLogs log:logs){
+				companyMoney=companyMoney.add(log.getMoney());
+				CompanyMoneyLogs logMap=new CompanyMoneyLogs();
+				logMap.setLogsId(log.getLogsId());
+				logMap.setBalance(companyMoney);
+				logsService.updateCompanyMoneyLogs(logMap);
+			}
+		}
+		return R.ok();
+	}
+
 
 	@ApiOperation("excel")
 	@GetMapping(value = "/exportExcel")

fs-user-app/src/main/java/com/fs/app/param/TestMoneyParam.java

@@ -0,0 +1,21 @@
+package com.fs.app.param;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@ToString
+public class TestMoneyParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long companyId;
+    private Long logsId;
+    private BigDecimal money;
+
+
+}