diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java index 57e98c36..ab501bdc 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java @@ -388,6 +388,11 @@ public class HighGasController { public ResponseData refuelingOrderRefund(@RequestBody JSONObject body) { try { + UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class); + if (userInfoModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + if(body == null && body.getLong("orderId") == null && StringUtils.isBlank(body.getString("refundContent"))) { log.error("HighOrderController --> refuelingOrderRefund() error!", "参数错误"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); @@ -461,6 +466,8 @@ public class HighGasController { pushParam.put("sourceType", MerStoreAmountSourceTypeEnum.type3.getType()); pushParam.put("sourceId", order.getId()); pushParam.put("sourceContent", "订单号：" + order.getOrderNo() + ",退款金额：￥" + order.getTotalPrice()); + pushParam.put("opUserId", userInfoModel.getSecUser().getId()); + pushParam.put("opUserName", userInfoModel.getSecUser().getUserName()); // 退款到预存余额 this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam); diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasStaffController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasStaffController.java new file mode 100644 index 00000000..c1f58211 --- /dev/null +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasStaffController.java @@ -0,0 +1,234 @@ +package com.bweb.controller; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; +import com.hai.common.security.UserCenter; +import com.hai.common.utils.ResponseMsgUtil; +import com.hai.entity.HighGasStaff; +import com.hai.enum_type.GasStaffStatus; +import com.hai.model.ResponseData; +import com.hai.model.UserInfoModel; +import com.hai.service.CommonService; +import com.hai.service.HighGasStaffService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +@Controller +@RequestMapping(value = "/gasStaff") +@Api(value = "加油站员工管理") +public class HighGasStaffController { + + private static Logger log = LoggerFactory.getLogger(HighGasStaffController.class); + + @Resource + private HighGasStaffService gasStaffService; + + @Resource + private CommonService commonService; + + @Resource + private UserCenter userCenter; + + @RequestMapping(value="/addGasStaff",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "增加员工") + public ResponseData addStaff(@RequestBody JSONObject body) { + try { + UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class); + if (userInfoModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + if (userInfoModel.getMerchantStore() == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + + if (StringUtils.isBlank(body.getString("name")) + || StringUtils.isBlank(body.getString("telephone")) + || StringUtils.isBlank(body.getString("positionType")) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + HighGasStaff gasStaff = new HighGasStaff(); + gasStaff.setMerchantStoreId(userInfoModel.getMerchantStore().getId()); + gasStaff.setAvatar(body.getString("avatar")); + gasStaff.setName(body.getString("name")); + gasStaff.setTelephone(body.getString("telephone")); + gasStaff.setPositionType(body.getInteger("positionType")); + gasStaff.setPositionName(commonService.getDictionaryCodeName("GAS_STAFF_POSITION_TYPE", body.getString("positionType"))); + gasStaffService.addStaff(gasStaff); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighGasStaffController -> addStaff() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/updateGasStaff",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "修改员工") + public ResponseData updateGasStaff(@RequestBody JSONObject body) { + try { + if (body.getLong("id") == null + || StringUtils.isBlank(body.getString("name")) + || StringUtils.isBlank(body.getString("telephone")) + || StringUtils.isBlank(body.getString("positionType")) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + // 查询员工信息 + HighGasStaff gasStaff = gasStaffService.getStaffDetailById(body.getLong("id")); + if (gasStaff == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到员工信息"); + } + gasStaff.setAvatar(body.getString("avatar")); + gasStaff.setName(body.getString("name")); + gasStaff.setTelephone(body.getString("telephone")); + gasStaff.setPositionType(body.getInteger("positionType")); + gasStaff.setPositionName(commonService.getDictionaryCodeName("GAS_STAFF_POSITION_TYPE", body.getString("positionType"))); + gasStaffService.updateStaff(gasStaff); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighGasStaffController -> updateGasStaff() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/disabled",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "禁用员工") + public ResponseData disabled(@RequestBody JSONObject body) { + try { + if (body.getLong("staffId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + // 查询油站员工 + HighGasStaff gasStaff = gasStaffService.getStaffDetailById(body.getLong("staffId")); + if (gasStaff == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOF_FOUND, "未找到员工"); + } + gasStaff.setStatus(GasStaffStatus.status2.getStatus()); + gasStaffService.editData(gasStaff); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighGasStaffController -> disabled() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/recover",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "恢复正常") + public ResponseData recover(@RequestBody JSONObject body) { + try { + if (body.getLong("staffId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + // 查询油站员工 + HighGasStaff gasStaff = gasStaffService.getStaffDetailById(body.getLong("staffId")); + if (gasStaff == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOF_FOUND, "未找到员工"); + } + gasStaff.setStatus(GasStaffStatus.status1.getStatus()); + gasStaffService.editData(gasStaff); + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighGasStaffController -> delStaff() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/delStaff",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "删除员工") + public ResponseData delStaff(@RequestBody JSONObject body) { + try { + + if (body.getLong("staffId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + gasStaffService.delStaff(body.getLong("staffId")); + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighGasStaffController -> delStaff() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getStaffDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询员工详情") + public ResponseData getStaffDetail(@RequestParam(name = "staffId", required = true) Long staffId) { + try { + + return ResponseMsgUtil.success(gasStaffService.getStaffDetailById(staffId)); + + } catch (Exception e) { + log.error("HighGasStaffController -> getStaffDetail() error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + @RequestMapping(value="/getStaffList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询员工列表") + public ResponseData getStaffList(@RequestParam(name = "merchantStoreId", required = false) Long merchantStoreId, + @RequestParam(name = "name", required = false) String name, + @RequestParam(name = "telephone", required = false) String telephone, + @RequestParam(name = "positionType", required = false) Integer positionType, + @RequestParam(name = "status", required = false) Integer status, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize) { + try { + Map param = new HashMap<>(); + if (merchantStoreId == null) { + UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class); + if (userInfoModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + if (userInfoModel.getMerchantStore() == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + param.put("merchantStoreId", userInfoModel.getMerchantStore().getId()); + } else { + param.put("merchantStoreId", merchantStoreId); + } + param.put("name", name); + param.put("telephone", telephone); + param.put("positionType", positionType); + param.put("status", status); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(gasStaffService.getStaffList(param))); + + } catch (Exception e) { + log.error("HighGasStaffController -> getStaffList() error!",e); + return ResponseMsgUtil.exception(e); + } + } + +} diff --git a/hai-bweb/src/main/java/com/bweb/controller/LoginController.java b/hai-bweb/src/main/java/com/bweb/controller/LoginController.java index 2f42f675..f293bacf 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/LoginController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/LoginController.java @@ -68,6 +68,9 @@ public class LoginController { @Resource private HighAgentService highAgentService; + @Resource + private HighGasStaffService gasStaffService; + @RequestMapping(value="/userLogin",method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "机构用户登录（{'loginName':'','password':''}）") @@ -205,6 +208,31 @@ public class LoginController { throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_AGENT, "业务员状态错误"); } userInfoModel.setHighTySalesman(tySalesman); + + } else if (secUser.getObjectType() == 8) { + // 查询加油站员工信息 + HighGasStaff gasStaff = gasStaffService.getStaffDetailById(secUser.getObjectId()); + if (gasStaff == null) { + log.error("login error!","未找到员工信息"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_AGENT, "未找到员工信息"); + } + if (!gasStaff.getStatus().equals(1)) { + log.error("login error!","账户状态异常"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_AGENT, "账户状态异常"); + } + userInfoModel.setGasStaff(gasStaff); + + // 查询门店 + HighMerchantStore merchantStore = highMerchantStoreService.getMerchantStoreById(gasStaff.getMerchantStoreId()); + if(merchantStore == null) { + log.error("login error!","未找到商户门店"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_STORE_NOF_FOUND, ""); + } + if(merchantStore.getStatus() != 1) { + log.error("login error!","未找到商户门店"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_STORE_NOF_FOUND, ""); + } + userInfoModel.setMerchantStore(merchantStore); } else { log.error("login error!","用户信息错误"); throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); diff --git a/hai-service/src/main/java/com/hai/dao/HighGasStaffMapper.java b/hai-service/src/main/java/com/hai/dao/HighGasStaffMapper.java new file mode 100644 index 00000000..ef3c8780 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasStaffMapper.java @@ -0,0 +1,130 @@ +package com.hai.dao; + +import com.hai.entity.HighGasStaff; +import com.hai.entity.HighGasStaffExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface HighGasStaffMapper extends HighGasStaffMapperExt { + @SelectProvider(type=HighGasStaffSqlProvider.class, method="countByExample") + long countByExample(HighGasStaffExample example); + + @DeleteProvider(type=HighGasStaffSqlProvider.class, method="deleteByExample") + int deleteByExample(HighGasStaffExample example); + + @Delete({ + "delete from high_gas_staff", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_gas_staff (merchant_store_id, avatar, ", + "`name`, telephone, ", + "position_type, position_name, ", + "`status`, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", + "values (#{merchantStoreId,jdbcType=BIGINT}, #{avatar,jdbcType=VARCHAR}, ", + "#{name,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR}, ", + "#{positionType,jdbcType=INTEGER}, #{positionName,jdbcType=VARCHAR}, ", + "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(HighGasStaff record); + + @InsertProvider(type=HighGasStaffSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighGasStaff record); + + @SelectProvider(type=HighGasStaffSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT), + @Result(column="avatar", property="avatar", jdbcType=JdbcType.VARCHAR), + @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), + @Result(column="telephone", property="telephone", jdbcType=JdbcType.VARCHAR), + @Result(column="position_type", property="positionType", jdbcType=JdbcType.INTEGER), + @Result(column="position_name", property="positionName", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(HighGasStaffExample example); + + @Select({ + "select", + "id, merchant_store_id, avatar, `name`, telephone, position_type, position_name, ", + "`status`, create_time, update_time, ext_1, ext_2, ext_3", + "from high_gas_staff", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT), + @Result(column="avatar", property="avatar", jdbcType=JdbcType.VARCHAR), + @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), + @Result(column="telephone", property="telephone", jdbcType=JdbcType.VARCHAR), + @Result(column="position_type", property="positionType", jdbcType=JdbcType.INTEGER), + @Result(column="position_name", property="positionName", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + HighGasStaff selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighGasStaffSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighGasStaff record, @Param("example") HighGasStaffExample example); + + @UpdateProvider(type=HighGasStaffSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighGasStaff record, @Param("example") HighGasStaffExample example); + + @UpdateProvider(type=HighGasStaffSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighGasStaff record); + + @Update({ + "update high_gas_staff", + "set merchant_store_id = #{merchantStoreId,jdbcType=BIGINT},", + "avatar = #{avatar,jdbcType=VARCHAR},", + "`name` = #{name,jdbcType=VARCHAR},", + "telephone = #{telephone,jdbcType=VARCHAR},", + "position_type = #{positionType,jdbcType=INTEGER},", + "position_name = #{positionName,jdbcType=VARCHAR},", + "`status` = #{status,jdbcType=INTEGER},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(HighGasStaff record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasStaffMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasStaffMapperExt.java new file mode 100644 index 00000000..e65a8d3c --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasStaffMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface HighGasStaffMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasStaffSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGasStaffSqlProvider.java new file mode 100644 index 00000000..620cccd1 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasStaffSqlProvider.java @@ -0,0 +1,346 @@ +package com.hai.dao; + +import com.hai.entity.HighGasStaff; +import com.hai.entity.HighGasStaffExample.Criteria; +import com.hai.entity.HighGasStaffExample.Criterion; +import com.hai.entity.HighGasStaffExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighGasStaffSqlProvider { + + public String countByExample(HighGasStaffExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_gas_staff"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighGasStaffExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_gas_staff"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighGasStaff record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_gas_staff"); + + if (record.getMerchantStoreId() != null) { + sql.VALUES("merchant_store_id", "#{merchantStoreId,jdbcType=BIGINT}"); + } + + if (record.getAvatar() != null) { + sql.VALUES("avatar", "#{avatar,jdbcType=VARCHAR}"); + } + + if (record.getName() != null) { + sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}"); + } + + if (record.getTelephone() != null) { + sql.VALUES("telephone", "#{telephone,jdbcType=VARCHAR}"); + } + + if (record.getPositionType() != null) { + sql.VALUES("position_type", "#{positionType,jdbcType=INTEGER}"); + } + + if (record.getPositionName() != null) { + sql.VALUES("position_name", "#{positionName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(HighGasStaffExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("merchant_store_id"); + sql.SELECT("avatar"); + sql.SELECT("`name`"); + sql.SELECT("telephone"); + sql.SELECT("position_type"); + sql.SELECT("position_name"); + sql.SELECT("`status`"); + sql.SELECT("create_time"); + sql.SELECT("update_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("high_gas_staff"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + HighGasStaff record = (HighGasStaff) parameter.get("record"); + HighGasStaffExample example = (HighGasStaffExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_gas_staff"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getMerchantStoreId() != null) { + sql.SET("merchant_store_id = #{record.merchantStoreId,jdbcType=BIGINT}"); + } + + if (record.getAvatar() != null) { + sql.SET("avatar = #{record.avatar,jdbcType=VARCHAR}"); + } + + if (record.getName() != null) { + sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); + } + + if (record.getTelephone() != null) { + sql.SET("telephone = #{record.telephone,jdbcType=VARCHAR}"); + } + + if (record.getPositionType() != null) { + sql.SET("position_type = #{record.positionType,jdbcType=INTEGER}"); + } + + if (record.getPositionName() != null) { + sql.SET("position_name = #{record.positionName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_staff"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("merchant_store_id = #{record.merchantStoreId,jdbcType=BIGINT}"); + sql.SET("avatar = #{record.avatar,jdbcType=VARCHAR}"); + sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); + sql.SET("telephone = #{record.telephone,jdbcType=VARCHAR}"); + sql.SET("position_type = #{record.positionType,jdbcType=INTEGER}"); + sql.SET("position_name = #{record.positionName,jdbcType=VARCHAR}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + HighGasStaffExample example = (HighGasStaffExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighGasStaff record) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_staff"); + + if (record.getMerchantStoreId() != null) { + sql.SET("merchant_store_id = #{merchantStoreId,jdbcType=BIGINT}"); + } + + if (record.getAvatar() != null) { + sql.SET("avatar = #{avatar,jdbcType=VARCHAR}"); + } + + if (record.getName() != null) { + sql.SET("`name` = #{name,jdbcType=VARCHAR}"); + } + + if (record.getTelephone() != null) { + sql.SET("telephone = #{telephone,jdbcType=VARCHAR}"); + } + + if (record.getPositionType() != null) { + sql.SET("position_type = #{positionType,jdbcType=INTEGER}"); + } + + if (record.getPositionName() != null) { + sql.SET("position_name = #{positionName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, HighGasStaffExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighGasStaff.java b/hai-service/src/main/java/com/hai/entity/HighGasStaff.java new file mode 100644 index 00000000..64603b5b --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasStaff.java @@ -0,0 +1,248 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * high_gas_staff + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighGasStaff implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 商户门店id + */ + private Long merchantStoreId; + + /** + * 员工头像 + */ + private String avatar; + + /** + * 员工名称 + */ + private String name; + + /** + * 员工电话 + */ + private String telephone; + + /** + * 职位类型 1：收银员 + */ + private Integer positionType; + + /** + * 职位类型名称 + */ + private String positionName; + + /** + * 状态 0：删除 1：正常 2：禁用 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getMerchantStoreId() { + return merchantStoreId; + } + + public void setMerchantStoreId(Long merchantStoreId) { + this.merchantStoreId = merchantStoreId; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public Integer getPositionType() { + return positionType; + } + + public void setPositionType(Integer positionType) { + this.positionType = positionType; + } + + public String getPositionName() { + return positionName; + } + + public void setPositionName(String positionName) { + this.positionName = positionName; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + HighGasStaff other = (HighGasStaff) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getMerchantStoreId() == null ? other.getMerchantStoreId() == null : this.getMerchantStoreId().equals(other.getMerchantStoreId())) + && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar())) + && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) + && (this.getTelephone() == null ? other.getTelephone() == null : this.getTelephone().equals(other.getTelephone())) + && (this.getPositionType() == null ? other.getPositionType() == null : this.getPositionType().equals(other.getPositionType())) + && (this.getPositionName() == null ? other.getPositionName() == null : this.getPositionName().equals(other.getPositionName())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getMerchantStoreId() == null) ? 0 : getMerchantStoreId().hashCode()); + result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((getTelephone() == null) ? 0 : getTelephone().hashCode()); + result = prime * result + ((getPositionType() == null) ? 0 : getPositionType().hashCode()); + result = prime * result + ((getPositionName() == null) ? 0 : getPositionName().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", merchantStoreId=").append(merchantStoreId); + sb.append(", avatar=").append(avatar); + sb.append(", name=").append(name); + sb.append(", telephone=").append(telephone); + sb.append(", positionType=").append(positionType); + sb.append(", positionName=").append(positionName); + sb.append(", status=").append(status); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighGasStaffExample.java b/hai-service/src/main/java/com/hai/entity/HighGasStaffExample.java new file mode 100644 index 00000000..a18bd88f --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasStaffExample.java @@ -0,0 +1,1073 @@ +package com.hai.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HighGasStaffExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighGasStaffExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdIsNull() { + addCriterion("merchant_store_id is null"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdIsNotNull() { + addCriterion("merchant_store_id is not null"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdEqualTo(Long value) { + addCriterion("merchant_store_id =", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdNotEqualTo(Long value) { + addCriterion("merchant_store_id <>", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdGreaterThan(Long value) { + addCriterion("merchant_store_id >", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdGreaterThanOrEqualTo(Long value) { + addCriterion("merchant_store_id >=", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdLessThan(Long value) { + addCriterion("merchant_store_id <", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdLessThanOrEqualTo(Long value) { + addCriterion("merchant_store_id <=", value, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdIn(List values) { + addCriterion("merchant_store_id in", values, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdNotIn(List values) { + addCriterion("merchant_store_id not in", values, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdBetween(Long value1, Long value2) { + addCriterion("merchant_store_id between", value1, value2, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andMerchantStoreIdNotBetween(Long value1, Long value2) { + addCriterion("merchant_store_id not between", value1, value2, "merchantStoreId"); + return (Criteria) this; + } + + public Criteria andAvatarIsNull() { + addCriterion("avatar is null"); + return (Criteria) this; + } + + public Criteria andAvatarIsNotNull() { + addCriterion("avatar is not null"); + return (Criteria) this; + } + + public Criteria andAvatarEqualTo(String value) { + addCriterion("avatar =", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarNotEqualTo(String value) { + addCriterion("avatar <>", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarGreaterThan(String value) { + addCriterion("avatar >", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarGreaterThanOrEqualTo(String value) { + addCriterion("avatar >=", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarLessThan(String value) { + addCriterion("avatar <", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarLessThanOrEqualTo(String value) { + addCriterion("avatar <=", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarLike(String value) { + addCriterion("avatar like", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarNotLike(String value) { + addCriterion("avatar not like", value, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarIn(List values) { + addCriterion("avatar in", values, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarNotIn(List values) { + addCriterion("avatar not in", values, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarBetween(String value1, String value2) { + addCriterion("avatar between", value1, value2, "avatar"); + return (Criteria) this; + } + + public Criteria andAvatarNotBetween(String value1, String value2) { + addCriterion("avatar not between", value1, value2, "avatar"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("`name` is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("`name` is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("`name` =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("`name` <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("`name` >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("`name` >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("`name` <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("`name` <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("`name` like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("`name` not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("`name` in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("`name` not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("`name` between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("`name` not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andTelephoneIsNull() { + addCriterion("telephone is null"); + return (Criteria) this; + } + + public Criteria andTelephoneIsNotNull() { + addCriterion("telephone is not null"); + return (Criteria) this; + } + + public Criteria andTelephoneEqualTo(String value) { + addCriterion("telephone =", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneNotEqualTo(String value) { + addCriterion("telephone <>", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneGreaterThan(String value) { + addCriterion("telephone >", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneGreaterThanOrEqualTo(String value) { + addCriterion("telephone >=", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneLessThan(String value) { + addCriterion("telephone <", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneLessThanOrEqualTo(String value) { + addCriterion("telephone <=", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneLike(String value) { + addCriterion("telephone like", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneNotLike(String value) { + addCriterion("telephone not like", value, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneIn(List values) { + addCriterion("telephone in", values, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneNotIn(List values) { + addCriterion("telephone not in", values, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneBetween(String value1, String value2) { + addCriterion("telephone between", value1, value2, "telephone"); + return (Criteria) this; + } + + public Criteria andTelephoneNotBetween(String value1, String value2) { + addCriterion("telephone not between", value1, value2, "telephone"); + return (Criteria) this; + } + + public Criteria andPositionTypeIsNull() { + addCriterion("position_type is null"); + return (Criteria) this; + } + + public Criteria andPositionTypeIsNotNull() { + addCriterion("position_type is not null"); + return (Criteria) this; + } + + public Criteria andPositionTypeEqualTo(Integer value) { + addCriterion("position_type =", value, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeNotEqualTo(Integer value) { + addCriterion("position_type <>", value, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeGreaterThan(Integer value) { + addCriterion("position_type >", value, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("position_type >=", value, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeLessThan(Integer value) { + addCriterion("position_type <", value, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeLessThanOrEqualTo(Integer value) { + addCriterion("position_type <=", value, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeIn(List values) { + addCriterion("position_type in", values, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeNotIn(List values) { + addCriterion("position_type not in", values, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeBetween(Integer value1, Integer value2) { + addCriterion("position_type between", value1, value2, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionTypeNotBetween(Integer value1, Integer value2) { + addCriterion("position_type not between", value1, value2, "positionType"); + return (Criteria) this; + } + + public Criteria andPositionNameIsNull() { + addCriterion("position_name is null"); + return (Criteria) this; + } + + public Criteria andPositionNameIsNotNull() { + addCriterion("position_name is not null"); + return (Criteria) this; + } + + public Criteria andPositionNameEqualTo(String value) { + addCriterion("position_name =", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotEqualTo(String value) { + addCriterion("position_name <>", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameGreaterThan(String value) { + addCriterion("position_name >", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameGreaterThanOrEqualTo(String value) { + addCriterion("position_name >=", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameLessThan(String value) { + addCriterion("position_name <", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameLessThanOrEqualTo(String value) { + addCriterion("position_name <=", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameLike(String value) { + addCriterion("position_name like", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotLike(String value) { + addCriterion("position_name not like", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameIn(List values) { + addCriterion("position_name in", values, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotIn(List values) { + addCriterion("position_name not in", values, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameBetween(String value1, String value2) { + addCriterion("position_name between", value1, value2, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotBetween(String value1, String value2) { + addCriterion("position_name not between", value1, value2, "positionName"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/enum_type/GasPositionType.java b/hai-service/src/main/java/com/hai/enum_type/GasPositionType.java new file mode 100644 index 00000000..a452995f --- /dev/null +++ b/hai-service/src/main/java/com/hai/enum_type/GasPositionType.java @@ -0,0 +1,34 @@ +package com.hai.enum_type; + +/** + * 加油站员工状态 + * @author hurui + */ +public enum GasPositionType { + status1(1 , "收银员"), + ; + + private Integer status; + private String name; + + GasPositionType(int status , String name) { + this.status = status; + this.name = name; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/hai-service/src/main/java/com/hai/enum_type/GasStaffStatus.java b/hai-service/src/main/java/com/hai/enum_type/GasStaffStatus.java new file mode 100644 index 00000000..6b4bd371 --- /dev/null +++ b/hai-service/src/main/java/com/hai/enum_type/GasStaffStatus.java @@ -0,0 +1,36 @@ +package com.hai.enum_type; + +/** + * 加油站员工状态 + * @author hurui + */ +public enum GasStaffStatus { + status0(0 , "删除"), + status1(1 , "正常"), + status2(2 , "禁用"), + ; + + private Integer status; + private String name; + + GasStaffStatus(int status , String name) { + this.status = status; + this.name = name; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/hai-service/src/main/java/com/hai/model/UserInfoModel.java b/hai-service/src/main/java/com/hai/model/UserInfoModel.java index 945d09be..ab991381 100644 --- a/hai-service/src/main/java/com/hai/model/UserInfoModel.java +++ b/hai-service/src/main/java/com/hai/model/UserInfoModel.java @@ -34,6 +34,8 @@ public class UserInfoModel { private HighTyAgent highTyAgent; // 团油业务员 private HighTySalesman highTySalesman; + // 加油站员工 + private HighGasStaff gasStaff; // 权限列表 private List permissionList; // 菜单权限列表 @@ -146,4 +148,12 @@ public class UserInfoModel { public void setHighTySalesman(HighTySalesman highTySalesman) { this.highTySalesman = highTySalesman; } + + public HighGasStaff getGasStaff() { + return gasStaff; + } + + public void setGasStaff(HighGasStaff gasStaff) { + this.gasStaff = gasStaff; + } } diff --git a/hai-service/src/main/java/com/hai/service/HighGasStaffService.java b/hai-service/src/main/java/com/hai/service/HighGasStaffService.java new file mode 100644 index 00000000..4b13bc54 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighGasStaffService.java @@ -0,0 +1,51 @@ +package com.hai.service; + +import com.hai.entity.HighGasStaff; + +import java.util.List; +import java.util.Map; + +/** + * 加油站员工 + * @author hurui + */ +public interface HighGasStaffService { + + /** + * 编辑员工数据 + * @param gasStaff + */ + void editData(HighGasStaff gasStaff); + + /** + * 增加员工 + * @param gasStaff + */ + void addStaff(HighGasStaff gasStaff) throws Exception; + + /** + * 修改员工 + * @param gasStaff + */ + void updateStaff(HighGasStaff gasStaff); + + /** + * 删除员工 + * @param id + */ + void delStaff(Long id); + + /** + * 根据id查询 + * @param id + * @return + */ + HighGasStaff getStaffDetailById(Long id); + + /** + * 查询员工列表 + * @param param + * @return + */ + List getStaffList(Map param); +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasStaffServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasStaffServiceImpl.java new file mode 100644 index 00000000..4781ad91 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasStaffServiceImpl.java @@ -0,0 +1,159 @@ +package com.hai.service.impl; + +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; +import com.hai.common.utils.MD5Util; +import com.hai.dao.HighGasStaffMapper; +import com.hai.entity.HighGasStaff; +import com.hai.entity.HighGasStaffExample; +import com.hai.entity.SecUser; +import com.hai.enum_type.GasPositionType; +import com.hai.enum_type.GasStaffStatus; +import com.hai.service.HighGasStaffService; +import com.hai.service.SecUserService; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service("gasStaffService") +public class HighGasStaffServiceImpl implements HighGasStaffService { + + @Resource + private HighGasStaffMapper gasStaffMapper; + + @Resource + private SecUserService userService; + + @Override + public void editData(HighGasStaff gasStaff) { + if (gasStaff.getId() == null) { + gasStaff.setCreateTime(new Date()); + gasStaff.setUpdateTime(new Date()); + gasStaff.setStatus(GasStaffStatus.status1.getStatus()); + gasStaffMapper.insert(gasStaff); + } else { + gasStaff.setUpdateTime(new Date()); + gasStaffMapper.updateByPrimaryKey(gasStaff); + } + } + + @Override + @Transactional(propagation= Propagation.REQUIRES_NEW) + public void addStaff(HighGasStaff gasStaff) throws Exception { + if (userService.findByLoginName(gasStaff.getTelephone()) != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "电话已存在，请更换"); + } + + editData(gasStaff); + + Long roleId; + if (gasStaff.getPositionType().equals(GasPositionType.status1.getStatus())) { + roleId = 100L; + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知角色"); + } + + SecUser secUser = new SecUser(); + secUser.setAvatar(gasStaff.getAvatar()); + secUser.setUserName(gasStaff.getName()); + secUser.setLoginName(gasStaff.getTelephone()); + secUser.setPassword(MD5Util.encode("123456".getBytes())); + secUser.setAdminFlag(1); + secUser.setStatus(1); + secUser.setRoleId(roleId); + secUser.setObjectType(8); + secUser.setObjectId(gasStaff.getId()); + secUser.setCreateTime(new Date()); + secUser.setUpdateTime(new Date()); + userService.addUser(secUser); + } + + @Override + @Transactional(propagation= Propagation.REQUIRES_NEW) + public void updateStaff(HighGasStaff gasStaff) { + HighGasStaff detail = getStaffDetailById(gasStaff.getId()); + if (detail == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + if (!detail.getTelephone().equals(gasStaff.getTelephone())) { + if (userService.findByLoginName(gasStaff.getTelephone()) != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "电话已存在，请更换"); + } + } + + editData(gasStaff); + + // 查询账户 + SecUser account = userService.getMainAccount(8, gasStaff.getId()); + if (account == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到账户"); + } + account.setAvatar(gasStaff.getAvatar()); + account.setUserName(gasStaff.getName()); + account.setLoginName(gasStaff.getTelephone()); + account.setUpdateTime(new Date()); + userService.updateUser(account); + } + + @Override + @Transactional(propagation= Propagation.REQUIRES_NEW) + public void delStaff(Long id) { + HighGasStaff gasStaff = getStaffDetailById(id); + if (gasStaff == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到员工"); + } + gasStaff.setStatus(GasStaffStatus.status0.getStatus()); + editData(gasStaff); + + // 查询账户 + SecUser account = userService.getMainAccount(8, gasStaff.getId()); + if (account == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到账户"); + } + account.setStatus(0); + userService.updateUser(account); + } + + @Override + public HighGasStaff getStaffDetailById(Long id) { + return gasStaffMapper.selectByPrimaryKey(id); + } + + @Override + public List getStaffList(Map param) { + HighGasStaffExample example = new HighGasStaffExample(); + HighGasStaffExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(0); + + if (MapUtils.getLong(param, "merchantStoreId") != null) { + criteria.andMerchantStoreIdEqualTo(MapUtils.getLong(param, "merchantStoreId")); + } + + if (StringUtils.isNotBlank(MapUtils.getString(param, "name"))) { + criteria.andNameLike("%" + MapUtils.getString(param, "name") + "%"); + } + + if (StringUtils.isNotBlank(MapUtils.getString(param, "telephone"))) { + criteria.andTelephoneLike("%" + MapUtils.getString(param, "telephone") + "%"); + } + + if (MapUtils.getInteger(param, "positionType") != null) { + criteria.andPositionTypeEqualTo(MapUtils.getInteger(param, "positionType")); + } + + if (MapUtils.getInteger(param, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(param, "status")); + } + + example.setOrderByClause("create_time desc"); + return gasStaffMapper.selectByExample(example); + } +}