合并代码

无关风月

2025-01-21 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -179,7 +179,6 @@
        return appUser;
    }

    // todo 短信验证码
    @ResponseBody
    @PostMapping("/base/appUser/getSMSCode")
    @ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
@@ -469,7 +468,6 @@
    @PostMapping("/base/appUser/addVipPaymentAliCallback")
    public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
        try {
            System.err.println("==============购买优惠卷回调=========");
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            if (null != map) {
                String out_trade_no = map.get("out_trade_no");
@@ -520,15 +518,18 @@
    @PostMapping("/base/appUser/updateAppUser")
    public void updateAppUser(@RequestBody TAppUser appUser) {
        try {
            TAppUser appUser1 = appUserService.getById(appUser.getId());
            appUserService.updateById(appUser);
            UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
            userIntegralChanges.setAppUserId(appUser.getId());
            userIntegralChanges.setOldIntegral(appUser.getIntegral() + appUser.getPoints());
            userIntegralChanges.setType(5);
            userIntegralChanges.setNewIntegral(appUser.getIntegral());
            userIntegralChanges.setInsertTime(new Date());
            userIntegralChanges.setCategory(2);
            userIntegralChangesService.save(userIntegralChanges);
            if(appUser.getIntegral().compareTo(appUser1.getIntegral()) != 0){
                UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
                userIntegralChanges.setAppUserId(appUser.getId());
                userIntegralChanges.setOldIntegral(appUser1.getIntegral());
                userIntegralChanges.setType(5);
                userIntegralChanges.setNewIntegral(appUser.getIntegral());
                userIntegralChanges.setInsertTime(new Date());
                userIntegralChanges.setCategory(2);
                userIntegralChangesService.save(userIntegralChanges);
            }

        } catch (Exception e) {
            e.printStackTrace();
@@ -601,4 +602,45 @@
        System.out.println("=======selectDtos======>" + selectDtos);
        return selectDtos;
    }


    @PostMapping("/appUser/queryAppUserByCityCode")
    public List<TAppUser> queryAppUserByCityCode(@RequestBody String cityCode){
        return appUserService.list(new QueryWrapper<TAppUser>()
                .eq("state", 1)
                .eq("cityCode", cityCode)
        );
    }



    /**
     * 根据城市code获取用户的id集合
     * @param cityCode 城市code
     * @return
     */
    @PostMapping("/appUser/getAppUserIds")
    public List<Integer> getAppUserIds(@RequestBody String cityCode){
        List<TAppUser> list = appUserService.list(new QueryWrapper<TAppUser>().eq("cityCode", cityCode).eq("state", 1));
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }


    /**
     * 根据省市名称所有用户
     * @param appUserIdsByCityName
     * @return
     */
    @PostMapping("/appUser/getAppUserIdsByCityName")
    public List<Integer> getAppUserIdsByCityName(@RequestBody AppUserIdsByCityName appUserIdsByCityName){
        QueryWrapper<TAppUser> queryWrapper = new QueryWrapper<TAppUser>().eq("state", 1);
        if(ToolUtil.isNotEmpty(appUserIdsByCityName.getProvince())){
            queryWrapper.like("province", appUserIdsByCityName.getProvince());
        }
        if(ToolUtil.isNotEmpty(appUserIdsByCityName.getCity())){
            queryWrapper.like("city", appUserIdsByCityName.getCity());
        }
        List<TAppUser> list = appUserService.list(queryWrapper);
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }
}