Skip to content

H
haoban-manage3.0
Commit dc821aa5 by 墨竹
Options

Merge branch 'master' into developer 

# Conflicts:
#	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
parents 67e89fc7 6b342a58
Showing with 120 additions and 104 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java
......@@ -9,16 +9,12 @@ public interface WxEnterpriseRelatedMapper {
int deleteByPrimaryKey(String wxEnterpriseRelatedId);
int insert(TabHaobanWxEnterpriseRelated record);
int insertSelective(TabHaobanWxEnterpriseRelated record);
TabHaobanWxEnterpriseRelated selectByPrimaryKey(String wxEnterpriseRelatedId);
int updateByPrimaryKeySelective(TabHaobanWxEnterpriseRelated record);
int updateByPrimaryKey(TabHaobanWxEnterpriseRelated record);
List<TabHaobanWxEnterpriseRelated> listByWxenterpriseId(String wxEnterpriseId);
List<TabHaobanWxEnterpriseRelated> listByWxenterpriseIdList(@Param("wxEnterpriseIdList") List<String> wxEnterpriseIdList);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterpriseRelated.java
......@@ -10,6 +10,8 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
private String enterpriseId;
private String enterpriseName;
private String version;
private Integer statusFlag;
......@@ -136,5 +138,11 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
this.staffName = staffName;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.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.WxEnterpriseRelatedMapper" >
<resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >
<id column="wx_enterprise_related_id" property="wxEnterpriseRelatedId" jdbcType="VARCHAR" />
<result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
<result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" />
<result column="version" property="version" jdbcType="VARCHAR" />
<result column="staff_id" property="staffId" jdbcType="VARCHAR" />
<result column="staff_name" property="staffName" jdbcType="VARCHAR" />
<result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper">
<resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated">
<id column="wx_enterprise_related_id" property="wxEnterpriseRelatedId" jdbcType="VARCHAR"/>
<result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
<result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
<result column="enterprise_name" property="enterpriseName" jdbcType="VARCHAR"/>
<result column="version" property="version" jdbcType="VARCHAR"/>
<result column="staff_id" property="staffId" jdbcType="VARCHAR"/>
<result column="staff_name" property="staffName" jdbcType="VARCHAR"/>
<result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
<result column="wx_enterprise_type" property="wxEnterpriseType" jdbcType="INTEGER"/>
<result column="member_open_card_flag" property="memberOpenCardFlag" jdbcType="INTEGER"/>
<result column="clerk_edit_flag" property="clerkEditFlag" jdbcType="INTEGER"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List" >
wx_enterprise_related_id, wx_enterprise_id, enterprise_id, version, status_flag, wx_enterprise_type,
<sql id="Base_Column_List">
wx_enterprise_related_id, wx_enterprise_id, enterprise_id, enterprise_name,version, status_flag, wx_enterprise_type,
member_open_card_flag,clerk_edit_flag,
create_time, update_time,staff_id,staff_name
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
delete from tab_haoban_wx_enterprise_related
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete
from tab_haoban_wx_enterprise_related
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >
insert into tab_haoban_wx_enterprise_related (wx_enterprise_related_id, wx_enterprise_id,
enterprise_id, version, status_flag,
create_time, update_time,staff_id,staff_name)
values (#{wxEnterpriseRelatedId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
#{enterpriseId,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{staffId},#{staffName})
</insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated">
insert into tab_haoban_wx_enterprise_related
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="wxEnterpriseRelatedId != null" >
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="wxEnterpriseRelatedId != null">
wx_enterprise_related_id,
</if>
<if test="wxEnterpriseId != null" >
<if test="wxEnterpriseId != null">
wx_enterprise_id,
</if>
<if test="enterpriseId != null" >
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="version != null" >
<if test="enterpriseName != null">
enterprise_name,
</if>
<if test="version != null">
version,
</if>
<if test="statusFlag != null" >
<if test="statusFlag != null">
status_flag,
</if>
<if test="wxEnterpriseType != null">
......@@ -65,33 +63,36 @@
<if test="clerkEditFlag != null">
clerk_edit_flag,
</if>
<if test="createTime != null" >
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null" >
<if test="updateTime != null">
update_time,
</if>
<if test="staffId != null" >
<if test="staffId != null">
staff_id,
</if>
<if test="staffName != null" >
<if test="staffName != null">
staff_name,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="wxEnterpriseRelatedId != null" >
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="wxEnterpriseRelatedId != null">
#{wxEnterpriseRelatedId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null" >
<if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null" >
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="version != null" >
<if test="enterpriseName != null">
#{enterpriseName},
</if>
<if test="version != null">
#{version,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null" >
<if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER},
</if>
<if test="wxEnterpriseType != null">
......@@ -103,33 +104,38 @@
<if test="clerkEditFlag != null">
#{clerkEditFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null" >
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null" >
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="staffId != null" >
<if test="staffId != null">
#{staffId},
</if>
<if test="staffName != null" >
<if test="staffName != null">
#{staffName},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >
<update id="updateByPrimaryKeySelective"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated">
update tab_haoban_wx_enterprise_related
<set >
<if test="wxEnterpriseId != null" >
<set>
<if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null" >
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="version != null" >
<if test="enterpriseName != null">
enterprise_name = #{enterpriseName},
</if>
<if test="version != null">
version = #{version,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null" >
<if test="statusFlag != null">
status_flag = #{statusFlag,jdbcType=INTEGER},
</if>
<if test="rangeType != null">
......@@ -144,68 +150,46 @@
<if test="wxEnterpriseType != null">
wx_enterprise_type = #{wxEnterpriseType,jdbcType=INTEGER},
</if>
<if test="createTime != null" >
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null" >
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="staffId != null" >
<if test="staffId != null">
staff_id = #{staffId,jdbcType=VARCHAR},
</if>
<if test="staffName != null" >
<if test="staffName != null">
staff_name = #{staffName,jdbcType=VARCHAR},
</if>
</set>
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >
update tab_haoban_wx_enterprise_related
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
version = #{version,jdbcType=VARCHAR},
status_flag = #{statusFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
staff_id = #{staffId,jdbcType=VARCHAR},
staff_name = #{staffName,jdbcType=VARCHAR},
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</update>
<select id="listByWxenterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
<select id="listByWxenterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="listByWxenterpriseIdList" resultMap="BaseResultMap">
<select id="findOneByEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where wx_enterprise_id in
<foreach collection="wxEnterpriseIdList" item="id" index="index" open="(" close=")" separator=",">
#{id,jdbcType=VARCHAR}
</foreach>
where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="findOneByEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from tab_haoban_wx_enterprise_related
where enterprise_id = #{enterpriseId,jdbcType=VARCHAR} and status_flag = 1 limit 1
</select>
<select id="queryAllHasGicEnterpriseId" resultMap="BaseResultMap" >
<select id="queryAllHasGicEnterpriseId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where status_flag = 1
</select>
<select id="listEnterpriseByEnterpriseIds" resultMap="BaseResultMap" >
<select id="listEnterpriseByEnterpriseIds" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where status_flag = 1
<if test="enterpriseIds != null and enterpriseIds.size() > 0">
......@@ -216,9 +200,9 @@
</if>
</select>
<select id="listEnterpriseByTime" resultMap="BaseResultMap" >
<select id="listEnterpriseByTime" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where status_flag = 1
AND DATE_FORMAT(update_time,'%Y-%m-%d') = #{time}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
......@@ -57,6 +57,8 @@ public class StoreController extends WebBaseController {
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private StaffApiService staffApiService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
......@@ -94,13 +96,12 @@ public class StoreController extends WebBaseController {
String storeId = mainDTO == null ? "" : mainDTO.getStoreId();
for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
boolean enterpriseOver = wxEnterpriseApiService.enterpriseIsOver(enterpriseId);
boolean enterpriseOver = isEnterpriseOver(staffClerkRelationDTO.getStoreId());
if (enterpriseOver) {
logger.info("该企业过期了：{},{},{}", staffId, enterpriseId, staffClerkRelationDTO.getStoreId());
logger.info("该企业过期了：{},{},{}", staffId, staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getStoreId());
continue;
}
ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
if (clerk == null) {
continue;
}
......@@ -116,12 +117,17 @@ public class StoreController extends WebBaseController {
if (wxEnterpriseDTO == null) {
continue;
}
String enterpriseId = clerk.getEnterpriseId();
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
if (enterpriseDTO == null) {
continue;
}
//主门店标志
int mainStoreFlag = 0;
if (storeId.equals(store.getStoreId())) {
mainStoreFlag = 1;
}
EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(clerk.getEnterpriseId());
EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(enterpriseId);
staffDepartmentRelatedApiService.listByStaffId(staffId);
StaffStoreVO vo = new StaffStoreVO();
vo.setClerkCode(clerk.getClerkCode());
......@@ -129,7 +135,7 @@ public class StoreController extends WebBaseController {
vo.setMemberOpenCardFlag(enterpriseDetailDTO != null ? enterpriseDetailDTO.getMemberOpenCardFlag() : null);
vo.setClerkId(clerk.getClerkId());
vo.setClerkType(clerk.getClerkType());
vo.setEnterpriseId(clerk.getEnterpriseId());
vo.setEnterpriseId(enterpriseId);
vo.setMainStoreFlag(mainStoreFlag);
vo.setPhoneNumber(clerk.getPhoneNumber());
vo.setStaffId(staffId);
......@@ -140,7 +146,7 @@ public class StoreController extends WebBaseController {
vo.setClerkName(clerk.getClerkName());
vo.setHeadImg(staffDTO.getHeadImg());
vo.setBindFlag(1);
vo.setEnterpriseName(enterpriseDetailDTO != null ? enterpriseDetailDTO.getEnterpriseName() : null);
vo.setEnterpriseName(enterpriseDTO.getEnterpriseName());
vo.setCorpName(wxEnterpriseDTO.getCorpName());
list.add(vo);
}
......@@ -198,7 +204,6 @@ public class StoreController extends WebBaseController {
cityList.add(cityMap.get(key));
}
return resultResponse(HaoBanErrCode.ERR_1, cityList);
// 区
case 3:
Map<String, CountyDTO> tabCountyMap = GlobalDictMap.countyMap;
Map<String, CountyDTO> countyMap = new HashMap<String, CountyDTO>();
......@@ -212,9 +217,9 @@ public class StoreController extends WebBaseController {
countyList.add(countyMap.get(key));
}
return resultResponse(HaoBanErrCode.ERR_1, countyList);
default:
return resultResponse(HaoBanErrCode.ERR_8);
}
return resultResponse(HaoBanErrCode.ERR_8);
}
//修改门店数据
......@@ -323,4 +328,26 @@ public class StoreController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_1, vo);
}
//获取门店详情
public boolean isEnterpriseOver(String storeId) {
StoreDTO store = storeService.getStore(storeId);
if (store == null) {
return true;
}
EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(store.getEnterpriseId());
if (enterprise == null || enterprise.getStatus() != 1) {
return true;
}
if (enterprise.getExpireTime() == null) {
if (enterprise.getEnabledState() == null) {
return false;
} else {
return enterprise.getEnabledState() != 1;
}
} else {
return enterprise.getExpireTime().getTime() <= System.currentTimeMillis() || enterprise.getEnabledState() != 1;
}
}
}
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