modify

Helius

2020-12-25 6560aa50be0d7108c95261c39324f1e0663285f8

modify

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

@@ -1,14 +1,30 @@
package com.matrix.system.app.action;

import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.BeauticianDto;
import com.matrix.system.app.mapper.SysUsersMapper;
import com.matrix.system.app.vo.BeauticianVo;
import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.service.AchieveNewService;
import com.matrix.system.hive.service.SysWorkBeatuistaffService;
import com.matrix.system.hive.service.SysWorktimeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @author wzy
@@ -21,6 +37,10 @@

    @Autowired
    private AchieveNewService achieveNewService;
    @Resource
    private SysWorktimeService sysWorkTimeService;
    @Resource
    private SysUsersService sysUsersService;


    @ApiOperation(value = "个人中心--获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")
@@ -35,10 +55,27 @@
        return ajaxResult;
    }

    @PostMapping(value = "/findBeautician")
    public AjaxResult findBeautician() {
        return null;
    }
    @ApiOperation(value = "获取美疗师列表")
    @ApiResponses(
            @ApiResponse(code = 200, message = "Ok", response = BeauticianVo.class)
    )
    @PostMapping(value = "/findBeauticianList")
    public AjaxResult findBeauticianList(@RequestBody @Validated BeauticianDto beauticianDto) {
        SysBeauticianState sysBeauticianState = new SysBeauticianState();
        sysBeauticianState.setBeginTime(beauticianDto.getStartTime());
        sysBeauticianState.setEndTime(beauticianDto.getEndTime());

        // 根据时间获取一段排班码
        String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
        // 获取登陆的用户
        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        List<SysUsers> staffs=new ArrayList<>();
        if(sysWorkTimeService.isInWorkTime(user.getShopId(),sysBeauticianState.getBeginTime(),sysBeauticianState.getEndTime())){
            staffs= sysUsersService.findByCodeBeaStateShop(user.getShopId(),
                    sysBeauticianState, panBanCodes);
        }

        return new AjaxResult(AjaxResult.STATUS_SUCCESS, SysUsersMapper.INSTANCE.usersListToBeautyList(staffs), 0);
    }

}

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

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

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

import javax.validation.constraints.NotNull;
import java.util.Date;

/**
 * @author wzy
 * @date 2020-12-25
 **/
@ApiModel(value = "BeauticianDto", description = "获取美疗师列表接收参数类")
public class BeauticianDto {

    @NotNull(message = "开始时间不能为空")
    @ApiModelProperty(value = "开始时间")
    private Date startTime;

    @NotNull(message = "结束时间不能为空")
    @ApiModelProperty(value = "结束时间")
    private Date endTime;

    public Date getStartTime() {
        return startTime;
    }

    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }

    public Date getEndTime() {
        return endTime;
    }

    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
}

 zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java

New file
@@ -0,0 +1,25 @@
package com.matrix.system.app.mapper;

import com.matrix.system.app.vo.BeauticianVo;
import com.matrix.system.common.bean.SysUsers;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;

import java.util.List;

/**
 * @author wzy
 * @date 2020-12-25
 **/
@Mapper
public abstract class SysUsersMapper {
    public static final SysUsersMapper INSTANCE = Mappers.getMapper(SysUsersMapper.class);

    @Mapping(source = "su_id", target = "id")
    @Mapping(source = "su_name", target = "name")
    public abstract BeauticianVo sysUsersToBeauticianVo(SysUsers sysUsers);

    public abstract List<BeauticianVo> usersListToBeautyList(List<SysUsers> list);

}

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

New file
@@ -0,0 +1,31 @@
package com.matrix.system.app.vo;

import io.swagger.annotations.ApiModel;

/**
 * @author wzy
 * @date 2020-12-25
 **/
@ApiModel(value = "BeauticianVo", description = "美疗师列表返回参数类")
public class BeauticianVo {

    private Long id;

    private String name;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }
}

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

@@ -53,6 +53,12 @@
    @ApiModelProperty(value = "赠送金额")
    private BigDecimal giftPrice;

    @ApiModelProperty(value = "固定/任选套餐 Y-任选 N-固定")
    private String isCourse;

    @ApiModelProperty(value = "最大使用次数")
    private Integer maxUseCnt;

    @ApiModelProperty(value = "项目关联产品--配料表、卡项可消费产品")
    List<ShoppingGoodsDetailVo> assembleProj;

@@ -200,4 +206,20 @@
    public void setCardCategory(List<ShoppingGoodsCategory> cardCategory) {
        this.cardCategory = cardCategory;
    }

    public String getIsCourse() {
        return isCourse;
    }

    public void setIsCourse(String isCourse) {
        this.isCourse = isCourse;
    }

    public Integer getMaxUseCnt() {
        return maxUseCnt;
    }

    public void setMaxUseCnt(Integer maxUseCnt) {
        this.maxUseCnt = maxUseCnt;
    }
}

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java

@@ -522,7 +522,8 @@
        goodsDetailVo.setGoodsType(shoppingGoods.getGoodType());
        goodsDetailVo.setDesc(shoppingGoods.getDescription());
        goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount());
        goodsDetailVo.setLimitBuyCnt(shoppingGoods.getCarUseCount().toString());
        goodsDetailVo.setLimitBuyCnt("否".equals(shoppingGoods.getIsOnce()) ? null : shoppingGoods.getIsOnce());
        goodsDetailVo.setMaxUseCnt(shoppingGoods.getCarUseCount());
        goodsDetailVo.setMeasure(shoppingGoods.getMeasure());
        goodsDetailVo.setVolume(shoppingGoods.getVolume());
        goodsDetailVo.setSalePrice(BigDecimal.valueOf(shoppingGoods.getSealPice()));