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

jyy

2021-01-12 34dba42b4d215398ed3215efb3c31a898870ffcf

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

 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;


 zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "订单ID")
    private String orderId;

    @ApiModelProperty(value = "会员ID")
    private String vipId;

    @ApiModelProperty(value = "会员姓名")
    private String vipName;

@@ -59,6 +62,13 @@
    @ApiModelProperty(value = "下单时间")
    private Date orderTime;

    public String getVipId() {
        return vipId;
    }

    public void setVipId(String vipId) {
        this.vipId = vipId;
    }

    public Date getOrderTime() {
        return orderTime;

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java

@@ -18,6 +18,9 @@
    @ApiModelProperty(value = "服务单Id")
    private Long id;

    @ApiModelProperty(value = "会员ID")
    private Long vipId;

    @ApiModelProperty(value = "下单顾问ID")
    private Long createStaffId;

@@ -43,6 +46,14 @@
    @ApiModelProperty(value = "服务项目信息")
    private List<ServiceOrderListProjVo> projs;

    public Long getVipId() {
        return vipId;
    }

    public void setVipId(Long vipId) {
        this.vipId = vipId;
    }

    public Long getCreateStaffId() {
        return createStaffId;
    }

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -479,6 +479,7 @@
    <select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">
        select
           a.id orderId,
           a.VIP_ID vipId,
           a.ORDER_NO orderNo,
           a.ORDER_TIME orderTime,
           a.STATU orderStatus,

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml

@@ -464,6 +464,7 @@
        <result property="time" column="time"/>
        <result property="bed" column="bed" />
        <result property="vipName" column="vipName" />
        <result property="vipId" column="vipId" />
        <result property="timeLength" column="timeLength" />
        <result property="status" column="status" />
        <result property="createStaffId" column="createStaffId" />
@@ -485,6 +486,7 @@
           a.create_staff_id createStaffId,
           d.BED_NAME bed,
           e.VIP_NAME vipName,
           e.id vipId,
           b.staff_id staffId,
           f.su_name beautyName,
           g.proj_name projName