modify

Helius

2020-12-27 c0691d2302bbaed2a47b2b703b83ed5bc204e397

modify

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

@@ -9,6 +9,7 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.CreateServiceOrderDto;
import com.matrix.system.app.dto.ServiceOrderListDto;
import com.matrix.system.app.dto.ServiceVipProjDto;
import com.matrix.system.app.mapper.SysBeauticianStateMapper;
import com.matrix.system.app.mapper.SysProjServiceMapper;
import com.matrix.system.app.mapper.SysProjUseMapper;
@@ -62,9 +63,9 @@
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = ServiceProductListVo.class)
    })
    @GetMapping(value = "/findVipProject/{vipId}")
    public AjaxResult findVipProject(@PathVariable("vipId") Long vipId) {
        SysVipInfo vipInfo = sysVipInfoService.findById(vipId);
    @PostMapping(value = "/findVipProject")
    public AjaxResult findVipProject(@RequestBody @Validated ServiceVipProjDto serviceVipProjDto) {
        SysVipInfo vipInfo = sysVipInfoService.findById(serviceVipProjDto.getVipId());

        if (vipInfo == null) {
            throw new GlobleException("会员不存在");
@@ -72,14 +73,15 @@

        ServiceProductListVo productListVo = new ServiceProductListVo();
        productListVo.setName(vipInfo.getVipName());
        productListVo.setVipId(vipId);
        productListVo.setVipId(serviceVipProjDto.getVipId());

        SysProjUse queryUse = new SysProjUse();
        queryUse.setVipId(vipId);
        queryUse.setVipId(serviceVipProjDto.getVipId());
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
        queryUse.setIsOver(Dictionary.FLAG_NO_N);
        queryUse.setQueryKey(serviceVipProjDto.getQueryKey());
        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
        List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList);


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

New file
@@ -0,0 +1,37 @@
package com.matrix.system.app.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

import javax.validation.constraints.NotNull;

/**
 * @author wzy
 * @date 2020-12-27
 **/
@ApiModel(value = "ServiceVipProjDto", description = "获取用户套餐/项目接收参数类")
public class ServiceVipProjDto {

    @NotNull(message = "参数错误")
    @ApiModelProperty(value = "会员ID")
    private Long vipId;

    @ApiModelProperty(value = "查询参数")
    private String queryKey;

    public Long getVipId() {
        return vipId;
    }

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

    public String getQueryKey() {
        return queryKey;
    }

    public void setQueryKey(String queryKey) {
        this.queryKey = queryKey;
    }
}

 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 staffId;

    @ApiModelProperty(value = "服务单编号")
    private String serviceNo;

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

    public Long getStaffId() {
        return staffId;
    }

    public void setStaffId(Long staffId) {
        this.staffId = staffId;
    }

    public List<ServiceOrderListProjVo> getProjs() {
        return projs;
    }

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java

@@ -127,6 +127,16 @@

    private String img;

    private String queryKey;

    public String getQueryKey() {
        return queryKey;
    }

    public void setQueryKey(String queryKey) {
        this.queryKey = queryKey;
    }

    public Integer getTimeLength() {
        return timeLength;
    }

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

@@ -466,6 +466,7 @@
        <result property="vipName" column="vipName" />
        <result property="timeLength" column="timeLength" />
        <result property="status" column="status" />
        <result property="staffId" column="staffId" />
        <collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
            <result property="projName" column="projName" />
            <result property="beautyName" column="beautyName" />
@@ -483,7 +484,7 @@
           a.state status,
           d.BED_NAME bed,
           e.VIP_NAME vipName,
           b.staff_id staffId,
           a.create_staff_id staffId,
           f.su_name beautyName,
           g.proj_name projName
        from sys_proj_services a

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

@@ -237,6 +237,9 @@
            <if test="record.id != null and record.id !='' ">
                and a.ID = #{record.id}
            </if>
            <if test="record.queryKey != null and record.queryKey !='' ">
                and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(goods_no, #{record.queryKey}))
            </if>
            <if test="record.orderItemId != null and record.orderItemId !='' ">
                and a.ORDER_ITEM_ID = #{record.orderItemId}
            </if>