modify

Helius

2020-12-25 0ac5bdd7425f8366d63c16b42a4f563984c1db97

modify

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

@@ -5,6 +5,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.pojo.VerifyResult;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.CreateServiceOrderDto;
import com.matrix.system.app.dto.ServiceOrderListDto;
@@ -32,6 +33,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@@ -109,7 +111,17 @@
        sysProjServices.setVipId(serviceOrderDto.getVipId());
        sysProjServices.setYyTime(serviceOrderDto.getYyTime());
        sysProjServices.setRemark(serviceOrderDto.getRemark());
        List<SysBeauticianState> sysBeauticianStates = SysBeauticianStateMapper.INSTANCE.orderItmesVoToEntityList(serviceOrderDto.getProjItems());

        List<SysBeauticianState> sysBeauticianStates = new ArrayList<>();
        serviceOrderDto.getProjItems().forEach(item ->{
            SysBeauticianState sysBeauticianState = SysBeauticianStateMapper.INSTANCE.serviceOrderItemVoToEntity(item);

            sysBeauticianState.setBeginTime(serviceOrderDto.getYyTime());
            sysBeauticianState.setEndTime(DateUtil.getDateAfterMinute(serviceOrderDto.getYyTime(), serviceOrderDto.getTotalTime()));
            sysBeauticianState.setStaffId(serviceOrderDto.getBeautyId());
            sysBeauticianStates.add(sysBeauticianState);
        });

        sysProjServices.setServiceItems(sysBeauticianStates);

        //检测欠款

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

@@ -29,6 +29,9 @@
    @ApiModelProperty(value = "选择的项目")
    private List<CreateServiceOrderItemDto> projItems;

    @ApiModelProperty(value = "总时长")
    private Integer totalTime;

    @ApiModelProperty(value = "备注")
    private String remark;

@@ -71,4 +74,12 @@
    public void setRemark(String remark) {
        this.remark = remark;
    }

    public Integer getTotalTime() {
        return totalTime;
    }

    public void setTotalTime(Integer totalTime) {
        this.totalTime = totalTime;
    }
}