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

fix

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-09 19:08:04 +08:00
parent 902905e2ea
commit 8d84f8f47e
10 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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();

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>