Merge remote-tracking branch 'origin/master'

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

@@ -123,6 +123,8 @@ public class QwUserVoiceLogController extends BaseController
     @GetMapping("/sellTotalExport")
     public AjaxResult sellTotalExport(QwUserVoiceLogTotalVo qwUserVoiceLog)
     {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        qwUserVoiceLog.setCompanyId(loginUser.getCompany().getCompanyId());
         List<QwUserVoiceLogTotalVo> list = qwUserVoiceLogService.selectQwUserVoiceLogTotalList(qwUserVoiceLog);
         list.forEach(m-> {
             m.setQwUserName(m.getQwUser().getQwUserName());

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

@@ -2584,7 +2584,8 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                 }
 
                 //有渠道活码
-                if (isWay && StringUtil.strIsNullOrEmpty(followUser.getRemark()) ) {
+                if (isWay && (StringUtil.strIsNullOrEmpty(followUser.getRemark()) || StringUtils.equals(followUser.getRemark().trim(),externalContact.getName().trim()))) {
+
                     if (wayId.getIsDescription() == 1) {
                         qwExternalContact.setDescription(wayId.getDescription());
                     }
@@ -2636,7 +2637,9 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                     }
                 }
                 else {
-                    if (StringUtil.strIsNullOrEmpty(followUser.getRemark()) && !StringUtil.strIsNullOrEmpty(tagRemark)) {
+                    if (!StringUtil.strIsNullOrEmpty(tagRemark) && (StringUtil.strIsNullOrEmpty(followUser.getRemark()) || StringUtils.equals(followUser.getRemark().trim(),externalContact.getName().trim()))) {
+                        // 逻辑代码
+
                         qwExternalContact.setRemark(tagRemark + "-" + externalContact.getName());
                         QwExternalContactRemarkParam param = new QwExternalContactRemarkParam();
                         param.setRemark(qwExternalContact.getRemark());
@@ -2657,8 +2660,6 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                     }
                 }
 
-
-
             }
         }
 

fs-service/src/main/java/com/fs/qw/vo/QwUserVoiceLogTotalVo.java

@@ -14,6 +14,9 @@ public class QwUserVoiceLogTotalVo extends BaseEntity {
     /** id */
     private Long id;
 
+    @Excel(name = "客服名称")
+    private String companyUserName;
+
     /** 外部联系人id */
     //@Excel(name = "外部联系人id")
     private Long extId;
@@ -28,6 +31,9 @@ public class QwUserVoiceLogTotalVo extends BaseEntity {
     @Excel(name = "企微用户名称")
     private String qwUserName;
 
+    @Excel(name = "企微主体名称")
+    private String corpName;
+
     /** 时长秒 */
     @Excel(name = "时长秒")
     private Long duration;
@@ -44,6 +50,7 @@ public class QwUserVoiceLogTotalVo extends BaseEntity {
     //@Excel(name = "企微id")
     private String corpId;
 
+
     /** 公司id */
     //@Excel(name = "公司id")
     private Long companyId;
@@ -51,13 +58,10 @@ public class QwUserVoiceLogTotalVo extends BaseEntity {
     //@Excel(name = "公司名称")
     private String companyName;
 
-    /** 销售用户id */
-    //@Excel(name = "销售用户id")
+    /** 客服用户id */
+    //@Excel(name = "客服用户id")
     private Long companyUserId;
 
-    //@Excel(name = "销售用户名称")
-    private String companyUserName;
-
     //接通数量
     @Excel(name = "接通数量")
     private Long connectCount;
@@ -73,8 +77,6 @@ public class QwUserVoiceLogTotalVo extends BaseEntity {
 
     private QwUser qwUser;
 
-    private String corpName;
-
     public String getCorpName() {
         return corpName;
     }

fs-service/src/main/resources/application-config-druid-jzzx.yml

@@ -87,7 +87,7 @@ headerImg:
   imgUrl: https://jiuzhouzaixian.obs.cn-southwest-2.myhuaweicloud.com/fs/20250623/1750665141214.png
 ipad:
   ipadUrl: http://ipad.jiuzhouzaixian.com
-  aiApi: http://154.8.194.176:3000/api
+  aiApi: http://1.95.196.10:3000/api
 wx_miniapp_temp:
   pay_order_temp_id: VXEvKaGNPFuJmhWK9O_QPrTZxe9umDCukq-maI8Vdek
   inquiry_temp_id: 9POPYeqhI48LOPvq-Rfoklze7H-9SlunJKh10Qt4_2I