modify

Helius

2021-01-12 6aee563a18b98af0b290ad86c30dd15659b237f1

modify

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -137,12 +137,14 @@
            throw new GlobleException("请选择服务");
        }
        SysVipInfo vipInfo = sysVipInfoService.findById(serviceOrderDto.getVipId());
        if (StringUtils.isBlank(vipInfo.getPassWord())) {
            return AjaxResult.buildFailInstance("未设置资金密码");
        }
//        if (StringUtils.isBlank(vipInfo.getPassWord())) {
//            return AjaxResult.buildFailInstance("未设置资金密码");
//        }

        if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
            return AjaxResult.buildFailInstance("资金密码错误");
        if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
            if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
                return AjaxResult.buildFailInstance("资金密码错误");
            }
        }

        SysProjServices sysProjServices = new SysProjServices();

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

@@ -203,4 +203,18 @@
        }
        return AjaxResult.buildSuccessInstance("档案更新成功");
    }

    @ApiOperation(value = "用户是否存在资金密码", notes = "用户是否存在资金密码")
    @GetMapping(value = "/isExistFundPassword/{vipId}")
    public AjaxResult isExistFundPassword(@PathVariable(value = "vipId") Long vipId) {
        SysVipInfo vipInfo = sysVipInfoService.findById(vipId);
        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
        if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
            ajaxResult.putInMap("isExist", true);
        } else {
            ajaxResult.putInMap("isExist", false);
        }

        return ajaxResult;
    }
}

 zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java

@@ -39,7 +39,6 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "资金密码")
    private String password;