Skip to content

H
haoban-manage3.0
Commit ead66a16 by 徐高华
Options

导购

parent a58d0579
Showing with 269 additions and 320 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanOperationSettingMapper.java
......@@ -2,7 +2,6 @@ package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.TabHaobanOperationSetting;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -33,14 +32,6 @@ public interface TabHaobanOperationSettingMapper {
int update(TabHaobanOperationSetting setting);
/**
* 通过主键删除数据
*
* @param settingId 主键
* @return 影响行数
*/
int deleteById(String settingId);
/**
* 通过ID查询单条数据
*
* @param settingId 主键
......@@ -56,22 +47,4 @@ public interface TabHaobanOperationSettingMapper {
*/
List<TabHaobanOperationSetting> queryAll(TabHaobanOperationSetting setting);
/**
* 分页总数
*
* @return 对象列表
*/
int queryCountByPage();
/**
* 分页列表
*
* @param offset 查询起始位置
* @param limit 查询条数
* @return 对象列表
*/
List<TabHaobanOperationSetting> queryListByPage(@Param("offset") int offset, @Param("limit") int limit);
}
haoban-manage3-service/src/main/resources/mapper/TabHaobanOperationSettingMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper">
<resultMap type="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"
id="TabHaobanOperationSettingMap">
<result property="settingId" column="setting_id" jdbcType="VARCHAR"/>
<result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
<result property="clerkPhoneFlag" column="clerk_phone_flag" jdbcType="INTEGER"/>
<result property="storeEditFlag" column="store_edit_flag" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="statusFlag" column="status_flag" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
setting_id, wx_enterprise_id, clerk_phone_flag, store_edit_flag, create_time, update_time, status_flag </sql>
<!--新增所有列-->
<insert id="insert" keyProperty="settingId" useGeneratedKeys="true" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting">
INSERT INTO tab_haoban_operation_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="settingId != null and settingId != ''">
setting_id,
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
wx_enterprise_id,
</if>
<if test="clerkPhoneFlag != null">
clerk_phone_flag,
</if>
<if test="storeEditFlag != null">
store_edit_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="statusFlag != null">
status_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="settingId != null and settingId != ''">
#{settingId},
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
#{wxEnterpriseId},
</if>
<if test="clerkPhoneFlag != null">
#{clerkPhoneFlag},
</if>
<if test="storeEditFlag != null">
#{storeEditFlag},
</if>
<if test="createTime != null">
#{createTime},
</if>
<if test="updateTime != null">
#{updateTime},
</if>
<if test="statusFlag != null">
#{statusFlag},
</if>
</trim>
</insert>
<!--通过主键修改数据-->
<update id="update" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting">
update tab_haoban_operation_setting
<set>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
wx_enterprise_id = #{wxEnterpriseId},
</if>
<if test="clerkPhoneFlag != null">
clerk_phone_flag = #{clerkPhoneFlag},
</if>
<if test="storeEditFlag != null">
store_edit_flag = #{storeEditFlag},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="statusFlag != null">
status_flag = #{statusFlag},
</if>
</set>
where setting_id = #{settingId}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from tab_haoban_operation_setting where setting_id = #{settingId}
</delete>
<!--查询单个-->
<select id="queryById" resultMap="TabHaobanOperationSettingMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_operation_setting
where setting_id = #{settingId}
</select>
<!--通过实体作为筛选条件查询-->
<select id="queryAll" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting" resultMap="TabHaobanOperationSettingMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_operation_setting
<where>
<if test="settingId != null and settingId != ''">
and setting_id = #{settingId}
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
and wx_enterprise_id = #{wxEnterpriseId}
</if>
<if test="clerkPhoneFlag != null">
and clerk_phone_flag = #{clerkPhoneFlag}
</if>
<if test="storeEditFlag != null">
and store_edit_flag = #{storeEditFlag}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="statusFlag != null">
and status_flag = #{statusFlag}
</if>
</where>
</select>
<select id="queryCountByPage" resultType="int">
select
count(*)
from tab_haoban_operation_setting
</select>
<select id="queryListByPage" resultMap="TabHaobanOperationSettingMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_operation_setting
limit #{offset}, #{limit}
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper">
<resultMap type="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"
id="TabHaobanOperationSettingMap">
<result property="settingId" column="setting_id" jdbcType="VARCHAR"/>
<result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
<result property="clerkPhoneFlag" column="clerk_phone_flag" jdbcType="INTEGER"/>
<result property="storeEditFlag" column="store_edit_flag" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="statusFlag" column="status_flag" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
setting_id, wx_enterprise_id, clerk_phone_flag, store_edit_flag, create_time, update_time, status_flag </sql>
<!--新增所有列-->
<insert id="insert" keyProperty="settingId" useGeneratedKeys="true" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting">
INSERT INTO tab_haoban_operation_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="settingId != null and settingId != ''">
setting_id,
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
wx_enterprise_id,
</if>
<if test="clerkPhoneFlag != null">
clerk_phone_flag,
</if>
<if test="storeEditFlag != null">
store_edit_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="statusFlag != null">
status_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="settingId != null and settingId != ''">
#{settingId},
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
#{wxEnterpriseId},
</if>
<if test="clerkPhoneFlag != null">
#{clerkPhoneFlag},
</if>
<if test="storeEditFlag != null">
#{storeEditFlag},
</if>
<if test="createTime != null">
#{createTime},
</if>
<if test="updateTime != null">
#{updateTime},
</if>
<if test="statusFlag != null">
#{statusFlag},
</if>
</trim>
</insert>
<!--通过主键修改数据-->
<update id="update" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting">
update tab_haoban_operation_setting
<set>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
wx_enterprise_id = #{wxEnterpriseId},
</if>
<if test="clerkPhoneFlag != null">
clerk_phone_flag = #{clerkPhoneFlag},
</if>
<if test="storeEditFlag != null">
store_edit_flag = #{storeEditFlag},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="statusFlag != null">
status_flag = #{statusFlag},
</if>
</set>
where setting_id = #{settingId}
</update>
<!--查询单个-->
<select id="queryById" resultMap="TabHaobanOperationSettingMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_operation_setting
where setting_id = #{settingId}
</select>
<!--通过实体作为筛选条件查询-->
<select id="queryAll" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting" resultMap="TabHaobanOperationSettingMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_operation_setting
<where>
<if test="settingId != null and settingId != ''">
and setting_id = #{settingId}
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
and wx_enterprise_id = #{wxEnterpriseId}
</if>
<if test="clerkPhoneFlag != null">
and clerk_phone_flag = #{clerkPhoneFlag}
</if>
<if test="storeEditFlag != null">
and store_edit_flag = #{storeEditFlag}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="statusFlag != null">
and status_flag = #{statusFlag}
</if>
</where>
</select>
</mapper>
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
package com.gic.haoban.manage.web.controller;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
......@@ -19,28 +30,14 @@ import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.enums.AuditType;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
import com.gic.haoban.manage.api.service.AuditApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.AuditVO;
import com.gic.haoban.manage.web.vo.StaffClerkBindLogDetailVO;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
......@@ -109,7 +109,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
// {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok",
// "open_userid":"wo59NLDQAAxeJ-Nr7_vwkZVc7QOG73PQ","userid":"xugaohua","deviceid":"0BB1D1FA-C5A2-4BDD-80A2-33B6BB230F8A"}
logger.info("userDTOJson=============>{}", userDTOJson);
logger.info("好办登录={}", userDTOJson);
UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
if (user == null) {
return resultResponse(HaoBanErrCode.ERR_6);
......@@ -120,16 +120,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
StaffDTO loginStaff = null;
if (enterprise != null) {
loginStaff = staffApiService.getByUserIdAndReflushWhenNoPhone(userId, enterprise.getWxEnterpriseId());
}
//手机号不存在
if (loginStaff == null) {
if (enterprise != null) {
if (loginStaff == null) {
staffApiService.wxGetAdd(userId, enterprise.getWxEnterpriseId());
loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
}
}
if (loginStaff == null) {
logger.info("游客用户");
WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
wellDoneLoginInfoVo.setWxOpenUseId(userId);
StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/OperationSettingVO.java
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
import java.util.Date;
/**
*
* @author YongEn
* @date 2021-08-26 10:38:04
*/
public class OperationSettingVO implements Serializable {
private static final long serialVersionUID = 382528365529162044L;
/**
* 是否生效
*/
private Integer effectFlag;
/**
* 操作设置id
*/
private String settingId;
/**
* 企业微信id
*/
private String wxEnterpriseId;
/**
* 导购手机号是否必填 1 是 0 否
*/
private Integer clerkPhoneFlag;
/**
* 店长是否可编辑门店 1 是 0 否
*/
private Integer storeEditFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 数据状态 1 正常 0 已删除
*/
private Integer statusFlag;
public Integer getEffectFlag() {
return effectFlag;
}
public void setEffectFlag(Integer effectFlag) {
this.effectFlag = effectFlag;
}
public String getSettingId() {
return settingId;
}
public void setSettingId(String settingId) {
this.settingId = settingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getClerkPhoneFlag() {
return clerkPhoneFlag;
}
public void setClerkPhoneFlag(Integer clerkPhoneFlag) {
this.clerkPhoneFlag = clerkPhoneFlag;
}
public Integer getStoreEditFlag() {
return storeEditFlag;
}
public void setStoreEditFlag(Integer storeEditFlag) {
this.storeEditFlag = storeEditFlag;
}
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 Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
@Override
public String toString() {
return "OperationSettingDTO{" +
"settingId='" + settingId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", clerkPhoneFlag=" + clerkPhoneFlag +
", storeEditFlag=" + storeEditFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", statusFlag=" + statusFlag +
'}';
}
}
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
import java.util.Date;
/**
*
* @author YongEn
* @date 2021-08-26 10:38:04
*/
public class OperationSettingVO implements Serializable {
private static final long serialVersionUID = 382528365529162044L;
/**
* 是否生效
*/
private Integer effectFlag;
/**
* 操作设置id
*/
private String settingId;
/**
* 企业微信id
*/
private String wxEnterpriseId;
/**
* 导购手机号是否必填 1 是 0 否
*/
private Integer clerkPhoneFlag;
/**
* 店长是否可编辑门店 1 是 0 否
*/
private Integer storeEditFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 数据状态 1 正常 0 已删除
*/
private Integer statusFlag;
public Integer getEffectFlag() {
return effectFlag;
}
public void setEffectFlag(Integer effectFlag) {
this.effectFlag = effectFlag;
}
public String getSettingId() {
return settingId;
}
public void setSettingId(String settingId) {
this.settingId = settingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getClerkPhoneFlag() {
return 1;
}
public void setClerkPhoneFlag(Integer clerkPhoneFlag) {
this.clerkPhoneFlag = 1;
}
public Integer getStoreEditFlag() {
return storeEditFlag;
}
public void setStoreEditFlag(Integer storeEditFlag) {
this.storeEditFlag = storeEditFlag;
}
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 Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
@Override
public String toString() {
return "OperationSettingDTO{" +
"settingId='" + settingId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", clerkPhoneFlag=" + clerkPhoneFlag +
", storeEditFlag=" + storeEditFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", statusFlag=" + statusFlag +
'}';
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment