Merge remote-tracking branch 'origin/master'

doum

5 小时以前 1af395ecb948a9d0af14aa72d7fc8025e849e6bc

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

@@ -224,6 +224,7 @@
        }
        Aftersale model = findJoinById(aftersale.getId(),false);
        aftersale.setMemberId(model.getMemberId());
        aftersale.setMemberId(model.getMemberId());
        if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该售后记录不存在，请返回刷新重试！");
        }