rk
12 小时以前 4f30734588eb34ea2d7c27856f72ce40da8ab365
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
@@ -233,12 +234,11 @@
        ;
        IPage<Notice> noticeIPage = noticeMapper.selectPage(page, queryWrapper);
        List<NoticeCardDTO> noticeCardDTOs = new ArrayList<>();
        if (CollectionUtils.isEmpty(noticeIPage.getRecords())){
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(noticeIPage.getRecords())){
            noticeCardDTOs = noticeIPage.getRecords().stream().map(s -> {
                NoticeCardDTO noticeCardDTO = new NoticeCardDTO();
                BeanUtils.copyProperties(s, noticeCardDTO);
                return noticeCardDTO;
            }).collect(Collectors.toList());
        }
        PageData<NoticeCardDTO> pageData = new PageData<>();
@@ -279,16 +279,13 @@
     * @param memberId 用户主键/商户主键
     * @param integral 变动积分/现金值
     * @param objId 关联对象主键 - 积分流水变动记录主键
     * @param param1 param2
     */
    @Override
    public void saveMemberIntegralNotice(Constants.IntegralObjType integralObjType,Integer type,
                                         Integer memberId,
                                         BigDecimal integral,
                                         Integer objId,String param1){
                                         Integer objId,String info){
        String title = integralObjType.getName();
        String info = integralObjType.getNoteinfo();
        info = info.replace("${param}",integral.toString()).replace("${param1}",param1);
        this.saveNoticeInfo(
                type,
                Constants.ONE,
@@ -424,6 +421,19 @@
    }
    @Override
    public void autoRead(Integer memberId,Integer noticeType){
        noticeMapper.update(new UpdateWrapper<Notice>().lambda()
                .set(Notice::getStatus,Constants.ONE)
                .set(Notice::getEditDate, DateUtil.getCurrDateTime())
                .eq(Notice::getMemberId,memberId)
                .ne(Objects.nonNull(noticeType)&&Constants.equalsInteger(noticeType,Constants.ZERO),Notice::getObjType,Constants.TWO)
                .eq(Objects.nonNull(noticeType)&&Constants.equalsInteger(noticeType,Constants.ONE),Notice::getObjType,Constants.TWO)
                .eq(Notice::getStatus,Constants.ZERO)
        );
    }