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

lidongdong

2022-10-12 119a07bcc03db7c7dbd09b377cc18f3db6cbdd37

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -26,7 +26,7 @@
@Api(tags = {"用户接口"})
@RestController
@RequestMapping("/user")
public class UserController extends BaseController{
public class UserController extends BaseController {
    @Autowired
    com.dg.core.service.ISysUserService IUserService;

@@ -67,7 +67,7 @@
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
                //默认  1系统后台用户
                newSysUser.setUserType("1");
                newSysUser.setUserType("3");
                newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                newSysUser.setUserId(huaChengSysUser.getUserId());
                newSysUser.setUserName(huaChengSysUser.getNickName());
@@ -145,6 +145,18 @@
        return IUserService.loginByAccount(phonenumber,code);
    }


    @ApiOperation("通过手机号获取用户信息 登录")
    @PostMapping(value = "/loginPhionne")
    public ResultData loginPhionne(@RequestParam String phonenumber)
    {
        if(StringUtils.isEmpty(phonenumber))
        {
            return ResultData.error("请输入手机号");
        }
        return IUserService.loginByPhonenumber(phonenumber);
    }

    /**
     * 查询列表
     *
@@ -200,7 +212,7 @@
            return error("该账户已存在！");
        }

        config.setUserType("1");
        config.setUserType("3");

        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
@@ -229,7 +241,7 @@
            return error("账户不能为空");
        }

        config.setUserType("1");
        config.setUserType("3");

        return toAjax(IUserService.updateConfig(config));
    }