From f28b960319d74810266c2fd8f52f10a5fa8ade2a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 31 Aug 2023 20:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=80=E6=96=B0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=20url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/service/spu/ProductSpuServiceImpl.java | 5 +++-- .../admin/seckill/SeckillConfigController.java | 5 +++-- .../app/bargain/AppBargainActivityController.java | 10 +++++----- .../app/bargain/AppBargainRecordController.java | 8 ++++---- .../combination/AppCombinationActivityController.java | 4 ++-- .../combination/AppCombinationRecordController.java | 6 +++--- .../app/seckill/AppSeckillActivityController.java | 8 ++++---- .../app/seckill/AppSeckillConfigController.java | 4 ++-- .../seckill/seckillconfig/SeckillConfigMapper.java | 2 +- 9 files changed, 27 insertions(+), 25 deletions(-) diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java index 3ada0be78..43421315f 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java @@ -110,8 +110,9 @@ public class ProductSpuServiceImpl implements ProductSpuService { spu.setMarketPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getMarketPrice)); // sku 单价最低的商品的成本价格 spu.setCostPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getCostPrice)); - // sku 单价最低的商品的条形码 - spu.setBarCode(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getBarCode)); + // sku 单价最低的商品的条形码 TODO 芋艿：条形码字段，是不是可以删除 + spu.setBarCode(""); +// spu.setBarCode(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getBarCode)); // skus 库存总数 spu.setStock(getSumValue(skus, ProductSkuCreateOrUpdateReqVO::getStock, Integer::sum)); // 若是 spu 已有状态则不处理 diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java index a8a793c77..44ec72e8a 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java @@ -81,12 +81,13 @@ public class SeckillConfigController { @GetMapping("/list-all-simple") @Operation(summary = "获得所有开启状态的秒杀时段精简列表", description = "主要用于前端的下拉选项") public CommonResult> getListAllSimple() { - List list = seckillConfigService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus()); + List list = seckillConfigService.getSeckillConfigListByStatus( + CommonStatusEnum.ENABLE.getStatus()); return success(SeckillConfigConvert.INSTANCE.convertList1(list)); } @GetMapping("/page") - @Operation(summary = "获得秒杀活动分页") + @Operation(summary = "获得秒杀时间段分页") @PreAuthorize("@ss.hasPermission('promotion:seckill-config:query')") public CommonResult> getSeckillActivityPage(@Valid SeckillConfigPageReqVO pageVO) { PageResult pageResult = seckillConfigService.getSeckillConfigPage(pageVO); diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java index 537350aed..2232ead7b 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java @@ -35,7 +35,7 @@ public class AppBargainActivityController { activity1.setId(1L); activity1.setName("618 大砍价"); activity1.setSpuId(2048L); - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); activity1.setMarketPrice(50); activity1.setBargainPrice(100); activity1.setStartTime(LocalDateTimeUtils.addTime(Duration.ofDays(-2))); @@ -47,7 +47,7 @@ public class AppBargainActivityController { activity2.setId(2L); activity2.setName("双十一砍价"); activity2.setSpuId(4096L); - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132"); + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg"); activity2.setMarketPrice(100); activity2.setBargainPrice(200); activity2.setStartTime(LocalDateTimeUtils.addTime(Duration.ofDays(-2))); @@ -69,7 +69,7 @@ public class AppBargainActivityController { activity1.setId(1L); activity1.setName("618 大砍价"); activity1.setSpuId(2048L); - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); activity1.setMarketPrice(50); activity1.setBargainPrice(100); activityList.add(activity1); @@ -78,7 +78,7 @@ public class AppBargainActivityController { activity2.setId(2L); activity2.setName("双十一砍价"); activity2.setSpuId(4096L); - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132"); + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg"); activity2.setMarketPrice(100); activity2.setBargainPrice(200); activityList.add(activity2); @@ -94,7 +94,7 @@ public class AppBargainActivityController { activity.setId(2L); activity.setName("618 大砍价"); activity.setSpuId(2048L); - activity.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + activity.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); activity.setMarketPrice(50); activity.setBargainPrice(100); activity.setStock(10); diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java index 0df8db49a..bb2bf584f 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java @@ -81,7 +81,7 @@ public class AppBargainRecordController { record1.setPrice(200); record1.setPayPrice(180); record1.setStatus(1); - record1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + record1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); record1.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2))); page.getList().add(record1); @@ -96,7 +96,7 @@ public class AppBargainRecordController { record2.setPrice(200); record2.setPayPrice(280); record2.setStatus(2); - record2.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + record2.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); record2.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2))); page.getList().add(record2); @@ -111,7 +111,7 @@ public class AppBargainRecordController { record3.setPrice(200); record3.setPayPrice(380); record3.setStatus(2); - record3.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + record3.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); record3.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2))); record3.setOrderId(100L); page.getList().add(record3); @@ -127,7 +127,7 @@ public class AppBargainRecordController { record4.setPrice(200); record4.setPayPrice(380); record4.setStatus(3); - record4.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + record4.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); record4.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2))); record4.setOrderId(100L); page.getList().add(record4); diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java index 216ec5285..75693f90b 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java @@ -38,7 +38,7 @@ public class AppCombinationActivityController { activity1.setName("618 大拼团"); activity1.setUserSize(3); activity1.setSpuId(2048L); - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); activity1.setMarketPrice(50); activity1.setCombinationPrice(100); activityList.add(activity1); @@ -48,7 +48,7 @@ public class AppCombinationActivityController { activity2.setName("双十一拼团"); activity2.setUserSize(5); activity2.setSpuId(4096L); - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132"); + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg"); activity2.setMarketPrice(100); activity2.setCombinationPrice(200); activityList.add(activity2); diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java index 74cd39c5a..7496e2e0e 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java @@ -41,7 +41,7 @@ public class AppCombinationRecordController { summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/ouwtwJycbic2JrCoZjETict0klxd1uRuicRneKk00ewMcCClxVcVHQT91Sh9MJGtwibf1fOicD1WpwSP4icJM6eQq1AA/132"); summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/RpUrhwens58qc99OcGs993xL4M5QPOe05ekqF9Eia440kRicAlicicIdQWicHBmy2bzLgHzHguWEzHHxnIgeictL7bLA/132"); summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/S4tfqmxc8GZGsKc1K4mnhpvtG16gtMrLnTQfDibhr7jJich9LRI5RQKZDoqEjZM3azMib5nic7F4ZXKMEgYyLO08KA/132"); - summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132"); + summary.getAvatars().add("https://static.iocoder.cn/mall/132.jpeg"); return success(summary); } @@ -61,7 +61,7 @@ public class AppCombinationRecordController { record.setExpireTime(new Date()); record.setUserSize(10); record.setUserCount(i); - record.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + record.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); record.setActivityId(1L); record.setSpuName("活动：" + i); list.add(record); @@ -84,7 +84,7 @@ public class AppCombinationRecordController { headRecord.setUserCount(3); headRecord.setStatus(1); headRecord.setActivityId(10L); - headRecord.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + headRecord.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); headRecord.setCombinationPrice(100); detail.setHeadRecord(headRecord); // 团员 diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java index 7c4fd9ee2..098dfca67 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java @@ -39,7 +39,7 @@ public class AppSeckillActivityController { activity1.setId(1L); activity1.setName("618 大秒杀"); activity1.setSpuId(2048L); - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); activity1.setMarketPrice(50); activity1.setSeckillPrice(100); activityList.add(activity1); @@ -48,7 +48,7 @@ public class AppSeckillActivityController { activity2.setId(2L); activity2.setName("双十一大秒杀"); activity2.setSpuId(4096L); - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132"); + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg"); activity2.setMarketPrice(100); activity2.setSeckillPrice(200); activityList.add(activity2); @@ -65,7 +65,7 @@ public class AppSeckillActivityController { activity1.setId(1L); activity1.setName("618 大秒杀"); activity1.setSpuId(2048L); - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg"); activity1.setMarketPrice(50); activity1.setSeckillPrice(100); activity1.setUnitName("个"); @@ -77,7 +77,7 @@ public class AppSeckillActivityController { activity2.setId(2L); activity2.setName("双十一大秒杀"); activity2.setSpuId(4096L); - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132"); + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg"); activity2.setMarketPrice(100); activity2.setSeckillPrice(200); activity2.setUnitName("套"); diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java index 23a5aa4bc..d59a365b9 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java @@ -25,8 +25,8 @@ public class AppSeckillConfigController { public CommonResult> getSeckillConfigList() { return success(Arrays.asList( new AppSeckillConfigRespVO().setId(1L).setStartTime("00:00").setEndTime("09:59") - .setSliderPicUrls(Arrays.asList("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg", - "https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132")), + .setSliderPicUrls(Arrays.asList("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg", + "https://static.iocoder.cn/mall/132.jpeg")), new AppSeckillConfigRespVO().setId(2L).setStartTime("10:00").setEndTime("12:59"), new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("22:59"), new AppSeckillConfigRespVO().setId(2L).setStartTime("23:00").setEndTime("23:59") diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java index 38bbe18da..6d07cfcdf 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java @@ -16,7 +16,7 @@ public interface SeckillConfigMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(SeckillConfigDO::getName, reqVO.getName()) .eqIfPresent(SeckillConfigDO::getStatus, reqVO.getStatus()) - .orderByDesc(SeckillConfigDO::getId)); + .orderByAsc(SeckillConfigDO::getStartTime)); } default List selectListByStatus(Integer status) {