suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-04-09 20:05:18 +08:00
parent 7d5e46870d 6cb747f17f
commit a68a702867
19 changed files with 148 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
View File

@@ -34,6 +34,13 @@ public class EnterpriseUserDAO {
return enterpriseUserMapper.getUserInfoById( userId);
}
public EnterpriseUserDO getUserInfoByJobnumber(String jobnumber){
if(StringUtils.isAnyBlank(jobnumber)){
return null;
}
return enterpriseUserMapper.getUserInfoByJobnumber(jobnumber);
}
public List<EnterpriseUserDO> getUserInfoByUserIds(List<String> userIdList){
if(CollectionUtils.isEmpty(userIdList)){
return Lists.newArrayList();

5
coolstore-partner-dao/src/main/java/com/cool/store/dao/LineCalendarsEventDAO.java
View File

@@ -3,6 +3,8 @@ package com.cool.store.dao;
import com.alibaba.fastjson.JSONObject;
import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.cool.store.entity.LineCalendarsEventDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.LineCalendarsEventMapper;
import com.cool.store.utils.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -59,8 +61,9 @@ public class LineCalendarsEventDAO {
* @return
*/
public Long addCalendarsEvent(LineCalendarsEventDO param){
if(Objects.nonNull(param.getRegionId()) || Objects.nonNull(param.getLineId()) || Objects.nonNull(param.getPartnerId()) || Objects.nonNull(param.getStartTime()) || Objects.nonNull(param.getEndTime())){
if(Objects.isNull(param.getRegionId()) || Objects.isNull(param.getLineId()) || Objects.isNull(param.getPartnerId()) || Objects.isNull(param.getStartTime()) || Objects.isNull(param.getEndTime())){
log.error("新增日历事件失败：{}",JSONObject.toJSONString(param));
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
lineCalendarsEventMapper.insertSelective(param);
return param.getId();

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
View File

@@ -19,6 +19,9 @@ public interface EnterpriseUserMapper {
*/
EnterpriseUserDO getUserInfoById(@Param("userId") String userId);
EnterpriseUserDO getUserInfoByJobnumber(@Param("jobnumber") String jobnumber);
/**
* 批量获取用户信息
* @param userIdList

10
coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
View File

@@ -41,6 +41,16 @@
user_id = #{userId}
</select>
<select id="getUserInfoByJobnumber" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>,
<include refid="Blob_Column_List"/>
from
enterprise_user_${enterpriseId}
where
jobnumber = #{jobnumber}
</select>
<select id="getUserInfoByUserIds" resultMap="BaseResultMap">
select

2
coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml
View File

@@ -101,7 +101,7 @@
select
<include refid="allColumn"/>
from xfsg_point_info
where deleted = 0 and point_status in (4,5) and development_manager = #{request.developmentManager}
where deleted = 0 and point_status in (4,5) and development_manager = #{request.developmentManager}
<if test="request.pointStatus != null and request.pointStatus != ''">
and point_status = #{request.pointStatus}
</if>