BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f28b960319d74810266c2fd8f52f10a5fa8ade2a

Authored by YunaiV
1 parent 60d4aa97

调整最新图片 url

Inline Side-by-side
Showing 9 changed files with 27 additions and 25 deletions
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
  View file @f28b960
... ... @@ -110,8 +110,9 @@ public class ProductSpuServiceImpl implements ProductSpuService {
110 110 spu.setMarketPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getMarketPrice));
111 111 // sku 单价最低的商品的成本价格
112 112 spu.setCostPrice(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getCostPrice));
113   - // sku 单价最低的商品的条形码
114   - spu.setBarCode(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getBarCode));
  113 + // sku 单价最低的商品的条形码 TODO 芋艿：条形码字段，是不是可以删除
  114 + spu.setBarCode("");
  115 +// spu.setBarCode(getMinValue(skus, ProductSkuCreateOrUpdateReqVO::getBarCode));
115 116 // skus 库存总数
116 117 spu.setStock(getSumValue(skus, ProductSkuCreateOrUpdateReqVO::getStock, Integer::sum));
117 118 // 若是 spu 已有状态则不处理
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
  View file @f28b960
... ... @@ -81,12 +81,13 @@ public class SeckillConfigController {
81 81 @GetMapping("/list-all-simple")
82 82 @Operation(summary = "获得所有开启状态的秒杀时段精简列表", description = "主要用于前端的下拉选项")
83 83 public CommonResult<List<SeckillConfigSimpleRespVO>> getListAllSimple() {
84   - List<SeckillConfigDO> list = seckillConfigService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus());
  84 + List<SeckillConfigDO> list = seckillConfigService.getSeckillConfigListByStatus(
  85 + CommonStatusEnum.ENABLE.getStatus());
85 86 return success(SeckillConfigConvert.INSTANCE.convertList1(list));
86 87 }
87 88  
88 89 @GetMapping("/page")
89   - @Operation(summary = "获得秒杀活动分页")
  90 + @Operation(summary = "获得秒杀时间段分页")
90 91 @PreAuthorize("@ss.hasPermission('promotion:seckill-config:query')")
91 92 public CommonResult<PageResult<SeckillConfigRespVO>> getSeckillActivityPage(@Valid SeckillConfigPageReqVO pageVO) {
92 93 PageResult<SeckillConfigDO> pageResult = seckillConfigService.getSeckillConfigPage(pageVO);
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java
  View file @f28b960
... ... @@ -35,7 +35,7 @@ public class AppBargainActivityController {
35 35 activity1.setId(1L);
36 36 activity1.setName("618 大砍价");
37 37 activity1.setSpuId(2048L);
38   - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  38 + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
39 39 activity1.setMarketPrice(50);
40 40 activity1.setBargainPrice(100);
41 41 activity1.setStartTime(LocalDateTimeUtils.addTime(Duration.ofDays(-2)));
... ... @@ -47,7 +47,7 @@ public class AppBargainActivityController {
47 47 activity2.setId(2L);
48 48 activity2.setName("双十一砍价");
49 49 activity2.setSpuId(4096L);
50   - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  50 + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg");
51 51 activity2.setMarketPrice(100);
52 52 activity2.setBargainPrice(200);
53 53 activity2.setStartTime(LocalDateTimeUtils.addTime(Duration.ofDays(-2)));
... ... @@ -69,7 +69,7 @@ public class AppBargainActivityController {
69 69 activity1.setId(1L);
70 70 activity1.setName("618 大砍价");
71 71 activity1.setSpuId(2048L);
72   - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  72 + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
73 73 activity1.setMarketPrice(50);
74 74 activity1.setBargainPrice(100);
75 75 activityList.add(activity1);
... ... @@ -78,7 +78,7 @@ public class AppBargainActivityController {
78 78 activity2.setId(2L);
79 79 activity2.setName("双十一砍价");
80 80 activity2.setSpuId(4096L);
81   - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  81 + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg");
82 82 activity2.setMarketPrice(100);
83 83 activity2.setBargainPrice(200);
84 84 activityList.add(activity2);
... ... @@ -94,7 +94,7 @@ public class AppBargainActivityController {
94 94 activity.setId(2L);
95 95 activity.setName("618 大砍价");
96 96 activity.setSpuId(2048L);
97   - activity.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  97 + activity.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
98 98 activity.setMarketPrice(50);
99 99 activity.setBargainPrice(100);
100 100 activity.setStock(10);
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java
  View file @f28b960
... ... @@ -81,7 +81,7 @@ public class AppBargainRecordController {
81 81 record1.setPrice(200);
82 82 record1.setPayPrice(180);
83 83 record1.setStatus(1);
84   - record1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  84 + record1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
85 85 record1.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2)));
86 86 page.getList().add(record1);
87 87  
... ... @@ -96,7 +96,7 @@ public class AppBargainRecordController {
96 96 record2.setPrice(200);
97 97 record2.setPayPrice(280);
98 98 record2.setStatus(2);
99   - record2.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  99 + record2.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
100 100 record2.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2)));
101 101 page.getList().add(record2);
102 102  
... ... @@ -111,7 +111,7 @@ public class AppBargainRecordController {
111 111 record3.setPrice(200);
112 112 record3.setPayPrice(380);
113 113 record3.setStatus(2);
114   - record3.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  114 + record3.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
115 115 record3.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2)));
116 116 record3.setOrderId(100L);
117 117 page.getList().add(record3);
... ... @@ -127,7 +127,7 @@ public class AppBargainRecordController {
127 127 record4.setPrice(200);
128 128 record4.setPayPrice(380);
129 129 record4.setStatus(3);
130   - record4.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  130 + record4.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
131 131 record4.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2)));
132 132 record4.setOrderId(100L);
133 133 page.getList().add(record4);
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
  View file @f28b960
... ... @@ -38,7 +38,7 @@ public class AppCombinationActivityController {
38 38 activity1.setName("618 大拼团");
39 39 activity1.setUserSize(3);
40 40 activity1.setSpuId(2048L);
41   - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  41 + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
42 42 activity1.setMarketPrice(50);
43 43 activity1.setCombinationPrice(100);
44 44 activityList.add(activity1);
... ... @@ -48,7 +48,7 @@ public class AppCombinationActivityController {
48 48 activity2.setName("双十一拼团");
49 49 activity2.setUserSize(5);
50 50 activity2.setSpuId(4096L);
51   - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  51 + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg");
52 52 activity2.setMarketPrice(100);
53 53 activity2.setCombinationPrice(200);
54 54 activityList.add(activity2);
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
  View file @f28b960
... ... @@ -41,7 +41,7 @@ public class AppCombinationRecordController {
41 41 summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/ouwtwJycbic2JrCoZjETict0klxd1uRuicRneKk00ewMcCClxVcVHQT91Sh9MJGtwibf1fOicD1WpwSP4icJM6eQq1AA/132");
42 42 summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/RpUrhwens58qc99OcGs993xL4M5QPOe05ekqF9Eia440kRicAlicicIdQWicHBmy2bzLgHzHguWEzHHxnIgeictL7bLA/132");
43 43 summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/S4tfqmxc8GZGsKc1K4mnhpvtG16gtMrLnTQfDibhr7jJich9LRI5RQKZDoqEjZM3azMib5nic7F4ZXKMEgYyLO08KA/132");
44   - summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  44 + summary.getAvatars().add("https://static.iocoder.cn/mall/132.jpeg");
45 45 return success(summary);
46 46 }
47 47  
... ... @@ -61,7 +61,7 @@ public class AppCombinationRecordController {
61 61 record.setExpireTime(new Date());
62 62 record.setUserSize(10);
63 63 record.setUserCount(i);
64   - record.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  64 + record.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
65 65 record.setActivityId(1L);
66 66 record.setSpuName("活动：" + i);
67 67 list.add(record);
... ... @@ -84,7 +84,7 @@ public class AppCombinationRecordController {
84 84 headRecord.setUserCount(3);
85 85 headRecord.setStatus(1);
86 86 headRecord.setActivityId(10L);
87   - headRecord.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  87 + headRecord.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
88 88 headRecord.setCombinationPrice(100);
89 89 detail.setHeadRecord(headRecord);
90 90 // 团员
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
  View file @f28b960
... ... @@ -39,7 +39,7 @@ public class AppSeckillActivityController {
39 39 activity1.setId(1L);
40 40 activity1.setName("618 大秒杀");
41 41 activity1.setSpuId(2048L);
42   - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  42 + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
43 43 activity1.setMarketPrice(50);
44 44 activity1.setSeckillPrice(100);
45 45 activityList.add(activity1);
... ... @@ -48,7 +48,7 @@ public class AppSeckillActivityController {
48 48 activity2.setId(2L);
49 49 activity2.setName("双十一大秒杀");
50 50 activity2.setSpuId(4096L);
51   - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  51 + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg");
52 52 activity2.setMarketPrice(100);
53 53 activity2.setSeckillPrice(200);
54 54 activityList.add(activity2);
... ... @@ -65,7 +65,7 @@ public class AppSeckillActivityController {
65 65 activity1.setId(1L);
66 66 activity1.setName("618 大秒杀");
67 67 activity1.setSpuId(2048L);
68   - activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  68 + activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
69 69 activity1.setMarketPrice(50);
70 70 activity1.setSeckillPrice(100);
71 71 activity1.setUnitName("个");
... ... @@ -77,7 +77,7 @@ public class AppSeckillActivityController {
77 77 activity2.setId(2L);
78 78 activity2.setName("双十一大秒杀");
79 79 activity2.setSpuId(4096L);
80   - activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  80 + activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg");
81 81 activity2.setMarketPrice(100);
82 82 activity2.setSeckillPrice(200);
83 83 activity2.setUnitName("套");
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
  View file @f28b960
... ... @@ -25,8 +25,8 @@ public class AppSeckillConfigController {
25 25 public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
26 26 return success(Arrays.asList(
27 27 new AppSeckillConfigRespVO().setId(1L).setStartTime("00:00").setEndTime("09:59")
28   - .setSliderPicUrls(Arrays.asList("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg",
29   - "https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132")),
  28 + .setSliderPicUrls(Arrays.asList("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg",
  29 + "https://static.iocoder.cn/mall/132.jpeg")),
30 30 new AppSeckillConfigRespVO().setId(2L).setStartTime("10:00").setEndTime("12:59"),
31 31 new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("22:59"),
32 32 new AppSeckillConfigRespVO().setId(2L).setStartTime("23:00").setEndTime("23:59")
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java
  View file @f28b960
... ... @@ -16,7 +16,7 @@ public interface SeckillConfigMapper extends BaseMapperX&lt;SeckillConfigDO&gt; {
16 16 return selectPage(reqVO, new LambdaQueryWrapperX<SeckillConfigDO>()
17 17 .likeIfPresent(SeckillConfigDO::getName, reqVO.getName())
18 18 .eqIfPresent(SeckillConfigDO::getStatus, reqVO.getStatus())
19   - .orderByDesc(SeckillConfigDO::getId));
  19 + .orderByAsc(SeckillConfigDO::getStartTime));
20 20 }
21 21  
22 22 default List<SeckillConfigDO> selectListByStatus(Integer status) {
... ...