manage/src/main/java/com/jilongda/manage/config/WebSecurityConfig.java
@@ -61,8 +61,8 @@ */ @Bean public SecurityUtils securityUtils() { return new SecurityUtils(accessTokenCache,refreshTokenCache); // return new SecurityUtils(); // return new SecurityUtils(accessTokenCache,refreshTokenCache); return new SecurityUtils(); }
@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -57,13 +58,10 @@ } @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){ public ApiResult<String> add(@Validated @RequestBody TOptometrist dto) { Long count = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone()) .eq(TOptometrist::getStatus, 1).count(); if (count>0){ return ApiResult.failed("当前号码已存在"); } List<SecUser> list = secUserService.lambdaQuery().eq(SecUser::getPhone, dto.getPhone()).list(); @@ -79,10 +77,10 @@ return ApiResult.failed("验光师名称不能超过15个字"); } TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone()) Long count = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone()) .ne(TOptometrist::getId,dto.getId()) .eq(TOptometrist::getStatus, 1).one(); if (one!=null){ .eq(TOptometrist::getStatus, 1).count(); if (count>0){ return ApiResult.failed("当前号码已存在"); } List<SecUser> list = secUserService.lambdaQuery().eq(SecUser::getPhone, dto.getPhone()).list(); manage/src/main/java/com/jilongda/manage/model/TOptometrist.java
@@ -12,6 +12,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; /** * <p> @@ -34,6 +37,8 @@ private Integer id; @ApiModelProperty(value = "验光师名称") @NotBlank(message = "验光师名称不能为空") @Length(max = 15,message = "验光师名称不能超过15个字") @TableField("name") private String name;
@@ -49,8 +49,8 @@ List<TOrderAftersalesVO> list = this.baseMapper.pageList(query,pageInfo); for (TOrderAftersalesVO tOrderAftersalesVO : list) { TOrder tOrder = orderMapper.selectById(tOrderAftersalesVO.getOrderId()); if (tOrder.getUserId()!=null){ TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId()); TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId()); if (tAppUser!=null){ tOrderAftersalesVO.setName(tAppUser.getName()); tOrderAftersalesVO.setRealName(tAppUser.getRealName()); tOrderAftersalesVO.setPhone(tAppUser.getPhone()); manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java
@@ -62,8 +62,8 @@ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); for (TOrder tOrder : list) { TOrderListVO tOrderListVO = new TOrderListVO(); if (tOrder.getUserId()!=null){ TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId()); TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId()); if (tAppUser!=null){ tOrderListVO.setWxName(tAppUser.getName()); } TStore tStore = storeMapper.selectById(tOrder.getStoreId()); manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
@@ -91,12 +91,17 @@ public PageInfo<TWarehousingVO> inventoryReceiptList(TWarehousingDetailQuery query) { PageInfo<TWarehousingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TWarehousingVO> list = this.baseMapper.inventoryReceiptList(query,pageInfo); List<TStore> stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class) .in(TStore::getId, list.stream().map(TWarehousingVO::getStoreId).collect(Collectors.toList()))); for (TWarehousingVO tWarehousingVO : list) { List<TFrameWarehousingDetail> tFrameWarehousingDetails = frameWarehousingDetailMapper.selectList(Wrappers.lambdaQuery(TFrameWarehousingDetail.class) .eq(TFrameWarehousingDetail::getWarehousingId, tWarehousingVO.getId())); if(CollectionUtils.isNotEmpty(tFrameWarehousingDetails)){ tWarehousingVO.setTotalNum(tFrameWarehousingDetails.stream().mapToInt(TFrameWarehousingDetail::getTotal).sum()); } stores.stream().filter(tStore -> tStore.getId().equals(tWarehousingVO.getStoreId())).findFirst().ifPresent(tStore -> { tWarehousingVO.setStoreName(tStore.getName()); }); } pageInfo.setRecords(list); return pageInfo; manage/src/main/java/com/jilongda/manage/vo/TWarehousingVO.java
@@ -14,6 +14,8 @@ @ApiModelProperty(value = "出库/入库合计数量") private Integer totalNum=0; @ApiModelProperty(value = "门店名称") private String storeName; @ApiModelProperty(value = "出库/入库明细") private List<TFrameWarehousingDetail> frameWarehousingDetails; manage/src/main/resources/mapping/TInventoryMapper.xml
@@ -41,7 +41,7 @@ and t1.createTime between #{query.startTime} and #{query.endTime} </if> and t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()} order by t1.createTime desc </select> </mapper>
