diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/XhpcUserPrivilege.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/XhpcUserPrivilege.java index a5f74d32..120abf15 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/XhpcUserPrivilege.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/XhpcUserPrivilege.java @@ -1,13 +1,10 @@ package com.ruoyi.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import javax.validation.constraints.NotBlank; import java.io.Serializable; /** - * 角色和部门关联 sys_role_dept + * 运营者子账号权限 xhpc_user_privilege * * @author ruoyi */ diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java new file mode 100644 index 00000000..044e90b2 --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -0,0 +1,58 @@ +package com.xhpc.user.controller; + +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.security.annotation.PreAuthorize; +import com.xhpc.user.service.IXhpcAppUserUserService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * C端用户 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/app/user") +public class XhpcAppUserController extends BaseController { + + @Autowired + private IXhpcAppUserUserService iXhpcAppUserUserService; + + /** + * C端用户详情 + */ + @ApiOperation("C端用户详情") + @PreAuthorize(hasPermi = "app:user:info") + @GetMapping("/info") + public AjaxResult info(@RequestBody Long appUserId) { + return AjaxResult.success(iXhpcAppUserUserService.info(appUserId)); + } + + /** + * C端用户分页列表 + */ + @PreAuthorize(hasPermi = "app:user:page") + @GetMapping("/page") + public TableDataInfo page(String phone) { + startPage(); + List> list = iXhpcAppUserUserService.selectAppUserList(phone); + return getDataTable(list); + } + + /** + * 禁用/启用C端用户 + */ + @ApiOperation("禁用/启用C端用户") + @PreAuthorize(hasPermi = "app:user:status") + @PostMapping("/status") + public AjaxResult status(@RequestBody Long appUserId) { + iXhpcAppUserUserService.status(appUserId); + return AjaxResult.success(); + } +} diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java index d5df7e1d..bcfe707b 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java @@ -121,8 +121,8 @@ public class XhpcInternetUserController extends BaseController { @ApiOperation("禁用/启用流量用户") @PreAuthorize(hasPermi = "user:internet:status") @PostMapping("/status") - public AjaxResult status(@RequestBody Long id) { - iXhpcInternetUserService.status(id); + public AjaxResult status(@RequestBody Long internetUserId) { + iXhpcInternetUserService.status(internetUserId); return AjaxResult.success(); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java index 3e781980..519dcf55 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java @@ -129,8 +129,8 @@ public class XhpcOperatorController extends BaseController { @ApiOperation("禁用/启用运营商") @PreAuthorize(hasPermi = "user:operator:status") @PostMapping("/status") - public AjaxResult status(@RequestBody Long id) { - iXhpcOperatorService.status(id); + public AjaxResult status(@RequestBody Long operatorId) { + iXhpcOperatorService.status(operatorId); return AjaxResult.success(); } } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcAppUser.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcAppUser.java new file mode 100644 index 00000000..b9206c33 --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcAppUser.java @@ -0,0 +1,130 @@ +package com.xhpc.user.domain; + +import com.ruoyi.common.core.web.domain.BaseEntity; + + +/** + * C端用户 xhpc_app_user + * + * @author ruoyi + */ +public class XhpcAppUser extends BaseEntity { + + + /** + * 用户id + */ + private Long appUserId; + + /** + * 手机号码 + */ + private String phone; + + /** + * weixin_open_id + */ + private String weixinOpenId; + + /** + * alipay_open_id + */ + private String alipayOpenId; + + /** + * 头像地址 + */ + private String avatar; + + /** + * 余额 + */ + private Double balance; + + /** + * 密码(加密) + */ + private String password; + + /** + * 帐号状态 + */ + private Integer status; + + /** + * 删除标志(0代表存在 2代表删除) + */ + private String delFlag; + + public Long getAppUserId() { + return appUserId; + } + + public void setAppUserId(Long appUserId) { + this.appUserId = appUserId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getWeixinOpenId() { + return weixinOpenId; + } + + public void setWeixinOpenId(String weixinOpenId) { + this.weixinOpenId = weixinOpenId; + } + + public String getAlipayOpenId() { + return alipayOpenId; + } + + public void setAlipayOpenId(String alipayOpenId) { + this.alipayOpenId = alipayOpenId; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public Double getBalance() { + return balance; + } + + public void setBalance(Double balance) { + this.balance = balance; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } +} diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java new file mode 100644 index 00000000..b43240bf --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java @@ -0,0 +1,41 @@ +package com.xhpc.user.mapper; + +import com.xhpc.user.domain.XhpcAppUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * C端用户信息 数据层 + * + * @author ruoyi + */ +public interface XhpcAppUserMapper { + + /** + * 修改C端用户信息 + * + * @param xhpcAppUser C端用户信息 + * @return 结果 + */ + public int update(XhpcAppUser xhpcAppUser); + + + /** + * 查询C端用户详情 + * + * @param appUserId C端用户id + * @return 结果 + */ + public Map info(@Param("appUserId") Long appUserId); + + /** + * C端用户分页列表 + * + * @param phone 手机号 + * @return 结果 + */ + public List> selectAppUserList(@Param("phone") String phone); + +} diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java new file mode 100644 index 00000000..27388e59 --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java @@ -0,0 +1,47 @@ +package com.xhpc.user.service; + +import com.xhpc.user.domain.XhpcAppUser; + +import java.util.List; +import java.util.Map; + + +/** + * C端用户信息 服务层 + * + * @author ruoyi + */ +public interface IXhpcAppUserUserService { + + /** + * 更新C端用户 + * + * @param xhpcAppUser C端用户 + */ + public int update(XhpcAppUser xhpcAppUser); + + + /** + * C端用户详情 + * + * @param appUserId C端用户id + * @return 结果 + */ + public Map info(Long appUserId); + + /** + * C端用户分页列表 + * + * @param phone 手机号 + * @return 结果 + */ + public List> selectAppUserList(String phone); + + /** + * 禁用/启用C端用户 + * + * @param appUserId C端用户id + * @return 结果 + */ + public void status(Long appUserId); +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java new file mode 100644 index 00000000..d05592bd --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -0,0 +1,73 @@ +package com.xhpc.user.service.impl; + +import com.ruoyi.common.core.utils.StringUtils; +import com.xhpc.user.domain.XhpcAppUser; +import com.xhpc.user.mapper.XhpcAppUserMapper; +import com.xhpc.user.service.IXhpcAppUserUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * C端用户信息 服务层 + * + * @author ruoyi + */ +@Service +public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { + + @Autowired + private XhpcAppUserMapper xhpcAppUserMapper; + + + /** + * 更新C端用户 + * + * @param xhpcAppUser C端用户 + */ + @Override + public int update(XhpcAppUser xhpcAppUser) { + return xhpcAppUserMapper.update(xhpcAppUser); + } + + + /** + * C端用户详情 + * + * @param appUserId C端用户id + * @return 结果 + */ + @Override + public Map info(Long appUserId) { + return xhpcAppUserMapper.info(appUserId); + } + + /** + * C端用户分页列表 + * + * @param phone 手机号 + * @return 结果 + */ + @Override + public List> selectAppUserList(String phone) { + return xhpcAppUserMapper.selectAppUserList(phone); + } + + /** + * 禁用/启用C端用户 + * + * @param appUserId C端用户id + * @return 结果 + */ + @Override + public void status(Long appUserId) { + Map map = xhpcAppUserMapper.info(appUserId); + String status = StringUtils.valueOf(map.get("status")); + XhpcAppUser xhpcAppUser = new XhpcAppUser(); + xhpcAppUser.setAppUserId(appUserId); + xhpcAppUser.setStatus("0".equals(status) ? 1 : 0); + update(xhpcAppUser); + } +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml new file mode 100644 index 00000000..659d1f10 --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + UPDATE xhpc_app_user + + phone = #{phone}, + weixin_open_id = #{weixinOpenId}, + alipay_open_id = #{alipayOpenId}, + avatar = #{avatar}, + balance = #{balance}, + password = #{password}, + status = #{status}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark} + + WHERE app_user_id = #{appUserId} + + + + + + + + \ No newline at end of file