Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java

@@ -59,6 +59,8 @@
    @Autowired
    private GoodsorderMapper goodsorderMapper;
    @Autowired
    private NoticeMapper noticeMapper;
    @Autowired
    private ShopMapper shopMapper;
    @Autowired
    private MemberMapper memberMapper;
@@ -1173,6 +1175,22 @@
                .eq(Goodsorder::getId, goodsorder.getId())
        );

        //释放核销码
        if(Constants.equalsInteger(goodsorder.getReceiveType(),Constants.ONE)&&StringUtils.isNotBlank(goodsorder.getExchangeCode())){
            RedisUtil.deleteObject(redisTemplate,Constants.RedisKeys.EXCHANGE_KEY+goodsorder.getExchangeCode());
        }


        //发送订单退款站内信
        Notice notice = Notice.getNotice(
                Constants.NoticeType.NOTICE_ORDER_REFUND,
                goodsorder.getMemberId(),
                goodsorder.getId()
        );
        notice.setContent(notice.getContent().replace("{param}",goodsorder.getCode().toString()));
        noticeMapper.insert(notice);


    }