From 77eeb31f7cf3f141432bbd0f3bc2eebce67293c4 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Sat, 27 Apr 2024 02:11:06 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/xq/config/AliSmsProperties.java |  6 +++---
 .../java/com/ruoyi/xq/domain/UserInfo.java    |  2 +-
 .../user/req/UpdateUserinfoFilterReq.java     |  2 +-
 .../dto/app/user/UpdateUserFullInfoReq.java   |  2 +-
 .../app/user/vo/CurrentUserFullInfoVo.java    |  2 +-
 .../xq/dto/app/user/vo/CurrentUserInfoVo.java |  2 ++
 .../ruoyi/xq/dto/app/user/vo/HomeUserVo.java  |  2 +-
 .../com/ruoyi/xq/enums/common/CodeEnum.java   |  4 ++--
 .../filter/UserFilterCarStatusEnum.java       | 20 +++++++++++++++++++
 .../filter/UserFilterChildStatusEnum.java     | 19 ++++++++++++++++++
 .../filter/UserFilterHouseStatusEnum.java     | 19 ++++++++++++++++++
 .../main/java/com/ruoyi/xq/kit/AliSmsKit.java |  2 +-
 .../ruoyi/xq/manager/CurrentUserManager.java  |  1 +
 13 files changed, 72 insertions(+), 11 deletions(-)
 create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterCarStatusEnum.java
 create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterChildStatusEnum.java
 create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterHouseStatusEnum.java

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/config/AliSmsProperties.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/config/AliSmsProperties.java
index a649cf7..de28173 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/config/AliSmsProperties.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/config/AliSmsProperties.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties(prefix = "ali.sms")
 public class AliSmsProperties {
-    private String accessKeyId = "LTAI5tRf2jUyoYmAC9kw4AMF";
-    private String accessKeySecret = "frvNLpySKxC38eihnWKi3NMFZSume3";
-    private String signName = "武汉康慧创欣科技";
+    private String accessKeyId = "LTAI5tAb6pSUHksjV6EKkLyA";
+    private String accessKeySecret = "EmpYUMG1MfS47ifuAlSGzQOUH2mIZ5";
+    private String signName = "遇见良缘公众号";
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
index 565186a..a520df6 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
@@ -114,7 +114,7 @@ public class UserInfo implements Serializable {
     /**
      * 择偶条件-学历
      */
-    private Integer filterEducation;
+    private String filterEducation;
     /**
      * 择偶条件-地区
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java
index 74e8822..c2e164c 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java
@@ -26,7 +26,7 @@ public class UpdateUserinfoFilterReq {
     /**
      * 择偶条件-学历
      */
-    private Integer filterEducation;
+    private String filterEducation;
     /**
      * 择偶条件-地区
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
index eb72af1..ac57ab9 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
@@ -85,7 +85,7 @@ public class UpdateUserFullInfoReq {
     @Schema(description = "择偶条件-婚况")
     private String filterMarriage;
     @Schema(description = "择偶条件-学历")
-    private Integer filterEducation;
+    private String filterEducation;
     @Schema(description = "择偶条件-地区Code")
     private Integer filterResidenceCode;
     @Schema(description = "择偶条件-年收入")
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
index 18264ac..75ad089 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
@@ -209,7 +209,7 @@ public class CurrentUserFullInfoVo {
      * 择偶条件-学历
      */
     @Schema(description = "择偶条件-学历")
-    private Integer filterEducation;
+    private String filterEducation;
     /**
      * 择偶条件-地区
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
index 1fa9252..a7e055d 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
@@ -82,6 +82,8 @@ public class CurrentUserInfoVo {
     private Integer vipType;
     @Schema(description = "vip到期时间")
     private LocalDateTime vipTimeout;
+    @Schema(description = "微信号")
+    private String wxCode;
     /**
      * 收益的余额
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
index d752e29..16b98b4 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
@@ -211,7 +211,7 @@ public class HomeUserVo {
      * 择偶条件-学历
      */
     @Schema(description = "择偶条件-学历")
-    private Integer filterEducation;
+    private String filterEducation;
     /**
      * 择偶条件-地区
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/CodeEnum.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/CodeEnum.java
index 879ef68..cfba811 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/CodeEnum.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/CodeEnum.java
@@ -4,8 +4,8 @@ import lombok.Getter;
 
 @Getter
 public enum CodeEnum {
-    LOGIN("登陆短信","SMS_294195165"),
-    RESET_PASSWORD("重置密码","SMS_294195165"),
+    LOGIN("登陆短信","SMS_298150567"),
+    RESET_PASSWORD("重置密码","SMS_298150567"),
     ;
     private final String name;
     private final String aliTemplate;
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterCarStatusEnum.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterCarStatusEnum.java
new file mode 100644
index 0000000..7792e9b
--- /dev/null
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterCarStatusEnum.java
@@ -0,0 +1,20 @@
+package com.ruoyi.xq.enums.userinfo.filter;
+
+import lombok.Getter;
+
+@Getter
+public enum UserFilterCarStatusEnum {
+    JINJI(1,"要求经济型以上配置车辆"),
+    ZHONG_XIN(2,"要求中档型以上配置车辆"),
+    HAO_HUA(3,"要求豪车型车辆"),
+    ;
+
+    private final Integer code;
+    private final String text;
+
+    UserFilterCarStatusEnum(Integer code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+}
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterChildStatusEnum.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterChildStatusEnum.java
new file mode 100644
index 0000000..62cd106
--- /dev/null
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterChildStatusEnum.java
@@ -0,0 +1,19 @@
+package com.ruoyi.xq.enums.userinfo.filter;
+
+import lombok.Getter;
+
+@Getter
+public enum UserFilterChildStatusEnum {
+    NO_CHILDREN(1,"只接受无小孩"),
+    HAVE_CHILDREN(2,"不介意小孩，但不能住一起"),
+    ;
+
+    private final Integer code;
+    private final String text;
+
+    UserFilterChildStatusEnum(Integer code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+}
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterHouseStatusEnum.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterHouseStatusEnum.java
new file mode 100644
index 0000000..d65eed9
--- /dev/null
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterHouseStatusEnum.java
@@ -0,0 +1,19 @@
+package com.ruoyi.xq.enums.userinfo.filter;
+
+import lombok.Getter;
+
+@Getter
+public enum UserFilterHouseStatusEnum {
+    HAVE_HOUSE_AND_NO_LOANS(1,"必须有房无贷款"),
+    HAVE_HOUSE(2,"必须有房(不介意贷款)"),
+    ;
+
+    private final Integer code;
+    private final String text;
+
+    UserFilterHouseStatusEnum(Integer code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+}
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/kit/AliSmsKit.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/kit/AliSmsKit.java
index 2644a9c..80e11b2 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/kit/AliSmsKit.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/kit/AliSmsKit.java
@@ -137,7 +137,7 @@ public class AliSmsKit {
 		AliSmsProperties config = new AliSmsProperties();
 		messageSenderUtil.setConfig(config);
 		messageSenderUtil.init();
-		messageSenderUtil.batchSendMessagePublic(Arrays.asList("15302786929"), CodeEnum.LOGIN.getAliTemplate());
+		messageSenderUtil.sendMessage("15302786929", CodeEnum.LOGIN.getAliTemplate(), "123332");
 
 	}
 
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
index 30b4ccf..bd26981 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
@@ -112,6 +112,7 @@ public class CurrentUserManager {
         vo.setFinishBaseStatus(user.getFinishBaseStatus());
         vo.setBaseStep(user.getBaseStep());
         vo.setImToken(user.getImToken());
+        vo.setWxCode(user.getWxCode());
         UserAuth userAuth = userAuthService.getByUserId(userId);
         vo.setAlreadyAuthNum(userAuth.getAlreadyAuthNum());
         List<UserPictures> userPictures = userPicturesService.listByUserIdAuditingAndSuccess(user.getId());