yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1修改账号相关接口

Browse Source
This commit is contained in:
fengjundan 2021-07-22 14:01:28 +08:00
parent fc8104ea23
commit ebc4ba6496
16 changed files with 266 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
View File

@ -370,6 +370,7 @@ public class SysUser extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("userType", getUserType())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("email", getEmail())

30
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/XhpcUserPrivilegeController.java
View File

@ -1,34 +1,20 @@
package com.ruoyi.system.controller;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.SecurityUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
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.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.PreAuthorize;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.XhpcUserPrivilege;
import com.ruoyi.system.service.*;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.IXhpcUserPrivilegeService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 用户信息
@ -51,13 +37,13 @@ public class XhpcUserPrivilegeController extends BaseController {
/**
* 加载对应角色菜单列表树
*/
@PreAuthorize(hasPermi = "user:privilege:power")
//@PreAuthorize(hasPermi = "user:privilege:power")
@GetMapping(value = "/power")
public AjaxResult roleMenuTreeselect(@PathVariable("userId") Long userId) {
public AjaxResult roleMenuTreeselect(@RequestParam Long userId) {
Long SecurityUserId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuList(SecurityUserId);
//登录用户拥有的数据权限树
List<Map<String, Object>> data = iXhpcUserPrivilegeService.dataList(SecurityUserId);
List<Map<String, Object>> dataList = iXhpcUserPrivilegeService.dataList(SecurityUserId);
//选择用户拥有的权限
List<String> dataCheckedKeys = iXhpcUserPrivilegeService.dataCheckedKeys(userId);
AjaxResult ajax = AjaxResult.success();
@ -65,7 +51,7 @@ public class XhpcUserPrivilegeController extends BaseController {
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(sysRole.getRoleId()));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
ajax.put("dataCheckedKeys", dataCheckedKeys);
ajax.put("data", data);
ajax.put("dataList", dataList);
return ajax;
}
@ -73,7 +59,7 @@ public class XhpcUserPrivilegeController extends BaseController {
* 新增数据权限
*/
@ApiOperation("新增数据权限")
@PreAuthorize(hasPermi = "user:privilege:add")
//@PreAuthorize(hasPermi = "user:privilege:add")
@PostMapping("/add")
public AjaxResult add(@RequestBody List<XhpcUserPrivilege> list) {
if (null != list && list.size() > 0) {

51
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -4,29 +4,30 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="userName" column="user_name"/>
<result property="nickName" column="nick_name"/>
<result property="email" column="email"/>
<result property="phonenumber" column="phonenumber"/>
<result property="sex" column="sex"/>
<result property="avatar" column="avatar"/>
<result property="password" column="password"/>
<result property="operatorId" column="operator_id"/>
<result property="dataPowerType" column="data_power_type"/>
<result property="internetUserId" column="internet_user_id"/>
<result property="status" column="status"/>
<result property="delFlag" column="del_flag"/>
<result property="loginIp" column="login_ip"/>
<result property="loginDate" column="login_date"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<resultMap id="SysUserResult" type="com.ruoyi.system.api.domain.SysUser">
<result column="user_id" property="userId"/>
<result column="dept_id" property="deptId"/>
<result column="user_name" property="userName"/>
<result column="user_type" property="userType"/>
<result column="nick_name" property="nickName"/>
<result column="email" property="email"/>
<result column="phonenumber" property="phonenumber"/>
<result column="operator_id" property="operatorId"/>
<result column="internet_user_id" property="internetUserId"/>
<result column="sex" property="sex"/>
<result column="avatar" property="avatar"/>
<result column="password" property="password"/>
<result column="data_power_type" property="dataPowerType"/>
<result column="status" property="status"/>
<result column="del_flag" property="delFlag"/>
<result column="login_ip" property="loginIp"/>
<result column="login_date" property="loginDate"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
<result column="remark" property="remark"/>
<association column="dept_id" property="dept" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
@ -50,8 +51,8 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,u.data_power_type ,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.user_type
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id

4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/XhpcUserPrivilegeMapper.xml
View File

@ -32,7 +32,7 @@
delete from xhpc_station_internet_blacklist where user_id = #{userId}
</delete>
<select id="dataCheckedKeys" parameterType="String" resultType="java.lang.String">
<select id="dataCheckedKeys" parameterType="Long" resultType="java.lang.String">
select charging_station_id chargingStationId from xhpc_user_privilege where user_id = #{userId}
</select>
@ -132,7 +132,7 @@
<select id="dataPowerByOperatorId" parameterType="String" resultType="java.util.Map">
select xcs.charging_station_id ,xcs.name
select xcs.charging_station_id chargingStationId,xcs.name
from xhpc_charging_station xcs
LEFT JOIN xhpc_area `xa` on `xa`.`code` = xcs.area_code
LEFT JOIN xhpc_area pxa on `xa`.pcode = pxa.`code`

4
xhpc-modules/xhpc-user/pom.xml
View File

@ -89,6 +89,10 @@
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
</dependencies>
<build>

18
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java
View File

@ -8,7 +8,6 @@ import com.ruoyi.common.core.domain.R;
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;
@ -34,7 +33,7 @@ public class XhpcAppUserController extends BaseController {
* C端用户详情
*/
@ApiOperation("C端用户详情")
@PreAuthorize(hasPermi = "app:user:info")
//@PreAuthorize(hasPermi = "app:user:info")
@GetMapping("/info")
public AjaxResult info(@RequestParam Long appUserId) {
return AjaxResult.success(iXhpcAppUserUserService.info(appUserId));
@ -43,7 +42,7 @@ public class XhpcAppUserController extends BaseController {
/**
* C端用户分页列表
*/
@PreAuthorize(hasPermi = "app:user:page")
//@PreAuthorize(hasPermi = "app:user:page")
@GetMapping("/page")
public TableDataInfo page(String phone) {
startPage();
@ -55,7 +54,7 @@ public class XhpcAppUserController extends BaseController {
* 禁用/启用C端用户
*/
@ApiOperation("禁用/启用C端用户")
@PreAuthorize(hasPermi = "app:user:status")
//@PreAuthorize(hasPermi = "app:user:status")
@PostMapping("/status")
public AjaxResult status(@RequestParam Long appUserId) {
iXhpcAppUserUserService.status(appUserId);
@ -89,7 +88,7 @@ public class XhpcAppUserController extends BaseController {
*/
@ApiOperation("小程序用户详情")
@GetMapping("/appInfo")
public AjaxResult appInfo(@RequestBody Long appUserId) {
public AjaxResult appInfo(@RequestParam Long appUserId) {
return AjaxResult.success(iXhpcAppUserUserService.info(appUserId));
}
@ -133,4 +132,13 @@ public class XhpcAppUserController extends BaseController {
return AjaxResult.success(response);
}
/**
* 注销账号
*/
@ApiOperation("注销账号")
@PostMapping("/logout")
public AjaxResult logout(@RequestParam Long appUserId) {
iXhpcAppUserUserService.logout(appUserId);
return AjaxResult.success();
}
}

14
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java
View File

@ -38,7 +38,7 @@ public class XhpcInternetUserController extends BaseController {
* 新增流量用户
*/
@ApiOperation("新增流量用户")
@PreAuthorize(hasPermi = "user:internet:add")
//@PreAuthorize(hasPermi = "user:internet:add")
@PostMapping("/add")
public AjaxResult add(@Valid @RequestBody XhpcInternetUser xhpcInternetUser) {
SysUser sysUser = new SysUser();
@ -89,9 +89,9 @@ public class XhpcInternetUserController extends BaseController {
* 删除流量用户
*/
@ApiOperation("删除流量用户")
@PreAuthorize(hasPermi = "user:internet:remove")
//@PreAuthorize(hasPermi = "user:internet:remove")
@PostMapping("/remove")
public AjaxResult remove(@RequestParam Long[] ids) {
public AjaxResult remove(@PathVariable Long[] ids) {
iXhpcInternetUserService.deleteByIds(ids);
return AjaxResult.success();
}
@ -100,7 +100,7 @@ public class XhpcInternetUserController extends BaseController {
* 流量用户详情
*/
@ApiOperation("流量用户详情")
@PreAuthorize(hasPermi = "user:internet:info")
//@PreAuthorize(hasPermi = "user:internet:info")
@GetMapping("/info")
public AjaxResult info(@RequestParam Long internetUserId) {
return AjaxResult.success(iXhpcInternetUserService.info(internetUserId));
@ -109,7 +109,7 @@ public class XhpcInternetUserController extends BaseController {
/**
* 流量用户分页列表
*/
@PreAuthorize(hasPermi = "system:internet:page")
//@PreAuthorize(hasPermi = "system:internet:page")
@GetMapping("/page")
public TableDataInfo page(String name, String contactName, String contactPhone) {
startPage();
@ -121,7 +121,7 @@ public class XhpcInternetUserController extends BaseController {
* 禁用/启用流量用户
*/
@ApiOperation("禁用/启用流量用户")
@PreAuthorize(hasPermi = "user:internet:status")
//@PreAuthorize(hasPermi = "user:internet:status")
@PostMapping("/status")
public AjaxResult status(@RequestParam Long internetUserId) {
iXhpcInternetUserService.status(internetUserId);
@ -132,7 +132,7 @@ public class XhpcInternetUserController extends BaseController {
* 流量用户列表
*/
@ApiOperation("流量用户列表")
@PreAuthorize(hasPermi = "user:internet:list")
//@PreAuthorize(hasPermi = "user:internet:list")
@GetMapping("/list")
public TableDataInfo list(String name) {
List<Map<String, Object>> list = iXhpcInternetUserService.list(name);

6
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java
View File

@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map;
/**
* 流量用户
* 运营商设置流量方黑名单
*
* @author ruoyi
*/
@ -27,9 +27,9 @@ public class XhpcOperatorInternetBlacklistController extends BaseController {
private IXhpcOperatorInternetBlacklistService xhpcOperatorInternetBlacklistService;
/**
* 新增流量用户
* 新增运营商设置流量方黑名单
*/
@ApiOperation("新增流量用户")
@ApiOperation("新增运营商设置流量方黑名单")
@PreAuthorize(hasPermi = "operator:internet:add")
@PostMapping("/add")
public AjaxResult add(@Valid @RequestBody List<XhpcOperatorInternetBlacklist> list) {

2
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java
View File

@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map;
/**
* 流量用户
* 电站流量方黑名单
*
* @author ruoyi
*/

9
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java
View File

@ -17,7 +17,6 @@ public class XhpcInternetUser extends BaseEntity {
/**
* 用户id
*/
@NotNull(message = "用户id不能为空")
private Long internetUserId;
/**
@ -54,18 +53,16 @@ public class XhpcInternetUser extends BaseEntity {
* 卡号
*/
@NotNull(message = "卡号不能为空")
private Integer cardNumber;
private Long cardNumber;
/**
* 合作开始时间
*/
@NotNull(message = "合作开始时间不能为空")
private Date cooperationStartTime;
/**
* 合作结束时间
*/
@NotNull(message = "合作结束时间不能为空")
private Date cooperationEndTime;
/**
@ -173,11 +170,11 @@ public class XhpcInternetUser extends BaseEntity {
this.openBank = openBank;
}
public Integer getCardNumber() {
public Long getCardNumber() {
return cardNumber;
}
public void setCardNumber(Integer cardNumber) {
public void setCardNumber(Long cardNumber) {
this.cardNumber = cardNumber;
}

8
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java
View File

@ -29,6 +29,14 @@ public interface XhpcAppUserMapper {
*/
public int update(XhpcAppUser xhpcAppUser);
/**
* 删除C端用户信息
*
* @param appUserId C端用户id
* @return 结果
*/
public int deleteById(@Param("appUserId") Long appUserId);
/**
* 查询C端用户详情

7
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java
View File

@ -80,4 +80,11 @@ public interface IXhpcAppUserUserService {
*/
public R<?> voluntaryLogin(Map<String, Object> map);
/**
* 注销账号
*
* @param appUserId C端用户id
* @return
*/
public void logout(Long appUserId);
}

12
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
View File

@ -234,6 +234,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
* @param map type 登录方式1微信2小程序 openid 微信或支付宝openid
* @return
*/
@Override
public R<?> voluntaryLogin(Map<String, Object> map) {
String type = StringUtils.valueOf(map.get("type"));
String openid = StringUtils.valueOf(map.get("openid"));
@ -243,4 +244,15 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
}
return appLogin(user.getPhone(), type, openid);
}
/**
* 注销账号
*
* @param appUserId
* @return
*/
@Override
public void logout(Long appUserId) {
xhpcAppUserMapper.deleteById(appUserId);
}
}

12
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInternetUserServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.domain.SysUser;
import com.xhpc.user.domain.XhpcInternetUser;
import com.xhpc.user.mapper.XhpcInternetUserMapper;
import com.xhpc.user.mapper.XhpcOperatorMapper;
import com.xhpc.user.mapper.XhpcUserMapper;
import com.xhpc.user.service.IXhpcInternetUserService;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,6 +27,9 @@ public class XhpcInternetUserServiceImpl implements IXhpcInternetUserService {
@Autowired
private XhpcUserMapper xhpcUserMapper;
@Autowired
private XhpcOperatorMapper xhpcOperatorMapper;
/**
* 新增任务
*
@ -54,6 +58,14 @@ public class XhpcInternetUserServiceImpl implements IXhpcInternetUserService {
*/
@Override
public void deleteByIds(Long[] ids) {
for (Long id : ids) {
SysUser sysUser = xhpcOperatorMapper.getUserByOperatorId(id);
// 删除用户与角色关联
xhpcOperatorMapper.deleteUserRoleByUserId(sysUser.getUserId());
// 删除用户与岗位表
xhpcOperatorMapper.deleteUserPostByUserId(sysUser.getUserId());
xhpcOperatorMapper.deleteUserById(sysUser.getUserId(), "2");
}
xhpcInternetUserMapper.deleteByIds(ids);
}

8
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
View File

@ -149,6 +149,10 @@
WHERE app_user_id = #{appUserId}
</update>
<delete id="deleteById" parameterType="java.lang.Long">
delete from xhpc_app_user where app_user_id = #{appUserId}
</delete>
<select id="info" parameterType="java.lang.Long" resultType="java.util.Map">
select app_user_id appUserId, phone, weixin_open_id weixinOpenId,
weixin_login weixinlogin,alipay_login alipayLogin,
@ -156,7 +160,7 @@
`status`,create_by createBy ,create_time createTime,
update_time updateTime, update_by updateBy,
del_flag delflag, remark,
CASE WHEN xiu.`status` = 0 THEN '正常' else '禁用' end statusName,
CASE WHEN `status` = 0 THEN '正常' else '禁用' end statusName
from xhpc_app_user
WHERE del_flag = 0 and app_user_id = #{appUserId}
</select>
@ -164,7 +168,7 @@
<select id="selectAppUserList" parameterType="java.lang.Long" resultType="java.util.Map">
select app_user_id appUserId, phone, balance,
`status`,create_time createTime,
CASE WHEN xiu.`status` = 0 THEN '正常' else '禁用' end statusName
CASE WHEN `status` = 0 THEN '正常' else '禁用' end statusName
from xhpc_app_user
WHERE del_flag = 0
<if test="phone != null and phone != ''">

303
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
View File

@ -12,8 +12,8 @@
<result column="contact_phone" property="contactPhone"/>
<result column="open_bank" property="openBank"/>
<result column="card_number" property="cardNumber"/>
<result column="cooperation_start_time" property="cooperationStartTime"/>
<result column="cooperation_end_time" property="cooperationEndTime"/>
<result column="cooperation_start_time" property="cooperationStartTime" jdbcType="TIMESTAMP"/>
<result column="cooperation_end_time" property="cooperationEndTime" jdbcType="TIMESTAMP"/>
<result column="money" property="money"/>
<result column="area_code" property="areaCode"/>
<result column="address" property="address"/>
@ -33,152 +33,155 @@
<insert id="insert" parameterType="com.xhpc.user.domain.XhpcInternetUser">
insert into xhpc_internet_user(
<if test="null != internetUserId and '' != internetUserId">
internet_user_id,
</if>
<if test="null != name and '' != name">
name,
</if>
<if test="null != phone and '' != phone">
phone,
</if>
<if test="null != contactName and '' != contactName">
contact_name,
</if>
<if test="null != contactPhone and '' != contactPhone">
contact_phone,
</if>
<if test="null != openBank and '' != openBank">
open_bank,
</if>
<if test="null != cardNumber and '' != cardNumber">
card_number,
</if>
<if test="null != cooperationStartTime and '' != cooperationStartTime">
cooperation_start_time,
</if>
<if test="null != cooperationEndTime and '' != cooperationEndTime">
cooperation_end_time,
</if>
<if test="null != money and '' != money">
money,
</if>
<if test="null != areaCode and '' != areaCode">
area_code,
</if>
<if test="null != address and '' != address">
address,
</if>
<if test="null != detailedAddress and '' != detailedAddress">
detailed_address,
</if>
<if test="null != commissionType and '' != commissionType">
commission_type,
</if>
<if test="null != commissionRate and '' != commissionRate">
commission_rate,
</if>
<if test="null != longitude and '' != longitude">
longitude,
</if>
<if test="null != latitude and '' != latitude">
latitude,
</if>
<if test="null != status and '' != status">
status,
</if>
<if test="null != delFlag and '' != delFlag">
del_flag,
</if>
<if test="null != createBy and '' != createBy">
create_by,
</if>
<if test="null != createTime and '' != createTime">
create_time,
</if>
<if test="null != updateBy and '' != updateBy">
update_by,
</if>
<if test="null != updateTime and '' != updateTime">
update_time,
</if>
<if test="null != remark and '' != remark">
remark
</if>
)values(
<if test="null != internetUserId and '' != internetUserId">
#{internetUserId},
</if>
<if test="null != name and '' != name">
#{name},
</if>
<if test="null != phone and '' != phone">
#{phone},
</if>
<if test="null != contactName and '' != contactName">
#{contactName},
</if>
<if test="null != contactPhone and '' != contactPhone">
#{contactPhone},
</if>
<if test="null != openBank and '' != openBank">
#{openBank},
</if>
<if test="null != cardNumber and '' != cardNumber">
#{cardNumber},
</if>
<if test="null != cooperationStartTime and '' != cooperationStartTime">
#{cooperationStartTime},
</if>
<if test="null != cooperationEndTime and '' != cooperationEndTime">
#{cooperationEndTime},
</if>
<if test="null != money and '' != money">
#{money},
</if>
<if test="null != areaCode and '' != areaCode">
#{areaCode},
</if>
<if test="null != address and '' != address">
#{address},
</if>
<if test="null != detailedAddress and '' != detailedAddress">
#{detailedAddress},
</if>
<if test="null != commissionType and '' != commissionType">
#{commissionType},
</if>
<if test="null != commissionRate and '' != commissionRate">
#{commissionRate},
</if>
<if test="null != longitude and '' != longitude">
#{longitude},
</if>
<if test="null != latitude and '' != latitude">
#{latitude},
</if>
<if test="null != status and '' != status">
#{status},
</if>
<if test="null != delFlag and '' != delFlag">
#{delFlag},
</if>
<if test="null != createBy and '' != createBy">
#{createBy},
</if>
<if test="null != createTime and '' != createTime">
#{createTime},
</if>
<if test="null != updateBy and '' != updateBy">
#{updateBy},
</if>
<if test="null != updateTime and '' != updateTime">
#{updateTime},
</if>
<if test="null != remark and '' != remark">
#{remark}
</if>
INSERT INTO xhpc_internet_user
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="null != internetUserId and '' != internetUserId">
internet_user_id,
</if>
<if test="null != name and '' != name">
name,
</if>
<if test="null != phone and '' != phone">
phone,
</if>
<if test="null != contactName and '' != contactName">
contact_name,
</if>
<if test="null != contactPhone and '' != contactPhone">
contact_phone,
</if>
<if test="null != openBank and '' != openBank">
open_bank,
</if>
<if test="null != cardNumber and '' != cardNumber">
card_number,
</if>
<if test="null != cooperationStartTime ">
cooperation_start_time,
</if>
<if test="null != cooperationEndTime ">
cooperation_end_time,
</if>
<if test="null != money and '' != money">
money,
</if>
<if test="null != areaCode and '' != areaCode">
area_code,
</if>
<if test="null != address and '' != address">
address,
</if>
<if test="null != detailedAddress and '' != detailedAddress">
detailed_address,
</if>
<if test="null != commissionType and '' != commissionType">
commission_type,
</if>
<if test="null != commissionRate and '' != commissionRate">
commission_rate,
</if>
<if test="null != longitude and '' != longitude">
longitude,
</if>
<if test="null != latitude and '' != latitude">
latitude,
</if>
<if test="null != status and '' != status">
status,
</if>
<if test="null != delFlag and '' != delFlag">
del_flag,
</if>
<if test="null != createBy and '' != createBy">
create_by,
</if>
<if test="null != createTime and '' != createTime">
create_time,
</if>
<if test="null != updateBy and '' != updateBy">
update_by,
</if>
<if test="null != updateTime and '' != updateTime">
update_time,
</if>
<if test="null != remark and '' != remark">
remark
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="null != internetUserId and '' != internetUserId">
#{internetUserId},
</if>
<if test="null != name and '' != name">
#{name},
</if>
<if test="null != phone and '' != phone">
#{phone},
</if>
<if test="null != contactName and '' != contactName">
#{contactName},
</if>
<if test="null != contactPhone and '' != contactPhone">
#{contactPhone},
</if>
<if test="null != openBank and '' != openBank">
#{openBank},
</if>
<if test="null != cardNumber and '' != cardNumber">
#{cardNumber},
</if>
<if test="null != cooperationStartTime ">
#{cooperationStartTime},
</if>
<if test="null != cooperationEndTime ">
#{cooperationEndTime},
</if>
<if test="null != money and '' != money">
#{money},
</if>
<if test="null != areaCode and '' != areaCode">
#{areaCode},
</if>
<if test="null != address and '' != address">
#{address},
</if>
<if test="null != detailedAddress and '' != detailedAddress">
#{detailedAddress},
</if>
<if test="null != commissionType and '' != commissionType">
#{commissionType},
</if>
<if test="null != commissionRate and '' != commissionRate">
#{commissionRate},
</if>
<if test="null != longitude and '' != longitude">
#{longitude},
</if>
<if test="null != latitude and '' != latitude">
#{latitude},
</if>
<if test="null != status and '' != status">
#{status},
</if>
<if test="null != delFlag and '' != delFlag">
#{delFlag},
</if>
<if test="null != createBy and '' != createBy">
#{createBy},
</if>
<if test="null != createTime and '' != createTime">
#{createTime},
</if>
<if test="null != updateBy and '' != updateBy">
#{updateBy},
</if>
<if test="null != updateTime and '' != updateTime">
#{updateTime},
</if>
<if test="null != remark and '' != remark">
#{remark}
</if>
</trim>
</insert>
<update id="update" parameterType="com.xhpc.user.domain.XhpcInternetUser">
@ -190,10 +193,10 @@
<if test="null != contactPhone and '' != contactPhone">contact_phone = #{contactPhone},</if>
<if test="null != openBank and '' != openBank">open_bank = #{openBank},</if>
<if test="null != cardNumber and '' != cardNumber">card_number = #{cardNumber},</if>
<if test="null != cooperationStartTime and '' != cooperationStartTime">cooperation_start_time =
<if test="null != cooperationStartTime">cooperation_start_time =
#{cooperationStartTime},
</if>
<if test="null != cooperationEndTime and '' != cooperationEndTime">cooperation_end_time =
<if test="null != cooperationEndTime">cooperation_end_time =
#{cooperationEndTime},
</if>
<if test="null != money and '' != money">money = #{money},</if>