applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
@@ -73,13 +73,20 @@ TLineUpVO tLineUpVO = new TLineUpVO(); if (lineUp!=null){ BeanUtils.copyProperties(lineUp, tLineUpVO); long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class) .eq(TLineUp::getStoreId, storeId) .eq(TLineUp::getStatus, 1) .lt(lineUp!=null,TLineUp::getCode, lineUp.getCode()) .likeRight(TLineUp::getCreateTime, LocalDate.now())); tLineUpVO.setLinUpCount(count); }else{ long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class) .eq(TLineUp::getStoreId, storeId) .eq(TLineUp::getStatus, 1) .likeRight(TLineUp::getCreateTime, LocalDate.now())); tLineUpVO.setLinUpCount(count); } long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class) .eq(TLineUp::getStoreId, storeId) .eq(TLineUp::getStatus, 1) .lt(lineUp!=null,TLineUp::getCode, lineUp.getCode()) .likeRight(TLineUp::getCreateTime, LocalDate.now())); tLineUpVO.setLinUpCount(count); return ApiResult.success(tLineUpVO); } @ApiOperation(value = "取消排号") manage/src/main/java/com/jilongda/manage/controller/TAppUserController.java
@@ -85,11 +85,17 @@ .eq(TOptometry::getStatus, 3).list().size(); tAppUserVO.setOptometryCount(size); // 查询最后消费时间 tAppUserVO.setSalesTime(orderService.lambdaQuery().eq(TOrder::getUserId, tAppUserVO.getId()) .orderByDesc(TOrder::getCreateTime).last("limit 1").one().getCreateTime()); TOrder order = orderService.lambdaQuery().eq(TOrder::getUserId, tAppUserVO.getId()) .orderByDesc(TOrder::getCreateTime).last("limit 1").one(); if (order!=null){ tAppUserVO.setSalesTime(order.getCreateTime()); } // 查询最后验光时间 tAppUserVO.setOptometryTime(tOptometryService.lambdaQuery().eq(TOptometry::getUserId, tAppUserVO.getId()) .eq(TOptometry::getStatus, 3).orderByDesc(TOptometry::getCreateTime).last("limit 1").one().getCreateTime()); TOptometry optometry = tOptometryService.lambdaQuery().eq(TOptometry::getUserId, tAppUserVO.getId()) .eq(TOptometry::getStatus, 3).orderByDesc(TOptometry::getCreateTime).last("limit 1").one(); if (optometry!=null){ tAppUserVO.setOptometryTime(optometry.getCreateTime()); } // 查询订单总额 BigDecimal reduce = orderService.lambdaQuery().eq(TOrder::getUserId, byId.getId()).list().stream().map(TOrder::getPayMoney) .reduce(BigDecimal.ZERO, BigDecimal::add); manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
@@ -12,6 +12,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -53,6 +54,9 @@ @ApiOperation(value = "验光师添加") @PostMapping(value = "/add") public ApiResult<String> add(@RequestBody TOptometrist dto) { if (StringUtils.hasLength(dto.getName())&&dto.getName().length()>15){ return ApiResult.failed("验光师名称不能超过15个字"); } TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone()) .eq(TOptometrist::getStatus, 1).one(); if (one!=null){ @@ -65,6 +69,10 @@ @ApiOperation(value = "验光师编辑") @PostMapping(value = "/update") public ApiResult<String> update(@RequestBody TOptometrist dto) { if (StringUtils.hasLength(dto.getName())&&dto.getName().length()>15){ return ApiResult.failed("验光师名称不能超过15个字"); } TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone()) .ne(TOptometrist::getId,dto.getId()) .eq(TOptometrist::getStatus, 1).one(); @@ -77,8 +85,16 @@ @ApiOperation(value = "验光师上下架") @GetMapping(value = "/upAndDown") public ApiResult<Boolean> upAndDown(@RequestParam Integer id, public ApiResult upAndDown(@RequestParam Integer id, @RequestParam Integer status) { TOptometrist optometrist = optometristService.getById(id); if (status==1){ // 启用之前 先查询有没有手机号相同的验光师正在启用状态 TOptometrist oldOptometrist = optometristService.lambdaQuery().eq(TOptometrist::getPhone, optometrist.getPhone()).eq(TOptometrist::getStatus, 1).one(); if (oldOptometrist!=null){ return ApiResult.failed("当前手机号正在使用"); } } return ApiResult.success(optometristService.upAndDown(id,status)); } } manage/src/main/resources/mapping/TAppUserMapper.xml
@@ -44,6 +44,7 @@ </foreach> </if> and isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()} order by createTime desc </select> </mapper>