Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java

@@ -105,8 +105,9 @@
        if (parse.before(new Date())){
            appUser.setIsVip(0);
        }
        vipPayment.setRemark(vipRefundDto.getRemark());
        appUserService.updateById(appUser);
        vipPayment.setState(3);
        vipPayment.setPayStatus(3);
        vipPaymentService.updateById(vipPayment);
        return "200";
    }
@@ -124,6 +125,9 @@
        vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);
        vipPaymentLambdaQueryWrapper.ge(StringUtils.hasLength(vipPaymentDto.getStartTime()), VipPayment::getInsertTime, vipPaymentDto.getStartTime());
        vipPaymentLambdaQueryWrapper.le(StringUtils.hasLength(vipPaymentDto.getEndTime()), VipPayment::getInsertTime, vipPaymentDto.getEndTime());
        if (vipPaymentDto.getIsRefund()==null){
            payStatus.add(3);
        }
        if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==1){
            payStatus.add(3);
        }