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; ...@@ -2,7 +2,6 @@ package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.TabHaobanOperationSetting; import com.gic.haoban.manage.service.entity.TabHaobanOperationSetting;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
...@@ -33,14 +32,6 @@ public interface TabHaobanOperationSettingMapper { ...@@ -33,14 +32,6 @@ public interface TabHaobanOperationSettingMapper {
int update(TabHaobanOperationSetting setting); int update(TabHaobanOperationSetting setting);
/** /**
* 通过主键删除数据
*
* @param settingId 主键
* @return 影响行数
*/
int deleteById(String settingId);
/**
* 通过ID查询单条数据 * 通过ID查询单条数据
* *
* @param settingId 主键 * @param settingId 主键
...@@ -56,22 +47,4 @@ public interface TabHaobanOperationSettingMapper { ...@@ -56,22 +47,4 @@ public interface TabHaobanOperationSettingMapper {
*/ */
List<TabHaobanOperationSetting> queryAll(TabHaobanOperationSetting setting); 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"?> <?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"> <!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"> <mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper">
<resultMap type="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting" <resultMap type="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"
id="TabHaobanOperationSettingMap"> id="TabHaobanOperationSettingMap">
<result property="settingId" column="setting_id" jdbcType="VARCHAR"/> <result property="settingId" column="setting_id" jdbcType="VARCHAR"/>
<result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/> <result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
<result property="clerkPhoneFlag" column="clerk_phone_flag" jdbcType="INTEGER"/> <result property="clerkPhoneFlag" column="clerk_phone_flag" jdbcType="INTEGER"/>
<result property="storeEditFlag" column="store_edit_flag" jdbcType="INTEGER"/> <result property="storeEditFlag" column="store_edit_flag" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="statusFlag" column="status_flag" jdbcType="INTEGER"/> <result property="statusFlag" column="status_flag" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
setting_id, wx_enterprise_id, clerk_phone_flag, store_edit_flag, create_time, update_time, status_flag </sql> 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 id="insert" keyProperty="settingId" useGeneratedKeys="true" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting">
INSERT INTO tab_haoban_operation_setting INSERT INTO tab_haoban_operation_setting
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="settingId != null and settingId != ''"> <if test="settingId != null and settingId != ''">
setting_id, setting_id,
</if> </if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''"> <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
wx_enterprise_id, wx_enterprise_id,
</if> </if>
<if test="clerkPhoneFlag != null"> <if test="clerkPhoneFlag != null">
clerk_phone_flag, clerk_phone_flag,
</if> </if>
<if test="storeEditFlag != null"> <if test="storeEditFlag != null">
store_edit_flag, store_edit_flag,
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
create_time, create_time,
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time, update_time,
</if> </if>
<if test="statusFlag != null"> <if test="statusFlag != null">
status_flag, status_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="settingId != null and settingId != ''"> <if test="settingId != null and settingId != ''">
#{settingId}, #{settingId},
</if> </if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''"> <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
#{wxEnterpriseId}, #{wxEnterpriseId},
</if> </if>
<if test="clerkPhoneFlag != null"> <if test="clerkPhoneFlag != null">
#{clerkPhoneFlag}, #{clerkPhoneFlag},
</if> </if>
<if test="storeEditFlag != null"> <if test="storeEditFlag != null">
#{storeEditFlag}, #{storeEditFlag},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
#{createTime}, #{createTime},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
#{updateTime}, #{updateTime},
</if> </if>
<if test="statusFlag != null"> <if test="statusFlag != null">
#{statusFlag}, #{statusFlag},
</if> </if>
</trim> </trim>
</insert> </insert>
<!--通过主键修改数据--> <!--通过主键修改数据-->
<update id="update" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"> <update id="update" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting">
update tab_haoban_operation_setting update tab_haoban_operation_setting
<set> <set>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''"> <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
wx_enterprise_id = #{wxEnterpriseId}, wx_enterprise_id = #{wxEnterpriseId},
</if> </if>
<if test="clerkPhoneFlag != null"> <if test="clerkPhoneFlag != null">
clerk_phone_flag = #{clerkPhoneFlag}, clerk_phone_flag = #{clerkPhoneFlag},
</if> </if>
<if test="storeEditFlag != null"> <if test="storeEditFlag != null">
store_edit_flag = #{storeEditFlag}, store_edit_flag = #{storeEditFlag},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime}, create_time = #{createTime},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime}, update_time = #{updateTime},
</if> </if>
<if test="statusFlag != null"> <if test="statusFlag != null">
status_flag = #{statusFlag}, status_flag = #{statusFlag},
</if> </if>
</set> </set>
where setting_id = #{settingId} where setting_id = #{settingId}
</update> </update>
<!--通过主键删除--> <!--查询单个-->
<delete id="deleteById"> <select id="queryById" resultMap="TabHaobanOperationSettingMap">
delete from tab_haoban_operation_setting where setting_id = #{settingId} select
</delete> <include refid="Base_Column_List"/>
from tab_haoban_operation_setting
<!--查询单个--> where setting_id = #{settingId}
<select id="queryById" resultMap="TabHaobanOperationSettingMap"> </select>
select
<include refid="Base_Column_List"/> <!--通过实体作为筛选条件查询-->
from tab_haoban_operation_setting <select id="queryAll" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting" resultMap="TabHaobanOperationSettingMap">
where setting_id = #{settingId} select
</select> <include refid="Base_Column_List"/>
from tab_haoban_operation_setting
<!--通过实体作为筛选条件查询--> <where>
<select id="queryAll" parameterType="com.gic.haoban.manage.service.entity.TabHaobanOperationSetting" resultMap="TabHaobanOperationSettingMap"> <if test="settingId != null and settingId != ''">
select and setting_id = #{settingId}
<include refid="Base_Column_List"/> </if>
from tab_haoban_operation_setting <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
<where> and wx_enterprise_id = #{wxEnterpriseId}
<if test="settingId != null and settingId != ''"> </if>
and setting_id = #{settingId} <if test="clerkPhoneFlag != null">
</if> and clerk_phone_flag = #{clerkPhoneFlag}
<if test="wxEnterpriseId != null and wxEnterpriseId != ''"> </if>
and wx_enterprise_id = #{wxEnterpriseId} <if test="storeEditFlag != null">
</if> and store_edit_flag = #{storeEditFlag}
<if test="clerkPhoneFlag != null"> </if>
and clerk_phone_flag = #{clerkPhoneFlag} <if test="createTime != null">
</if> and create_time = #{createTime}
<if test="storeEditFlag != null"> </if>
and store_edit_flag = #{storeEditFlag} <if test="updateTime != null">
</if> and update_time = #{updateTime}
<if test="createTime != null"> </if>
and create_time = #{createTime} <if test="statusFlag != null">
</if> and status_flag = #{statusFlag}
<if test="updateTime != null"> </if>
and update_time = #{updateTime} </where>
</if> </select>
<if test="statusFlag != null">
and status_flag = #{statusFlag} </mapper>
</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>
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
package com.gic.haoban.manage.web.controller; 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.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
...@@ -19,28 +30,14 @@ import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO; ...@@ -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.dto.StaffDTO;
import com.gic.haoban.manage.api.enums.AuditType; import com.gic.haoban.manage.api.enums.AuditType;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum; 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.AuditApiService;
import com.gic.haoban.manage.api.service.StaffApiService; import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService; import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService; 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.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.AuditVO; import com.gic.haoban.manage.web.vo.AuditVO;
import com.gic.haoban.manage.web.vo.StaffClerkBindLogDetailVO; import com.gic.haoban.manage.web.vo.StaffClerkBindLogDetailVO;
import com.gic.redis.data.util.RedisUtil; 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 @RestController
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
...@@ -109,7 +109,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -109,7 +109,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code); String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
// {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok", // {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok",
// "open_userid":"wo59NLDQAAxeJ-Nr7_vwkZVc7QOG73PQ","userid":"xugaohua","deviceid":"0BB1D1FA-C5A2-4BDD-80A2-33B6BB230F8A"} // "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); UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
if (user == null) { if (user == null) {
return resultResponse(HaoBanErrCode.ERR_6); return resultResponse(HaoBanErrCode.ERR_6);
...@@ -120,16 +120,13 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -120,16 +120,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
StaffDTO loginStaff = null; StaffDTO loginStaff = null;
if (enterprise != null) { if (enterprise != null) {
loginStaff = staffApiService.getByUserIdAndReflushWhenNoPhone(userId, enterprise.getWxEnterpriseId()); loginStaff = staffApiService.getByUserIdAndReflushWhenNoPhone(userId, enterprise.getWxEnterpriseId());
} if (loginStaff == null) {
//手机号不存在
if (loginStaff == null) {
if (enterprise != null) {
staffApiService.wxGetAdd(userId, enterprise.getWxEnterpriseId()); staffApiService.wxGetAdd(userId, enterprise.getWxEnterpriseId());
loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId()); loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
} }
} }
if (loginStaff == null) { if (loginStaff == null) {
logger.info("游客用户");
WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO(); WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
wellDoneLoginInfoVo.setWxOpenUseId(userId); wellDoneLoginInfoVo.setWxOpenUseId(userId);
StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(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; package com.gic.haoban.manage.web.vo;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* *
* @author YongEn * @author YongEn
* @date 2021-08-26 10:38:04 * @date 2021-08-26 10:38:04
*/ */
public class OperationSettingVO implements Serializable { public class OperationSettingVO implements Serializable {
private static final long serialVersionUID = 382528365529162044L; private static final long serialVersionUID = 382528365529162044L;
/** /**
* 是否生效 * 是否生效
*/ */
private Integer effectFlag; private Integer effectFlag;
/** /**
* 操作设置id * 操作设置id
*/ */
private String settingId; private String settingId;
/** /**
* 企业微信id * 企业微信id
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
/** /**
* 导购手机号是否必填 1 是 0 否 * 导购手机号是否必填 1 是 0 否
*/ */
private Integer clerkPhoneFlag; private Integer clerkPhoneFlag;
/** /**
* 店长是否可编辑门店 1 是 0 否 * 店长是否可编辑门店 1 是 0 否
*/ */
private Integer storeEditFlag; private Integer storeEditFlag;
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */
private Date updateTime; private Date updateTime;
/** /**
* 数据状态 1 正常 0 已删除 * 数据状态 1 正常 0 已删除
*/ */
private Integer statusFlag; private Integer statusFlag;
public Integer getEffectFlag() { public Integer getEffectFlag() {
return effectFlag; return effectFlag;
} }
public void setEffectFlag(Integer effectFlag) { public void setEffectFlag(Integer effectFlag) {
this.effectFlag = effectFlag; this.effectFlag = effectFlag;
} }
public String getSettingId() { public String getSettingId() {
return settingId; return settingId;
} }
public void setSettingId(String settingId) { public void setSettingId(String settingId) {
this.settingId = settingId; this.settingId = settingId;
} }
public String getWxEnterpriseId() { public String getWxEnterpriseId() {
return wxEnterpriseId; return wxEnterpriseId;
} }
public void setWxEnterpriseId(String wxEnterpriseId) { public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId; this.wxEnterpriseId = wxEnterpriseId;
} }
public Integer getClerkPhoneFlag() { public Integer getClerkPhoneFlag() {
return clerkPhoneFlag; return 1;
} }
public void setClerkPhoneFlag(Integer clerkPhoneFlag) { public void setClerkPhoneFlag(Integer clerkPhoneFlag) {
this.clerkPhoneFlag = clerkPhoneFlag; this.clerkPhoneFlag = 1;
} }
public Integer getStoreEditFlag() { public Integer getStoreEditFlag() {
return storeEditFlag; return storeEditFlag;
} }
public void setStoreEditFlag(Integer storeEditFlag) { public void setStoreEditFlag(Integer storeEditFlag) {
this.storeEditFlag = storeEditFlag; this.storeEditFlag = storeEditFlag;
} }
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
public Date getUpdateTime() { public Date getUpdateTime() {
return updateTime; return updateTime;
} }
public void setUpdateTime(Date updateTime) { public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
public Integer getStatusFlag() { public Integer getStatusFlag() {
return statusFlag; return statusFlag;
} }
public void setStatusFlag(Integer statusFlag) { public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag; this.statusFlag = statusFlag;
} }
@Override @Override
public String toString() { public String toString() {
return "OperationSettingDTO{" + return "OperationSettingDTO{" +
"settingId='" + settingId + '\'' + "settingId='" + settingId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' + ", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", clerkPhoneFlag=" + clerkPhoneFlag + ", clerkPhoneFlag=" + clerkPhoneFlag +
", storeEditFlag=" + storeEditFlag + ", storeEditFlag=" + storeEditFlag +
", createTime=" + createTime + ", createTime=" + createTime +
", updateTime=" + updateTime + ", updateTime=" + updateTime +
", statusFlag=" + statusFlag + ", 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