Просмотр исходного кода

木易华康-企微客户管理列表新增返回是否下载app字段

Long 1 неделя назад
Родитель
Сommit
48ff2c68b3

+ 29 - 0
fs-company/src/main/java/com/fs/company/controller/qw/QwExternalContactController.java

@@ -139,6 +139,17 @@ public class QwExternalContactController extends BaseController
                 item.setState(item.getState()+"-"+getContactWayNameStream(item.getState(), wayList));
             }
 
+            if (item.getFsUserId() != null) {
+                FsUser fsUser = fsUserService.selectFsUserByUserId(item.getFsUserId());
+                if (fsUser != null && (fsUser.getSource() != null || fsUser.getLoginDevice() != null)) {
+                    item.setIsDownloadApp(1);
+                } else {
+                    item.setIsDownloadApp(0);
+                }
+            } else {
+                item.setIsDownloadApp(0);
+            }
+
         });
 
         return getDataTable(list);
@@ -248,6 +259,17 @@ public class QwExternalContactController extends BaseController
                 item.setState(item.getState()+"-"+getContactWayNameStream(item.getState(), wayList));
             }
 
+            if (item.getFsUserId() != null) {
+                FsUser fsUser = fsUserService.selectFsUserByUserId(item.getFsUserId());
+                if (fsUser != null && (fsUser.getSource() != null || fsUser.getLoginDevice() != null)) {
+                    item.setIsDownloadApp(1);
+                } else {
+                    item.setIsDownloadApp(0);
+                }
+            } else {
+                item.setIsDownloadApp(0);
+            }
+
         });
 
         return getDataTable(list);
@@ -307,15 +329,22 @@ public class QwExternalContactController extends BaseController
         Long fsUserId = item.getFsUserId();
         if (fsUserId==null){
             item.setOrderCount(0L);
+            item.setIsDownloadApp(0);
             return;
         }
         FsUser fsUser = fsUserService.selectFsUserById(fsUserId);
         if (fsUser == null) {
             item.setOrderCount(0L);
+            item.setIsDownloadApp(0);
             return;
         }
         Long orderCount = fsUser.getOrderCount();
         item.setOrderCount(orderCount != null ? orderCount : 0);
+        if (fsUser.getSource() != null || fsUser.getLoginDevice() != null) {
+            item.setIsDownloadApp(1);
+        } else {
+            item.setIsDownloadApp(0);
+        }
     }
 
 

+ 5 - 0
fs-service/src/main/java/com/fs/qw/vo/QwExternalContactVO.java

@@ -148,4 +148,9 @@ public class QwExternalContactVO {
      * 广告链路id
      */
     private String traceId;
+
+    /**
+     * 是否下载APP
+     */
+    private Integer isDownloadApp;
 }

+ 1 - 0
fs-service/src/main/resources/application-config-myhk.yml

@@ -96,6 +96,7 @@ ipad:
   ipadUrl: http://qwipad.muyi88.com
 #  aiApi: http://152.136.202.157:3000/api
   aiApi: http://49.232.181.28:3000/api
+  wxIpadUrl:
   voiceApi: http://106.52.21.84:8009
   commonApi: http://106.52.21.84:7771
 wx_miniapp_temp: