Merge remote-tracking branch 'origin/master'

doum

10 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

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

@@ -186,6 +186,7 @@
        if (Objects.isNull(withdrawRecord) ) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        withdrawRecord.setBankInfo(Constants.getBankInfo(withdrawRecord.getBankName(),withdrawRecord.getBankAccount()));
        if(!Constants.equalsInteger(withdrawRecord.getStatus(), Constants.ZERO)){
            String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.OSS, Constants.TRANSFER_FILE).getCode();
@@ -315,7 +316,7 @@


    @Override
    public void withdrawApply(WithdrawApplyRequest request, IntegralService integralService){
    public Integer withdrawApply(WithdrawApplyRequest request, IntegralService integralService){
        if (Objects.isNull( request)
            || request.getMemberId() == null
            || request.getBankId() == null
@@ -357,6 +358,7 @@
        dealIntegralRequest.setMemberId(request.getMemberId());
        dealIntegralRequest.setDealType(Constants.ONE);
        integralService.dealShopAmount(dealIntegralRequest);
        return withdrawRecord.getId();
    }