Merge branch 'huacheng_test' into haucheng_panzhihua

yanghui

2022-11-04 1a6eb2ac656de3b35c64db8b9006db2ed9248872

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -45,7 +46,7 @@
     */
    @PostMapping("/addOrUpdate")
    R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
        @RequestParam("unionid") String unionid);
        @RequestParam("unionid") String unionid,@RequestParam("appId")String appId);

    /**
     * 维护小程序用户基本信息 头像 昵称 性别
@@ -143,6 +144,9 @@
     */
    @GetMapping("resetPassword")
    R resetPassword(@RequestParam("userId") Long userId);

    @GetMapping("/resetPasswordAccount")
    R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId);

    /**
     * 批量重置密码用户登录密码默认admin123456
@@ -536,7 +540,7 @@
     * @return 协议内容
     */
    @PostMapping("useragreement")
    R userAgreement(@RequestParam("type") int type);
    R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);

    /**
     * uu洗车登录
@@ -697,7 +701,7 @@
     * @return 协议内容
     */
    @PostMapping("agreement")
    R agreement(@RequestParam("type") Integer type);
    R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);

    /**
     * 维护用户最后登录时间
@@ -1222,7 +1226,6 @@
    @PostMapping("/update/user/party/status")
    R updateUserPartyStatus(@RequestParam("userId") Long userId);


    /**
     *导出验证密码
     */
@@ -1232,27 +1235,92 @@
    @GetMapping("/indexData/totalData")
    R newIndexData(@RequestParam(value = "type",required = false) Integer type,
                   @RequestParam(value = "type",required = false) Long streetId,
                   @RequestParam(value = "areaCode",required = false) Long areaCode);
                   @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId);

    @GetMapping("/indexData/userRate")
    R userRate(@RequestParam(value = "type",required = false) Integer type,
               @RequestParam(value = "streetId",required = false) Long streetId,
               @RequestParam(value = "areaCode",required = false) Long areaCode,
               @RequestParam(value = "range",required = false) Integer range);
               @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);


    @GetMapping("/indexData/realUser")
    R realUser(@RequestParam(value = "type",required = false) Integer type,
               @RequestParam(value = "streetId",required = false) Long streetId,
               @RequestParam(value = "areaCode",required = false) Long areaCode,
               @RequestParam(value = "range",required = false) Integer range);
               @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);

    @GetMapping("/indexData/userActivity")
    R userActivity(@RequestParam(value = "type",required = false) Integer type,
                   @RequestParam(value = "streetId",required = false) Long streetId,
                   @RequestParam(value = "areaCode",required = false) Long areaCode,
                   @RequestParam(value = "range",required = false) Integer range);
    R userActivity(@RequestParam(value = "type", required = false) Integer type,
                   @RequestParam(value = "streetId", required = false) Long streetId,
                   @RequestParam(value = "areaCode", required = false) Long areaCode,
                   @RequestParam(value = "range", required = false) Integer range, @RequestParam(value = "appId",required = false) String appId);

    @GetMapping("/indexData/getAreaAndStreet")
    R getAreaAndStreet();
    /**
     * uu洗车推送
     * @param washPhone
     * @param phone
     * @param washName
     * @param orderStatus
     * @return
     */
    @GetMapping("/uuPush")
    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
    /**
     * 无水洗车推送
     * @param washPhone
     * @param phone
     * @param washName
     * @param orderStatus
     * @return
     */
    @GetMapping("/wsPush")
    R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
    @GetMapping("/communityList")
    R communityList(@RequestParam("name") String name, @RequestParam("id") Long  id);


    @PostMapping("/tfLogin")
    R tfLogin(@RequestBody UuLoginVO uuLoginVO);

    /**
     * 三说会堂添加后台账户
     * */
    @PostMapping("/sanshuoAddUser")
    R sanShuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 三说会堂重置密码
     * */
    @GetMapping("/sanshuoResetPassword")
    R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);


    @GetMapping("/accept")
     R accept(@RequestParam("userId")Long userId);

    @PostMapping("/addComPbCheckUser")
     R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);



    /**
     * 是否为专家登陆小程序
     * */
    @GetMapping("/isSanShuoExpert")
    R isExpert(@RequestParam("number") String number);

    /**
     * 删除用户专家权限
     * */
    @GetMapping("/removeExpertRole")
    R removeExpertRole(@RequestParam(value = "phone",required = false) String phone);

    /**
     *回复反馈意见或修改返回意见的回复
     * */
    @PostMapping("/feedBackReply")
    R updateFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO);
}