Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-11-08 947d016e4bd349b78d540e3a869f55d68b2c610c

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -902,9 +903,23 @@
    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);

    /**
     * 无水洗车通知推送
     * @param phone
     * @param orderStatus
     * @return
     */
    R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);

    /**
     * 获取城镇或村落列表
     * */
    R getCommunityList(String name,Long id);

    /**
     * 获取所有城镇或村落列表
     * @return
     */
    R getAllCommunityList();

    /**
     * 重置密码
@@ -930,4 +945,28 @@
     * 三说会堂后台重置密码
     * */
    R resetPassExpertOrIndustryCenter(String account,String password);

    /**
     * 用户授权
     * @param userId
     * @return
     */
    R accept(Long userId);

    R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);

    /**
     * 移除专家权限
     * */
    R removeExpertRole(String phone);

    /**
     * 回复用户反馈
     * */
    R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO);

    /**
     * 查看我的问题留言或者问题留言记录
     * */
    R myFeedBack(Long id,Integer type);
}