党建bug修改

101captain

2022-03-31 07e29422c8559295bd6a5594e6f95f9e08d0bc95

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

@@ -5,6 +5,8 @@
import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
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 org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -18,6 +20,8 @@
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;

import javax.validation.Valid;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -220,7 +224,7 @@
     * @return 人员详情
     */
    @PostMapping("detailuser")
    R detailUser(@RequestParam("userId") Long userId);
    R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);

    /**
     * 设置用户标签
@@ -345,6 +349,17 @@
    @PostMapping("adduserbackstageproperty")
    R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);


    /**
     * 更新
     *
     * @param administratorsUserVO
     *            编辑账户内容
     * @return 编辑结果
     */
    @PostMapping("updateStreet")
    R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 编辑运营、社区后台账户
     * 
@@ -373,7 +388,7 @@
     * @return 角色集合
     */
    @PostMapping("/role/listrolebackstage")
    R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
    R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode);

    /**
     * 分页查询后台用户
@@ -589,7 +604,7 @@
     * @return 运营后台数据看板
     */
    @PostMapping("datakanban")
    R dataKanban();
    R dataKanban(@RequestParam("areaCode")String areaCode);

    /**
     * 用户菜单获取
@@ -1077,14 +1092,14 @@
     * @return  用户数据统计汇总
     */
    @GetMapping("community/statistics")
    R communityStatistics();
    R communityStatistics(@RequestParam("areaCode") String areaCode);

    /**
     * 运营后台-用户数据统计导出
     * @return  用户数据
     */
    @GetMapping("community/statistics/export")
    R communityStatisticsExport();
    R communityStatisticsExport(@RequestParam("areaCode") String areaCode);

    /**
     * 通过UnionId获取用户信息
@@ -1093,6 +1108,23 @@
     */
    @GetMapping("/getByUnionId")
    R getUserInfoByUnionId(@RequestParam("unionId") String unionId);

    /**
     * 小程序id获取相关信息
     * @param appId
     * @return
     */
    @GetMapping("/sysAppConfig/selectByAppid")
    R<SysAppConfigVO> selectByAppid(@RequestParam("appId")String appId);

    /**
     * 通过区域编码 类型获取动态模板id
     * @param areaCode
     * @param type
     * @return
     */
    @GetMapping("/sysTemplateConfig/selectTemplate")
    R<SysTemplateConfigVO> selectTemplate(@RequestParam("areaCode")String areaCode,@RequestParam("type")Integer type);

    /**
     * 微商业街新增商家账号
@@ -1129,7 +1161,7 @@
    R getSysUserByPhone(@RequestParam("phone") String phone, @RequestParam("type") Integer type);

    /**
     * 发送验证码登录
     * 发送验证码
     * @param phone 手机号
     * @param clientIP 用户ip
     * @param prefixKey redis Key 前缀
@@ -1137,10 +1169,33 @@
     * @param timeout 超次数获取时间等待
     * @return
     */
    @GetMapping("/sendMessageCodeForLogin")
    R sendMessageCodeForLogin(@RequestParam("phone") String phone,
    @GetMapping("/sendMessageCode")
    R sendMessageCode(@RequestParam("phone") String phone,
                              @RequestParam(value = "clientIP", required = false) String clientIP,
                              @RequestParam("prefixKey") String prefixKey,
                              @RequestParam("limit") Integer limit,
                              @RequestParam("timeout") Integer timeout);

    /**
     * 根据openId获取微商业街用户
     * @param openid
     * @return
     */
    @GetMapping("/getMcsUserByOpenId")
    R getMcsUserByOpenId(@RequestParam("openid") String openid);

    /**
     * 商业街用户微信授权-绑定手机号
     * @param bindUserPhoneDTO
     * @return
     */
    @PostMapping("/mcs/bindPhone")
    R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO);

    /**
     * 删除用户信息缓存
     * @param phone
     */
    @DeleteMapping("/deleteUserCashByPhone")
    R deleteUserCashByPhone(@RequestParam("phone") String phone);
}