diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java index f006f1cd7..94560ea37 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java @@ -42,8 +42,8 @@ public class StoreProductStorageDetailController extends XktBaseController { final IStoreProductStorageDetailService storageDetailService; @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") - @ApiOperation(value = "导出入库记录", httpMethod = "POST", response = R.class) - @Log(title = "导出入库记录", businessType = BusinessType.EXPORT) + @ApiOperation(value = "打印入库单", httpMethod = "POST", response = R.class) + @Log(title = "打印入库单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @Validated @RequestBody StoreStorageExportVO exportVO) throws UnsupportedEncodingException { List downloadList = storageDetailService.export(BeanUtil.toBean(exportVO, StoreStorageExportDTO.class)); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java index e3cef7b68..f9e5e9658 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java @@ -104,7 +104,7 @@ public class SysJobServiceImpl implements ISysJobService { throw new ServiceException("新增任务'" + createDTO.getJobName() + "'失败,目标字符串不在白名单内", HttpStatus.ERROR); } SysJob job = BeanUtil.toBean(createDTO, SysJob.class); - job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); job.setCreateBy(getUsername()); int count = this.jobMapper.insert(job); ScheduleUtils.createScheduleJob(scheduler, job); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java index 82c366855..55e0ce220 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java @@ -39,6 +39,7 @@ import com.ruoyi.xkt.dto.order.StoreOrderCancelDTO; import com.ruoyi.xkt.dto.order.StoreOrderRefund; import com.ruoyi.xkt.dto.picture.ProductPicSyncDTO; import com.ruoyi.xkt.dto.picture.ProductPicSyncResultDTO; +import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdMinPriceDTO; import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileLatestFourProdDTO; import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileResDTO; import com.ruoyi.xkt.dto.useSearchHistory.UserSearchHistoryDTO; @@ -155,7 +156,7 @@ public class XktTask { .eq(SysDictData::getStatus, "0")); // 当前最大排序 final Long maxSort = dictDataList.stream().max(Comparator.comparingLong(SysDictData::getDictSort)) - .map(x -> x.getDictSort()).orElse(100L); + .map(SysDictData::getDictSort).orElse(100L); // 往sys_dict_data表插入一条数据 SysDictData dictData = new SysDictData(); dictData.setDictLabel(seasonLabel); @@ -670,7 +671,7 @@ public class XktTask { if (CollectionUtils.isEmpty(latestBrowsingList)) { return; } - latestBrowsingList.stream().collect(Collectors.groupingBy(x -> x.getUserId())) + latestBrowsingList.stream().collect(Collectors.groupingBy(UserBrowsingHistory::getUserId)) .forEach((userId, list) -> { // 按照浏览时间升序排 list.sort(Comparator.comparing(UserBrowsingHistory::getBrowsingTime)); @@ -847,38 +848,38 @@ public class XktTask { return; } System.err.println(unpublicList); - final List storeProdIdList = unpublicList.stream().map(x -> x.getId()).map(String::valueOf).collect(Collectors.toList()); + final List storeProdIdList = unpublicList.stream().map(StoreProduct::getId).map(String::valueOf).collect(Collectors.toList()); // 获取所有的商品的第一张主图 List mainPicList = this.storeProdFileMapper.selectMainPic(storeProdIdList); // 所有的商品主图map Map> mainPicMap = mainPicList.stream().filter(x -> Objects.equals(x.getFileType(), FileType.MAIN_PIC.getValue())) - .collect(Collectors.groupingBy(x -> x.getStoreProdId(), Collectors.mapping(x -> x.getFileUrl(), Collectors.toList()))); + .collect(Collectors.groupingBy(StoreProdFileResDTO::getStoreProdId, Collectors.mapping(StoreProdFileResDTO::getFileUrl, Collectors.toList()))); // 第一张商品主图map Map firstMainPicMap = mainPicList.stream().filter(x -> Objects.equals(x.getFileType(), FileType.MAIN_PIC.getValue())) .filter(x -> Objects.equals(x.getOrderNum(), Constants.ORDER_NUM_1)).collect(Collectors - .toMap(x -> x.getStoreProdId(), x -> x)); + .toMap(StoreProdFileResDTO::getStoreProdId, x -> x)); // 主图视频map Map mainVideoMap = mainPicList.stream().filter(x -> Objects.equals(x.getFileType(), FileType.MAIN_PIC_VIDEO.getValue())) - .collect(Collectors.toMap(x -> x.getStoreProdId(), x -> true)); + .collect(Collectors.toMap(StoreProdFileResDTO::getStoreProdId, x -> true)); // 所有的分类 List prodCateList = this.prodCateMapper.selectList(new LambdaQueryWrapper() .eq(SysProductCategory::getDelFlag, Constants.UNDELETED)); - Map prodCateMap = prodCateList.stream().collect(Collectors.toMap(x -> x.getId(), x -> x)); + Map prodCateMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getId, x -> x)); // 父级分类 - Map parProdCateMap = prodCateList.stream().collect(Collectors.toMap(x -> x.getParentId(), x -> x.getParentId(), (s1, s2) -> s2)); + Map parProdCateMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getParentId, SysProductCategory::getParentId, (s1, s2) -> s2)); // 子分类 - Map childProdCateMap = prodCateList.stream().collect(Collectors.toMap(x -> x.getId(), x -> x.getId())); + Map childProdCateMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getId, SysProductCategory::getId)); // 获取当前商品最低价格 Map prodMinPriceMap = this.prodColorPriceMapper.selectStoreProdMinPriceList(storeProdIdList).stream().collect(Collectors - .toMap(x -> x.getStoreProdId(), x -> x.getPrice())); + .toMap(StoreProdMinPriceDTO::getStoreProdId, StoreProdMinPriceDTO::getPrice)); // 档口商品的属性map Map cateAttrMap = this.cateAttrMapper.selectList(new LambdaQueryWrapper() .eq(StoreProductCategoryAttribute::getDelFlag, Constants.UNDELETED).in(StoreProductCategoryAttribute::getStoreProdId, storeProdIdList)) - .stream().collect(Collectors.toMap(x -> x.getStoreProdId(), x -> x)); + .stream().collect(Collectors.toMap(StoreProductCategoryAttribute::getStoreProdId, x -> x)); // 档口商品对应的档口 Map storeMap = this.storeMapper.selectList(new LambdaQueryWrapper().eq(Store::getDelFlag, Constants.UNDELETED) - .in(Store::getId, unpublicList.stream().map(x -> x.getStoreId()).collect(Collectors.toList()))) - .stream().collect(Collectors.toMap(x -> x.getId(), x -> x)); + .in(Store::getId, unpublicList.stream().map(StoreProduct::getStoreId).collect(Collectors.toList()))) + .stream().collect(Collectors.toMap(Store::getId, x -> x)); // 构建批量操作请求 List bulkOperations = new ArrayList<>(); for (StoreProduct product : unpublicList) {