Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

 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.*;

@@ -145,7 +146,7 @@
    R resetPassword(@RequestParam("userId") Long userId);

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

    /**
     * 批量重置密码用户登录密码默认admin123456
@@ -1250,10 +1251,10 @@
               @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();
@@ -1274,4 +1275,31 @@

    @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);
}