部分迁移

fs-company-app/src/main/resources/application.yml

@@ -5,4 +5,5 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid-fcky-test
+#    active: druid-fcky-test
+    active: dev

fs-company/src/main/resources/application.yml

@@ -3,7 +3,8 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid-fcky-test
+#    active: druid-fcky-test
+    active: dev
 #    active: druid-jzzx
 #    active: druid-hdt
 #    active: druid-sxjz

fs-service/src/main/java/com/fs/common/param/LoginMaWxParam.java

@@ -34,6 +34,10 @@ public class LoginMaWxParam implements Serializable {
     @ApiModelProperty(value = "用户头像")
     private String avatar;
 
+    @NotNull(message = "项目id不能为空")
+    @ApiModelProperty(value = "课程归属项目id")
+    private Long projectId;
+
 //    @ApiModelProperty(value = "公司id，如果不是第一位销售，都需要传")
 //    private Long companyId;
 

fs-service/src/main/java/com/fs/course/param/newfs/FsUserCourseAddCompanyUserParam.java

@@ -33,4 +33,8 @@ public class FsUserCourseAddCompanyUserParam implements Serializable {
     @ApiModelProperty(value = "营期id")
     private Long periodId;
 
+    @NotNull(message = "项目id不能为空")
+    @ApiModelProperty(value = "项目ID")
+    private Long projectId;
+
 }

fs-service/src/main/java/com/fs/course/param/newfs/FsUserCourseBeMemberParam.java

@@ -24,5 +24,9 @@ public class FsUserCourseBeMemberParam implements Serializable {
     @ApiModelProperty(value = "标签ids，数组格式")
     private String[] tagIds;
 
+    @NotNull(message = "项目id不能为空")
+    @ApiModelProperty(value = "课程归属项目id")
+    private Long projectId;
+
 
 }

fs-service/src/main/java/com/fs/qw/dto/UserProjectDTO.java

@@ -0,0 +1,15 @@
+package com.fs.qw.dto;
+
+import lombok.Data;
+
+@Data
+public class UserProjectDTO {
+    /**
+     * 会员ID
+     */
+    private Long userId;
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+}

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

@@ -27,4 +27,5 @@ public class TransferCustomDTO implements Serializable {
      */
     private String afterCompanyUserName;
     private Long afterCompanyUserId;
+    private Long projectId;
 }

fs-service/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -70,6 +70,7 @@ public class FsUserPageListParam implements Serializable {
      * 销售端登录用户id（该字段用于区分之前的登录用户）
      */
     private Long pcLoginUserId;
+    private Long projectId;
     /**
      * 是否为我的
      */

fs-service/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -86,6 +86,7 @@ public class FsUserPageListVO {
      * 是否宠粉
      */
     private Integer isRepeat;
+    private Integer projectId;
 
     @ApiModelProperty(value = "是否是重粉，1-是，0-否")
     private int isRepeatFans;

fs-service/src/main/resources/application-config-dev.yml

@@ -20,6 +20,11 @@ wx:
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
+      - appid: wxa73f0d48f1f2f66c   #金康健
+        secret: 93d342d00b2d7126a044408fb7082798
+        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
+        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
+        msgDataFormat: JSON
   cp:
     corpId: wwb2a1055fb6c9a7c2
     appConfigs:

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

@@ -10,13 +10,8 @@ logging:
 wx:
   miniapp:
     configs:
-      - appid: wx4115995705bb0ea0   #中康智慧
-        secret: 58910ae743005c396012b029c7def579
-        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
-        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
-        msgDataFormat: JSON
-      - appid: wxedde588767b358b1   #中康未来智慧药房
-        secret: 928d2961c81610d8f64b019597212fcd
+      - appid: wx29d26f63f836be7f   #云联优选
+        secret: a85bfaf0d8e243817f265a321684f6ec
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON

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

@@ -20,4 +20,8 @@ public class FsUserLoginByMpParam implements Serializable {
     @NotNull(message = "销售id不能为空")
     @ApiModelProperty(value = "销售id")
     private Long companyUserId;
+    @NotNull(message = "项目ID不能为空")
+    @ApiModelProperty(value = "项目ID")
+    private Long projectId;
+
 }

fs-user-app/src/main/resources/application.yml

@@ -12,4 +12,5 @@ spring:
 #    active: druid-hdt
 #    active: druid-sxjz
 #    active: druid-yzt
-    active: druid-myhk
+#    active: druid-myhk
+    active: dev