BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 6573849f56663bad92e23626e84ed8147c9b6d3f

Authored by YunaiV
1 parent 60b24e36

mall + promotion：mock 拼团列表

Inline Side-by-side
Showing 4 changed files with 22 additions and 27 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
  View file @6573849
... ... @@ -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("商品图片地址");
  41 + activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/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("商品图片地址");
  51 + activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
52 52 activity2.setMarketPrice(100);
53 53 activity2.setCombinationPrice(200);
54 54 activityList.add(activity2);
... ...
yudao-module-mall/yudao-module-trade-biz/pom.xml
  View file @6573849
... ... @@ -61,6 +61,7 @@
61 61 <dependency>
62 62 <groupId>cn.iocoder.boot</groupId>
63 63 <artifactId>yudao-spring-boot-starter-biz-trade</artifactId>
  64 + <version>${revision}</version>
64 65 </dependency>
65 66  
66 67 <!-- Web 相关 -->
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
  View file @6573849
... ... @@ -5,7 +5,7 @@ import cn.hutool.core.util.RandomUtil;
5 5 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
6 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 7 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
8   -import cn.iocoder.yudao.framework.trade.core.dto.TradeAfterSaleLogDTO;
  8 +import cn.iocoder.yudao.framework.trade.core.dto.TradeAfterSaleLogCreateReqDTO;
9 9 import cn.iocoder.yudao.framework.trade.core.service.AfterSaleLogService;
10 10 import cn.iocoder.yudao.module.pay.api.refund.PayRefundApi;
11 11 import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
... ... @@ -388,7 +388,7 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService, AfterSa
388 388 @Deprecated
389 389 private void createAfterSaleLog(Long userId, Integer userType, TradeAfterSaleDO afterSale,
390 390 Integer beforeStatus, Integer afterStatus) {
391   - TradeAfterSaleLogDTO logDTO = new TradeAfterSaleLogDTO()
  391 + TradeAfterSaleLogCreateReqDTO logDTO = new TradeAfterSaleLogCreateReqDTO()
392 392 .setUserId(userId)
393 393 .setUserType(userType)
394 394 .setAfterSaleId(afterSale.getId())
... ... @@ -406,7 +406,7 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService, AfterSa
406 406 */
407 407 @Override
408 408 @Async
409   - public void insert(TradeAfterSaleLogDTO logDTO) {
  409 + public void insert(TradeAfterSaleLogCreateReqDTO logDTO) {
410 410 try {
411 411 TradeAfterSaleLogDO afterSaleLog = new TradeAfterSaleLogDO()
412 412 .setUserId(logDTO.getUserId())
... ...
yudao-server/pom.xml
  View file @6573849
... ... @@ -54,11 +54,11 @@
54 54 <!-- <version>${revision}</version>-->
55 55 <!-- </dependency>-->
56 56 <!-- 支付服务 -->
57   -<!-- <dependency>-->
58   -<!-- <groupId>cn.iocoder.boot</groupId>-->
59   -<!-- <artifactId>yudao-module-pay-biz</artifactId>-->
60   -<!-- <version>${revision}</version>-->
61   -<!-- </dependency>-->
  57 + <dependency>
  58 + <groupId>cn.iocoder.boot</groupId>
  59 + <artifactId>yudao-module-pay-biz</artifactId>
  60 + <version>${revision}</version>
  61 + </dependency>
62 62  
63 63 <!-- 微信公众号模块。默认注释，保证编译速度 -->
64 64 <!-- <dependency>-->
... ... @@ -68,25 +68,19 @@
68 68 <!-- </dependency>-->
69 69  
70 70 <!-- 商城相关模块。默认注释，保证编译速度 -->
71   -<!-- <dependency>-->
72   -<!-- <groupId>cn.iocoder.boot</groupId>-->
73   -<!-- <artifactId>yudao-module-promotion-biz</artifactId>-->
74   -<!-- <version>${revision}</version>-->
75   -<!-- </dependency>-->
76   -<!-- <dependency>-->
77   -<!-- <groupId>cn.iocoder.boot</groupId>-->
78   -<!-- <artifactId>yudao-module-product-biz</artifactId>-->
79   -<!-- <version>${revision}</version>-->
80   -<!-- </dependency>-->
81   -<!-- <dependency>-->
82   -<!-- <groupId>cn.iocoder.boot</groupId>-->
83   -<!-- <artifactId>yudao-module-trade-biz</artifactId>-->
84   -<!-- <version>${revision}</version>-->
85   -<!-- </dependency>-->
86   -
87 71 <dependency>
88 72 <groupId>cn.iocoder.boot</groupId>
89   - <artifactId>yudao-module-point-biz</artifactId>
  73 + <artifactId>yudao-module-promotion-biz</artifactId>
  74 + <version>${revision}</version>
  75 + </dependency>
  76 + <dependency>
  77 + <groupId>cn.iocoder.boot</groupId>
  78 + <artifactId>yudao-module-product-biz</artifactId>
  79 + <version>${revision}</version>
  80 + </dependency>
  81 + <dependency>
  82 + <groupId>cn.iocoder.boot</groupId>
  83 + <artifactId>yudao-module-trade-biz</artifactId>
90 84 <version>${revision}</version>
91 85 </dependency>
92 86  
... ...