From d6578ec702eb4fcff690d71ea3237a885f46b85c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 七月 2022 15:37:49 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 2c2e927..c8d98ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -18,6 +18,7 @@
 import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -453,6 +454,15 @@
     R updateUserIsPartymember(String idCard);
 
     /**
+     * 修改用户的党员状态
+     *
+     * @param phone
+     *            身份证号
+     * @return 修改结果
+     */
+    R updateUserIsPartymemberByPhone(String phone);
+
+    /**
      * 修改用户为非党员状态
      *
      * @param idCard
@@ -828,4 +838,19 @@
     R deleteUserCashByPhone(String phone);
 
     R updateUserPartyStatus(Long userId);
+
+    /**
+     * uu洗车登录
+     * @param uuLoginVO
+     * @return
+     */
+    R uuLogin(UuLoginVO uuLoginVO);
+
+    /**
+     * 导出验证密码
+     * @param account
+     * @param password
+     * @return
+     */
+    R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
 }

--
Gitblit v1.7.1