Merge branch 'api' into order_reform

Helius

2021-01-12 a88cf964159303c208d8a3a9d0b8dadef7b1388a

 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();