BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 0dcab0363d8ae3e6b68940a9e7896a957ec308ce

Authored by zhijiantianya@gmail.com
2 parents ba271da4 3c6c8aab

Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue… 

…-pro into feature/mall_product
Inline Side-by-side
Showing 58 changed files with 484 additions and 457 deletions
sql/mysql/member.sql deleted
View file @ba271da
1   -ALTER TABLE member_user ADD COLUMN register_terminal tinyint NULL COMMENT '注册终端' AFTER register_ip;
2 0 \ No newline at end of file
sql/mysql/pay_wallet.sql
  View file @0dcab03
... ... @@ -126,7 +126,7 @@ CREATE TABLE `pay_wallet_recharge` (
126 126 PRIMARY KEY (`id`) USING BTREE
127 127 ) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '会员钱包充值' ROW_FORMAT = Dynamic;
128 128  
129   --- 钱包充值套餐菜单脚本
  129 +-- 钱包充值套餐,钱包余额菜单脚本
130 130  
131 131 INSERT INTO system_menu(
132 132 name, permission, type, sort, parent_id,
... ... @@ -136,13 +136,14 @@ VALUES (
136 136 '钱包管理', '', 1, 5, 1117,
137 137 'wallet', 'ep:caret-right', '', 0, ''
138 138 );
139   -SELECT @parentId := LAST_INSERT_ID();
  139 +SELECT @parentId1 := LAST_INSERT_ID();
  140 +
140 141 INSERT INTO system_menu(
141 142 name, permission, type, sort, parent_id,
142 143 path, icon, component, status, component_name
143 144 )
144 145 VALUES (
145   - '充值套餐', '', 2, 2, @parentId,
  146 + '充值套餐', '', 2, 2, @parentId1,
146 147 'wallet-recharge-package', 'fa:leaf', 'pay/wallet/rechargePackage/index', 0, 'WalletRechargePackage'
147 148 );
148 149 SELECT @parentId := LAST_INSERT_ID();
... ... @@ -180,3 +181,25 @@ VALUES (
180 181 '钱包充值套餐删除', 'pay:wallet-recharge-package:delete', 3, 4, @parentId,
181 182 '', '', '', 0
182 183 );
  184 +
  185 +INSERT INTO system_menu(
  186 + name, permission, type, sort, parent_id,
  187 + path, icon, component, status, component_name
  188 +)
  189 +VALUES (
  190 + '钱包余额', '', 2, 1, @parentId1,
  191 + 'wallet-balance', 'fa:leaf', 'pay/wallet/balance/index', 0, 'WalletBalance'
  192 + );
  193 +
  194 +SELECT @parentId := LAST_INSERT_ID();
  195 +
  196 +-- 按钮 SQL
  197 +INSERT INTO system_menu(
  198 + name, permission, type, sort, parent_id,
  199 + path, icon, component, status
  200 +)
  201 +VALUES (
  202 + '钱包余额查询', 'pay:wallet:query', 3, 1, @parentId,
  203 + '', '', '', 0
  204 + );
  205 +
... ...
sql/mysql/statistics.sql deleted
View file @ba271da
1   --- 交易统计表
2   -CREATE TABLE trade_statistics
3   -(
4   - id bigint AUTO_INCREMENT COMMENT '编号，主键自增'
5   - PRIMARY KEY,
6   - time datetime NOT NULL COMMENT '统计日期',
7   - order_create_count int DEFAULT 0 NOT NULL COMMENT '创建订单数',
8   - order_pay_count int DEFAULT 0 NOT NULL COMMENT '支付订单商品数',
9   - order_pay_price int DEFAULT 0 NOT NULL COMMENT '总支付金额，单位：分',
10   - order_wallet_pay_price int DEFAULT 0 NOT NULL COMMENT '总支付金额（余额），单位：分',
11   - after_sale_count int DEFAULT 0 NOT NULL COMMENT '退款订单数',
12   - after_sale_refund_price int DEFAULT 0 NOT NULL COMMENT '总退款金额，单位：分',
13   - brokerage_settlement_price int DEFAULT 0 NOT NULL COMMENT '佣金金额（已结算），单位：分',
14   - recharge_pay_count int DEFAULT 0 NOT NULL COMMENT '充值订单数',
15   - recharge_pay_price int DEFAULT 0 NOT NULL COMMENT '充值金额，单位：分',
16   - recharge_refund_count int DEFAULT 0 NOT NULL COMMENT '充值退款订单数',
17   - recharge_refund_price int DEFAULT 0 NOT NULL COMMENT '充值退款金额，单位：分',
18   - creator varchar(64) DEFAULT '' NULL COMMENT '创建者',
19   - create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间',
20   - updater varchar(64) DEFAULT '' NULL COMMENT '更新者',
21   - update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
22   - deleted bit DEFAULT b'0' NOT NULL COMMENT '是否删除',
23   - tenant_id bigint DEFAULT 0 NOT NULL COMMENT '租户编号'
24   -)
25   - COMMENT '交易统计表';
26   -
27   -CREATE INDEX trade_statistics_time_index
28   - ON trade_statistics (time);
29   -
30   --- 菜单
31   -INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component, component_name)
32   -VALUES ('统计管理', '', 1, 4, 0, '/statistics', 'ep:data-line', '', '');
33   -SELECT @parentId := LAST_INSERT_ID();
34   --- 交易统计
35   -INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component, component_name)
36   -VALUES ('交易统计', '', 2, 1, @parentId, 'trade', 'fa-solid:credit-card', 'statistics/trade/index', 'TradeStatistics');
37   -SELECT @parentId := LAST_INSERT_ID();
38   -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
39   -VALUES ('交易统计查询', 'statistics:trade:query', 3, 1, @parentId, '', '', '', 0);
40   -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
41   -VALUES ('交易统计导出', 'statistics:trade:export', 3, 2, @parentId, '', '', '', 0);
42   --- 会员统计
43   -INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component, component_name)
44   -VALUES ('会员统计', '', 2, 2, @parentId, 'member', 'ep:avatar', 'statistics/member/index', 'MemberStatistics');
45   -SELECT @parentId := LAST_INSERT_ID();
46   -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
47   -VALUES ('会员统计查询', 'statistics:member:query', 3, 1, @parentId, '', '', '', 0);
48   -
49   -
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.framework.common.util.servlet;
2 2  
3   -import cn.hutool.core.convert.Convert;
4 3 import cn.hutool.core.io.IoUtil;
5 4 import cn.hutool.core.util.StrUtil;
6 5 import cn.hutool.extra.servlet.ServletUtil;
... ... @@ -89,18 +88,6 @@ public class ServletUtils {
89 88 return ServletUtil.getClientIP(request);
90 89 }
91 90  
92   - public static Integer getTerminal() {
93   - return getHeaderInt("terminal");
94   - }
95   -
96   - public static String getHeader(String header) {
97   - return getHeader(getRequest(), header);
98   - }
99   -
100   - public static Integer getHeaderInt(String header) {
101   - return Convert.toInt(getHeader(header));
102   - }
103   -
104 91 public static boolean isJsonRequest(ServletRequest request) {
105 92 return StrUtil.startWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE);
106 93 }
... ... @@ -121,11 +108,4 @@ public class ServletUtils {
121 108 return ServletUtil.getParamMap(request);
122 109 }
123 110  
124   - public static String getHeader(HttpServletRequest request, String header) {
125   - if (request == null) {
126   - return null;
127   - }
128   - return request.getHeader(header);
129   - }
130   -
131 111 }
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
  View file @0dcab03
... ... @@ -111,9 +111,10 @@ public interface ErrorCodeConstants {
111 111 ErrorCode BARGAIN_HELP_CREATE_FAIL_HELP_EXISTS = new ErrorCode(1_013_014_004, "助力失败，您已经助力过了");
112 112  
113 113 // ========== 文章分类 1-013-015-000 ==========
114   - ErrorCode ARTICLE_CATEGORY_NOT_EXISTS = new ErrorCode(1_013_015_000, "分类不存在");
  114 + ErrorCode ARTICLE_CATEGORY_NOT_EXISTS = new ErrorCode(1_013_015_000, "文章分类不存在");
  115 + ErrorCode ARTICLE_CATEGORY_DELETE_FAIL_HAVE_ARTICLES = new ErrorCode(1_013_015_001, "文章分类删除失败，存在关联文章");
115 116  
116 117 // ========== 文章管理 1-013-016-000 ==========
117   - ErrorCode ARTICLE_NOT_EXISTS = new ErrorCode(1_013_016_000, "文章管理不存在");
  118 + ErrorCode ARTICLE_NOT_EXISTS = new ErrorCode(1_013_016_000, "文章不存在");
118 119  
119 120 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleCategoryController.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.promotion.controller.app.article;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 5 import cn.iocoder.yudao.module.promotion.controller.app.article.vo.category.AppArticleCategoryRespVO;
  6 +import cn.iocoder.yudao.module.promotion.convert.article.ArticleCategoryConvert;
  7 +import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleCategoryDO;
  8 +import cn.iocoder.yudao.module.promotion.service.article.ArticleCategoryService;
5 9 import io.swagger.v3.oas.annotations.Operation;
6 10 import io.swagger.v3.oas.annotations.tags.Tag;
7 11 import org.springframework.validation.annotation.Validated;
8 12 import org.springframework.web.bind.annotation.RequestMapping;
9 13 import org.springframework.web.bind.annotation.RestController;
10 14  
11   -import java.util.ArrayList;
  15 +import javax.annotation.Resource;
12 16 import java.util.List;
13   -import java.util.Random;
14 17  
15 18 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
16 19  
... ... @@ -20,20 +23,16 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
20 23 @Validated
21 24 public class AppArticleCategoryController {
22 25  
  26 + @Resource
  27 + private ArticleCategoryService articleCategoryService;
  28 +
23 29 @RequestMapping("/list")
24 30 @Operation(summary = "获得文章分类列表")
25   - // TODO @芋艿：swagger 注解
26 31 public CommonResult<List<AppArticleCategoryRespVO>> getArticleCategoryList() {
27   - List<AppArticleCategoryRespVO> appArticleRespVOList = new ArrayList<>();
28   - Random random = new Random();
29   - for (int i = 0; i < 10; i++) {
30   - AppArticleCategoryRespVO appArticleRespVO = new AppArticleCategoryRespVO();
31   - appArticleRespVO.setId((long) (i + 1));
32   - appArticleRespVO.setName("分类 - " + i);
33   - appArticleRespVO.setPicUrl("https://www.iocoder.cn/" + (i + 1) + ".png");
34   - appArticleRespVOList.add(appArticleRespVO);
35   - }
36   - return success(appArticleRespVOList);
  32 + List<ArticleCategoryDO> categoryList = articleCategoryService.getArticleCategoryListByStatus(
  33 + CommonStatusEnum.ENABLE.getStatus());
  34 + // TODO @puhui999：排序下
  35 + return success(ArticleCategoryConvert.INSTANCE.convertList04(categoryList));
37 36 }
38 37  
39 38 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
  View file @0dcab03
... ... @@ -4,16 +4,19 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.module.promotion.controller.app.article.vo.article.AppArticlePageReqVO;
6 6 import cn.iocoder.yudao.module.promotion.controller.app.article.vo.article.AppArticleRespVO;
  7 +import cn.iocoder.yudao.module.promotion.convert.article.ArticleConvert;
  8 +import cn.iocoder.yudao.module.promotion.service.article.ArticleService;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.Parameter;
  11 +import io.swagger.v3.oas.annotations.Parameters;
7 12 import io.swagger.v3.oas.annotations.tags.Tag;
8 13 import org.springframework.validation.annotation.Validated;
9 14 import org.springframework.web.bind.annotation.RequestMapping;
10 15 import org.springframework.web.bind.annotation.RequestParam;
11 16 import org.springframework.web.bind.annotation.RestController;
12 17  
13   -import java.time.LocalDateTime;
14   -import java.util.ArrayList;
  18 +import javax.annotation.Resource;
15 19 import java.util.List;
16   -import java.util.Random;
17 20  
18 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
19 22  
... ... @@ -23,68 +26,34 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
23 26 @Validated
24 27 public class AppArticleController {
25 28  
  29 + @Resource
  30 + private ArticleService articleService;
  31 +
26 32 @RequestMapping("/list")
27   - // TODO @芋艿：swagger 注解
28   - public CommonResult<List<AppArticleRespVO>> getArticleList(@RequestParam(value = "recommendHot", required = false) Boolean recommendHot,
29   - @RequestParam(value = "recommendBanner", required = false) Boolean recommendBanner) {
30   - List<AppArticleRespVO> appArticleRespVOList = new ArrayList<>();
31   - Random random = new Random();
32   - for (int i = 0; i < 10; i++) {
33   - AppArticleRespVO appArticleRespVO = new AppArticleRespVO();
34   - appArticleRespVO.setId((long) (i + 1));
35   - appArticleRespVO.setTitle("芋道源码 - " + i + "模块");
36   - appArticleRespVO.setAuthor("芋道源码");
37   - appArticleRespVO.setCategoryId((long) random.nextInt(10000));
38   - appArticleRespVO.setPicUrl("https://www.iocoder.cn/" + (i + 1) + ".png");
39   - appArticleRespVO.setIntroduction("我是简介");
40   - appArticleRespVO.setDescription("我是详细");
41   - appArticleRespVO.setCreateTime(LocalDateTime.now());
42   - appArticleRespVO.setBrowseCount(random.nextInt(10000));
43   - appArticleRespVO.setSpuId((long) random.nextInt(10000));
44   - appArticleRespVOList.add(appArticleRespVO);
45   - }
46   - return success(appArticleRespVOList);
  33 + @Operation(summary = "获得文章详情列表")
  34 + @Parameters({
  35 + @Parameter(name = "recommendHot", description = "是否热门", example = "false"), // 场景一：查看指定的文章
  36 + @Parameter(name = "recommendBanner", description = "是否轮播图", example = "false") // 场景二：查看指定的文章
  37 + })
  38 + public CommonResult<List<AppArticleRespVO>> getArticleList(
  39 + @RequestParam(value = "recommendHot", required = false) Boolean recommendHot,
  40 + @RequestParam(value = "recommendBanner", required = false) Boolean recommendBanner) {
  41 + return success(ArticleConvert.INSTANCE.convertList03(
  42 + articleService.getArticleCategoryListByRecommend(recommendHot, recommendBanner)));
47 43 }
48 44  
49 45 @RequestMapping("/page")
50   - // TODO @芋艿：swagger 注解
  46 + @Operation(summary = "获得文章详情分页")
51 47 public CommonResult<PageResult<AppArticleRespVO>> getArticlePage(AppArticlePageReqVO pageReqVO) {
52   - List<AppArticleRespVO> appArticleRespVOList = new ArrayList<>();
53   - Random random = new Random();
54   - for (int i = 0; i < 10; i++) {
55   - AppArticleRespVO appArticleRespVO = new AppArticleRespVO();
56   - appArticleRespVO.setId((long) (i + 1));
57   - appArticleRespVO.setTitle("芋道源码 - " + i + "模块");
58   - appArticleRespVO.setAuthor("芋道源码");
59   - appArticleRespVO.setCategoryId((long) random.nextInt(10000));
60   - appArticleRespVO.setPicUrl("https://www.iocoder.cn/" + (i + 1) + ".png");
61   - appArticleRespVO.setIntroduction("我是简介");
62   - appArticleRespVO.setDescription("我是详细");
63   - appArticleRespVO.setCreateTime(LocalDateTime.now());
64   - appArticleRespVO.setBrowseCount(random.nextInt(10000));
65   - appArticleRespVO.setSpuId((long) random.nextInt(10000));
66   - appArticleRespVOList.add(appArticleRespVO);
67   - }
68   - return success(new PageResult<>(appArticleRespVOList, 10L));
  48 + return success(ArticleConvert.INSTANCE.convertPage02(articleService.getArticlePage(pageReqVO)));
69 49 }
70 50  
71 51 @RequestMapping("/get")
72   - // TODO @芋艿：swagger 注解
  52 + @Operation(summary = "获得文章详情")
  53 + @Parameter(name = "id", description = "文章编号", example = "1024")
73 54 public CommonResult<AppArticleRespVO> getArticlePage(@RequestParam("id") Long id) {
74   - Random random = new Random();
75   - AppArticleRespVO appArticleRespVO = new AppArticleRespVO();
76   - appArticleRespVO.setId((long) (1));
77   - appArticleRespVO.setTitle("芋道源码 - " + 0 + "模块");
78   - appArticleRespVO.setAuthor("芋道源码");
79   - appArticleRespVO.setCategoryId((long) random.nextInt(10000));
80   - appArticleRespVO.setPicUrl("https://www.iocoder.cn/" + (0 + 1) + ".png");
81   - appArticleRespVO.setIntroduction("我是简介");
82   - appArticleRespVO.setDescription("我是详细");
83   - appArticleRespVO.setCreateTime(LocalDateTime.now());
84   - appArticleRespVO.setBrowseCount(random.nextInt(10000));
85   - appArticleRespVO.setSpuId((long) random.nextInt(10000));
86   - appArticleRespVO.setSpuId(633L);
87   - return success(appArticleRespVO);
  55 + return success(ArticleConvert.INSTANCE.convert01(articleService.getArticle(id)));
88 56 }
89 57  
  58 + // TODO @puhui999：增加浏览量，实现一个接口；先简单做，用户规模不大，只 +1 即可；ps：uniapp 那边也要接下噢
90 59 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/vo/article/AppArticleRespVO.java
  View file @0dcab03
... ... @@ -39,11 +39,4 @@ public class AppArticleRespVO {
39 39 @Schema(description = "关联的商品 SPU 编号", example = "1024")
40 40 private Long spuId;
41 41  
42   -// TODO 芋艿：下面 2 个字段，后端要存储，前端不用返回；
43   -// @Schema(description = "是否热卖推荐", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
44   -// private Boolean recommendHot;
45   -//
46   -// @Schema(description = "是否 Banner 推荐", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
47   -// private Boolean recommendBanner;
48   -
49 42 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/vo/category/AppArticleCategoryRespVO.java
  View file @0dcab03
... ... @@ -16,11 +16,4 @@ public class AppArticleCategoryRespVO {
16 16 @Schema(description = "分类图标", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
17 17 private String picUrl;
18 18  
19   - // TODO 芋艿：下面 2 个字段，后端要存储，前端不用返回；
20   -// @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
21   -// private Integer status;
22   -//
23   -// @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
24   -// private Integer sort;
25   -
26 19 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleCategoryConvert.java
  View file @0dcab03
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.promotion.convert.article;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.category.*;
  5 +import cn.iocoder.yudao.module.promotion.controller.app.article.vo.category.AppArticleCategoryRespVO;
5 6 import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleCategoryDO;
6 7 import org.mapstruct.Mapper;
7 8 import org.mapstruct.factory.Mappers;
... ... @@ -30,4 +31,6 @@ public interface ArticleCategoryConvert {
30 31  
31 32 List<ArticleCategorySimpleRespVO> convertList03(List<ArticleCategoryDO> list);
32 33  
  34 + List<AppArticleCategoryRespVO> convertList04(List<ArticleCategoryDO> categoryList);
  35 +
33 36 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
  View file @0dcab03
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleCreateReqVO;
5 5 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleRespVO;
6 6 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleUpdateReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.app.article.vo.article.AppArticleRespVO;
7 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleDO;
8 9 import org.mapstruct.Mapper;
9 10 import org.mapstruct.factory.Mappers;
... ... @@ -30,4 +31,10 @@ public interface ArticleConvert {
30 31  
31 32 PageResult<ArticleRespVO> convertPage(PageResult<ArticleDO> page);
32 33  
  34 + AppArticleRespVO convert01(ArticleDO article);
  35 +
  36 + PageResult<AppArticleRespVO> convertPage02(PageResult<ArticleDO> articlePage);
  37 +
  38 + List<AppArticleRespVO> convertList03(List<ArticleDO> articleCategoryListByRecommendHotAndRecommendBanner);
  39 +
33 40 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
  View file @0dcab03
... ... @@ -207,31 +207,30 @@ public interface CombinationActivityConvert {
207 207 /**
208 208 * 转换生成虚拟成团虚拟记录
209 209 *
210   - * @param virtualGroupHeadRecords 虚拟成团团长记录列表
  210 + * @param virtualGroupHeadRecord 虚拟成团团长记录
211 211 * @return 虚拟记录列表
212 212 */
213   - default List<CombinationRecordDO> convertVirtualGroupList(List<CombinationRecordDO> virtualGroupHeadRecords) {
  213 + // TODO @puhui999：1）方法名，建议改成 convertVirtualRecordList(CombinationRecordDO headRecord)；2）第 220 到 225 可以搞成 mapstruct 一个方法，默认都 copy 进去，然后 set 第 226 到 232 的字段
  214 + default List<CombinationRecordDO> convertVirtualGroupList(CombinationRecordDO virtualGroupHeadRecord) {
214 215 List<CombinationRecordDO> createRecords = new ArrayList<>();
215   - virtualGroupHeadRecords.forEach(headRecord -> {
216   - // 计算需要创建的虚拟成团记录数量
217   - int count = headRecord.getUserSize() - headRecord.getUserCount();
218   - for (int i = 0; i < count; i++) {
219   - // 基础信息和团长保持一致
220   - CombinationRecordDO newRecord = new CombinationRecordDO().setActivityId(headRecord.getActivityId())
221   - .setCombinationPrice(headRecord.getCombinationPrice()).setSpuId(headRecord.getSpuId()).setSpuName(headRecord.getSpuName())
222   - .setPicUrl(headRecord.getPicUrl()).setSkuId(headRecord.getSkuId()).setHeadId(headRecord.getId())
223   - .setStatus(headRecord.getStatus()) // 状态保持和创建时一致，创建完成后会接着处理
224   - .setVirtualGroup(headRecord.getVirtualGroup()).setExpireTime(headRecord.getExpireTime())
225   - .setStartTime(headRecord.getStartTime()).setUserSize(headRecord.getUserSize()).setUserCount(headRecord.getUserCount());
226   - // 虚拟信息
227   - newRecord.setCount(0);
228   - newRecord.setUserId(0L);
229   - newRecord.setNickname("");
230   - newRecord.setAvatar("");
231   - newRecord.setOrderId(0L);
232   - createRecords.add(newRecord);
233   - }
234   - });
  216 + // 计算需要创建的虚拟成团记录数量
  217 + int count = virtualGroupHeadRecord.getUserSize() - virtualGroupHeadRecord.getUserCount();
  218 + for (int i = 0; i < count; i++) {
  219 + // 基础信息和团长保持一致
  220 + CombinationRecordDO newRecord = new CombinationRecordDO().setActivityId(virtualGroupHeadRecord.getActivityId())
  221 + .setCombinationPrice(virtualGroupHeadRecord.getCombinationPrice()).setSpuId(virtualGroupHeadRecord.getSpuId()).setSpuName(virtualGroupHeadRecord.getSpuName())
  222 + .setPicUrl(virtualGroupHeadRecord.getPicUrl()).setSkuId(virtualGroupHeadRecord.getSkuId()).setHeadId(virtualGroupHeadRecord.getId())
  223 + .setStatus(virtualGroupHeadRecord.getStatus()) // 状态保持和创建时一致，创建完成后会接着处理
  224 + .setVirtualGroup(virtualGroupHeadRecord.getVirtualGroup()).setExpireTime(virtualGroupHeadRecord.getExpireTime())
  225 + .setStartTime(virtualGroupHeadRecord.getStartTime()).setUserSize(virtualGroupHeadRecord.getUserSize()).setUserCount(virtualGroupHeadRecord.getUserCount());
  226 + // 虚拟信息
  227 + newRecord.setCount(0);
  228 + newRecord.setUserId(0L);
  229 + newRecord.setNickname("");
  230 + newRecord.setAvatar("");
  231 + newRecord.setOrderId(0L);
  232 + createRecords.add(newRecord);
  233 + }
235 234 return createRecords;
236 235 }
237 236  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
  View file @0dcab03
... ... @@ -4,9 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 6 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticlePageReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.app.article.vo.article.AppArticlePageReqVO;
7 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleDO;
8 9 import org.apache.ibatis.annotations.Mapper;
9 10  
  11 +import java.util.List;
  12 +
10 13 /**
11 14 * 文章管理 Mapper
12 15 *
... ... @@ -28,4 +31,16 @@ public interface ArticleMapper extends BaseMapperX&lt;ArticleDO&gt; {
28 31 .orderByDesc(ArticleDO::getId));
29 32 }
30 33  
  34 + default List<ArticleDO> selectList(Boolean recommendHot, Boolean recommendBanner) {
  35 + return selectList(new LambdaQueryWrapperX<ArticleDO>()
  36 + .eqIfPresent(ArticleDO::getRecommendHot, recommendHot)
  37 + .eqIfPresent(ArticleDO::getRecommendBanner, recommendBanner));
  38 + }
  39 +
  40 + default PageResult<ArticleDO> selectPage(AppArticlePageReqVO pageReqVO) {
  41 + return selectPage(pageReqVO, new LambdaQueryWrapperX<ArticleDO>()
  42 + .eqIfPresent(ArticleDO::getCategoryId, pageReqVO.getCategoryId()));
  43 + }
  44 +
  45 +
31 46 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java
  View file @0dcab03
... ... @@ -127,11 +127,9 @@ public interface CombinationRecordMapper extends BaseMapperX&lt;CombinationRecordDO
127 127 *
128 128 * @return 参加过拼团的用户数
129 129 */
130   - // TODO @puhui999：1）方法名，直接 selectUserCount；2）COUNT(DISTINCT(user_id)) 就可以啦，不用 group by 哈
131   - default Long selectUserDistinctCount() {
  130 + default Long selectUserCount() {
132 131 return selectCount(new QueryWrapper<CombinationRecordDO>()
133   - .select("DISTINCT (user_id)")
134   - .groupBy("user_id"));
  132 + .select("DISTINCT (user_id)"));
135 133 }
136 134  
137 135 default List<CombinationRecordDO> selectListByHeadIdAndStatusAndExpireTimeLt(Long headId, Integer status, LocalDateTime dateTime) {
... ... @@ -141,8 +139,8 @@ public interface CombinationRecordMapper extends BaseMapperX&lt;CombinationRecordDO
141 139 .lt(CombinationRecordDO::getExpireTime, dateTime));
142 140 }
143 141  
144   - default List<CombinationRecordDO> selectListByHeadIds(Collection<Long> headIds) {
145   - return selectList(new LambdaQueryWrapperX<CombinationRecordDO>().in(CombinationRecordDO::getHeadId, headIds));
  142 + default List<CombinationRecordDO> selectListByHeadId(Long headId) {
  143 + return selectList(CombinationRecordDO::getHeadId, headId);
146 144 }
147 145  
148 146 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleCategoryServiceImpl.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.promotion.service.article;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.category.ArticleCategoryCreateReqVO;
5 6 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.category.ArticleCategoryPageReqVO;
6 7 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.category.ArticleCategoryUpdateReqVO;
7 8 import cn.iocoder.yudao.module.promotion.convert.article.ArticleCategoryConvert;
8 9 import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleCategoryDO;
  10 +import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleDO;
9 11 import cn.iocoder.yudao.module.promotion.dal.mysql.article.ArticleCategoryMapper;
  12 +import org.springframework.context.annotation.Lazy;
10 13 import org.springframework.stereotype.Service;
11 14 import org.springframework.validation.annotation.Validated;
12 15  
... ... @@ -14,6 +17,7 @@ import javax.annotation.Resource;
14 17 import java.util.List;
15 18  
16 19 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  20 +import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.ARTICLE_CATEGORY_DELETE_FAIL_HAVE_ARTICLES;
17 21 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.ARTICLE_CATEGORY_NOT_EXISTS;
18 22  
19 23 /**
... ... @@ -28,6 +32,10 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService {
28 32 @Resource
29 33 private ArticleCategoryMapper articleCategoryMapper;
30 34  
  35 + @Resource
  36 + @Lazy // 延迟加载，解决循环依赖问题
  37 + private ArticleService articleService;
  38 +
31 39 @Override
32 40 public Long createArticleCategory(ArticleCategoryCreateReqVO createReqVO) {
33 41 // 插入
... ... @@ -50,7 +58,12 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService {
50 58 public void deleteArticleCategory(Long id) {
51 59 // 校验存在
52 60 validateArticleCategoryExists(id);
53   - // TODO @puhui999：需要校验下，是不是存在文章
  61 + // 校验是不是存在关联文章
  62 + // TODO @puhui999：最好获得数量哈；
  63 + List<ArticleDO> articleList = articleService.getArticleByCategoryId(id);
  64 + if (CollUtil.isNotEmpty(articleList)) {
  65 + throw exception(ARTICLE_CATEGORY_DELETE_FAIL_HAVE_ARTICLES);
  66 + }
54 67  
55 68 // 删除
56 69 articleCategoryMapper.deleteById(id);
... ... @@ -74,6 +87,7 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService {
74 87  
75 88 @Override
76 89 public List<ArticleCategoryDO> getArticleCategoryListByStatus(Integer status) {
  90 + // TODO @puhui999：selectListByStatus
77 91 return articleCategoryMapper.selectList(ArticleCategoryDO::getStatus, status);
78 92 }
79 93  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
  View file @0dcab03
... ... @@ -4,19 +4,21 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleCreateReqVO;
5 5 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticlePageReqVO;
6 6 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleUpdateReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.app.article.vo.article.AppArticlePageReqVO;
7 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleDO;
8 9  
9 10 import javax.validation.Valid;
  11 +import java.util.List;
10 12  
11 13 /**
12   - * 文章管理 Service 接口
  14 + * 文章详情 Service 接口
13 15 *
14 16 * @author HUIHUI
15 17 */
16 18 public interface ArticleService {
17 19  
18 20 /**
19   - * 创建文章管理
  21 + * 创建文章详情
20 22 *
21 23 * @param createReqVO 创建信息
22 24 * @return 编号
... ... @@ -24,33 +26,58 @@ public interface ArticleService {
24 26 Long createArticle(@Valid ArticleCreateReqVO createReqVO);
25 27  
26 28 /**
27   - * 更新文章管理
  29 + * 更新文章详情
28 30 *
29 31 * @param updateReqVO 更新信息
30 32 */
31 33 void updateArticle(@Valid ArticleUpdateReqVO updateReqVO);
32 34  
33 35 /**
34   - * 删除文章管理
  36 + * 删除文章详情
35 37 *
36 38 * @param id 编号
37 39 */
38 40 void deleteArticle(Long id);
39 41  
40 42 /**
41   - * 获得文章管理
  43 + * 获得文章详情
42 44 *
43 45 * @param id 编号
44   - * @return 文章管理
  46 + * @return 文章详情
45 47 */
46 48 ArticleDO getArticle(Long id);
47 49  
48 50 /**
49   - * 获得文章管理分页
  51 + * 获得文章详情分页
50 52 *
51 53 * @param pageReqVO 分页查询
52   - * @return 文章管理分页
  54 + * @return 文章详情分页
53 55 */
54 56 PageResult<ArticleDO> getArticlePage(ArticlePageReqVO pageReqVO);
55 57  
  58 + /**
  59 + * 获得文章详情列表
  60 + *
  61 + * @param recommendHot 是否热门
  62 + * @param recommendBanner 是否轮播图
  63 + * @return 文章详情列表
  64 + */
  65 + List<ArticleDO> getArticleCategoryListByRecommend(Boolean recommendHot, Boolean recommendBanner);
  66 +
  67 + /**
  68 + * 获得文章详情分页
  69 + *
  70 + * @param pageReqVO 分页查询
  71 + * @return 文章详情分页
  72 + */
  73 + PageResult<ArticleDO> getArticlePage(AppArticlePageReqVO pageReqVO);
  74 +
  75 + /**
  76 + * 获得指定分类的文章列表
  77 + *
  78 + * @param categoryId 文章分类编号
  79 + * @return 文章列表
  80 + */
  81 + List<ArticleDO> getArticleByCategoryId(Long categoryId);
  82 +
56 83 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
  View file @0dcab03
... ... @@ -4,15 +4,19 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleCreateReqVO;
5 5 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticlePageReqVO;
6 6 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleUpdateReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.app.article.vo.article.AppArticlePageReqVO;
7 8 import cn.iocoder.yudao.module.promotion.convert.article.ArticleConvert;
  9 +import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleCategoryDO;
8 10 import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleDO;
9 11 import cn.iocoder.yudao.module.promotion.dal.mysql.article.ArticleMapper;
10 12 import org.springframework.stereotype.Service;
11 13 import org.springframework.validation.annotation.Validated;
12 14  
13 15 import javax.annotation.Resource;
  16 +import java.util.List;
14 17  
15 18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  19 +import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.ARTICLE_CATEGORY_NOT_EXISTS;
16 20 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.ARTICLE_NOT_EXISTS;
17 21  
18 22 /**
... ... @@ -27,9 +31,14 @@ public class ArticleServiceImpl implements ArticleService {
27 31 @Resource
28 32 private ArticleMapper articleMapper;
29 33  
  34 + @Resource
  35 + private ArticleCategoryService articleCategoryService;
  36 +
30 37 @Override
31 38 public Long createArticle(ArticleCreateReqVO createReqVO) {
32   - // TODO @puhui999：需要校验分类存在
  39 + // 校验分类存在
  40 + validateArticleCategoryExists(createReqVO.getCategoryId());
  41 +
33 42 // 插入
34 43 ArticleDO article = ArticleConvert.INSTANCE.convert(createReqVO);
35 44 articleMapper.insert(article);
... ... @@ -41,7 +50,8 @@ public class ArticleServiceImpl implements ArticleService {
41 50 public void updateArticle(ArticleUpdateReqVO updateReqVO) {
42 51 // 校验存在
43 52 validateArticleExists(updateReqVO.getId());
44   - // TODO @puhui999：需要校验分类存在
  53 + // 校验分类存在
  54 + validateArticleCategoryExists(updateReqVO.getCategoryId());
45 55  
46 56 // 更新
47 57 ArticleDO updateObj = ArticleConvert.INSTANCE.convert(updateReqVO);
... ... @@ -62,6 +72,13 @@ public class ArticleServiceImpl implements ArticleService {
62 72 }
63 73 }
64 74  
  75 + private void validateArticleCategoryExists(Long categoryId) {
  76 + ArticleCategoryDO articleCategory = articleCategoryService.getArticleCategory(categoryId);
  77 + if (articleCategory == null) {
  78 + throw exception(ARTICLE_CATEGORY_NOT_EXISTS);
  79 + }
  80 + }
  81 +
65 82 @Override
66 83 public ArticleDO getArticle(Long id) {
67 84 return articleMapper.selectById(id);
... ... @@ -72,4 +89,19 @@ public class ArticleServiceImpl implements ArticleService {
72 89 return articleMapper.selectPage(pageReqVO);
73 90 }
74 91  
  92 + @Override
  93 + public List<ArticleDO> getArticleCategoryListByRecommend(Boolean recommendHot, Boolean recommendBanner) {
  94 + return articleMapper.selectList(recommendHot, recommendBanner);
  95 + }
  96 +
  97 + @Override
  98 + public PageResult<ArticleDO> getArticlePage(AppArticlePageReqVO pageReqVO) {
  99 + return articleMapper.selectPage(pageReqVO);
  100 + }
  101 +
  102 + @Override
  103 + public List<ArticleDO> getArticleByCategoryId(Long categoryId) {
  104 + return articleMapper.selectList(ArticleDO::getCategoryId, categoryId);
  105 + }
  106 +
75 107 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
  View file @0dcab03
... ... @@ -247,7 +247,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
247 247  
248 248 @Override
249 249 public Long getCombinationUserCount() {
250   - return combinationRecordMapper.selectUserDistinctCount();
  250 + return combinationRecordMapper.selectUserCount();
251 251 }
252 252  
253 253 @Override
... ... @@ -351,86 +351,87 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
351 351 convertSet(headExpireRecords, CombinationRecordDO::getActivityId));
352 352 Map<Long, CombinationActivityDO> activityMap = convertMap(activities, CombinationActivityDO::getId);
353 353  
354   - // TODO @puhui999：这里可以改成“每个团”，处理一次哈；这样 handleExpireRecord、handleVirtualGroupRecord 都改成按团处理，每个是一个小事务；
355   - // 3. 校验是否虚拟成团
356   - List<CombinationRecordDO> virtualGroupHeadRecords = new ArrayList<>(); // 虚拟成团
357   - for (Iterator<CombinationRecordDO> iterator = headExpireRecords.iterator(); iterator.hasNext(); ) {
358   - CombinationRecordDO record = iterator.next();
359   - // 3.1.不匹配，则直接跳过
360   - CombinationActivityDO activity = activityMap.get(record.getActivityId());
361   - if (activity == null || !activity.getVirtualGroup()) { // 取不到活动的或者不是虚拟拼团的
362   - continue;
  354 + // 3. 逐个处理拼团，过期 or 虚拟成团
  355 + KeyValue<Integer, Integer> keyValue = new KeyValue<>(0, 0); // 统计过期拼团和虚拟成团
  356 + for (CombinationRecordDO recordDO : headExpireRecords) {
  357 + // TODO @puhui999：recordDO 非必要的情况下，不用带 DO；直接 record;
  358 + try {
  359 + CombinationActivityDO activity = activityMap.get(recordDO.getActivityId());
  360 + if (activity == null || !activity.getVirtualGroup()) { // 取不到活动的或者不是虚拟拼团的
  361 + // 3.1. 处理过期的拼团
  362 + getSelf().handleExpireRecord(recordDO);
  363 + keyValue.setKey(keyValue.getKey() + 1);
  364 + } else {
  365 + // 3.2. 处理虚拟成团
  366 + getSelf().handleVirtualGroupRecord(recordDO);
  367 + keyValue.setValue(keyValue.getValue() + 1);
  368 + }
  369 + } catch (Exception ignored) { // 处理异常继续循环
  370 + // TODO @puhui999：需要打印异常日志
363 371 }
364   - // 3.2.匹配，则移除，添加到虚拟成团中，并结束寻找
365   - virtualGroupHeadRecords.add(record);
366   - iterator.remove();
367   - break;
368 372 }
369   -
370   - // 4.处理过期的拼团
371   - getSelf().handleExpireRecord(headExpireRecords);
372   - // 5.虚拟成团
373   - getSelf().handleVirtualGroupRecord(virtualGroupHeadRecords);
374   - return new KeyValue<>(headExpireRecords.size(), virtualGroupHeadRecords.size());
  373 + return keyValue;
375 374 }
376 375  
377 376 /**
378 377 * 处理过期拼团
379 378 *
380   - * @param headExpireRecords 过期拼团团长记录列表
  379 + * @param headExpireRecord 过期拼团团长记录列表
381 380 */
382 381 @Transactional(rollbackFor = Exception.class)
383   - public void handleExpireRecord(List<CombinationRecordDO> headExpireRecords) {
384   - if (CollUtil.isEmpty(headExpireRecords)) {
  382 + public void handleExpireRecord(CombinationRecordDO headExpireRecord) {
  383 + // TODO @puhui999：这里的 null 其实不用判断。真出现，应该要处个 npe，因为就是要错哈；
  384 + // TODO @puhui999：headExpireRecord 可以简化成 headRecord
  385 + if (headExpireRecord == null) {
385 386 return;
386 387 }
387 388  
388 389 // 1.更新拼团记录
389   - List<CombinationRecordDO> headsAndRecords = updateBatchCombinationRecords(headExpireRecords,
  390 + List<CombinationRecordDO> headsAndRecords = updateBatchCombinationRecords(headExpireRecord,
390 391 CombinationRecordStatusEnum.FAILED);
  392 + // TODO @puhui999：这里的 null 其实不用判断。真出现，应该要处个 npe，因为就是要错哈；
391 393 if (headsAndRecords == null) {
392 394 return;
393 395 }
394 396  
395   - // 2.订单取消 TODO 以现在的取消回滚逻辑好像只能循环了
396   - headsAndRecords.forEach(item -> {
397   - tradeOrderApi.cancelPaidOrder(item.getUserId(), item.getOrderId());
398   - });
  397 + // 2.订单取消
  398 + headsAndRecords.forEach(item -> tradeOrderApi.cancelPaidOrder(item.getUserId(), item.getOrderId()));
399 399 }
400 400  
401 401 /**
402 402 * 处理虚拟拼团
403 403 *
404   - * @param virtualGroupHeadRecords 虚拟成团团长记录列表
  404 + * @param virtualGroupHeadRecord 虚拟成团团长记录列表
405 405 */
406 406 @Transactional(rollbackFor = Exception.class)
407   - public void handleVirtualGroupRecord(List<CombinationRecordDO> virtualGroupHeadRecords) {
408   - if (CollUtil.isEmpty(virtualGroupHeadRecords)) {
  407 + public void handleVirtualGroupRecord(CombinationRecordDO virtualGroupHeadRecord) {
  408 + // TODO @puhui999：这里的 null 其实不用判断。真出现，应该要处个 npe，因为就是要错哈；
  409 + // TODO @puhui999：headExpireRecord 可以简化成 headRecord
  410 + if (virtualGroupHeadRecord == null) {
409 411 return;
410 412 }
411 413  
412 414 // 1. 团员补齐
413   - combinationRecordMapper.insertBatch(CombinationActivityConvert.INSTANCE.convertVirtualGroupList(virtualGroupHeadRecords));
  415 + combinationRecordMapper.insertBatch(CombinationActivityConvert.INSTANCE.convertVirtualGroupList(virtualGroupHeadRecord));
414 416 // 2. 更新拼团记录
415   - updateBatchCombinationRecords(virtualGroupHeadRecords, CombinationRecordStatusEnum.SUCCESS);
  417 + updateBatchCombinationRecords(virtualGroupHeadRecord, CombinationRecordStatusEnum.SUCCESS);
416 418 }
417 419  
418   - private List<CombinationRecordDO> updateBatchCombinationRecords(List<CombinationRecordDO> headRecords, CombinationRecordStatusEnum status) {
419   - // 1. 查询团成员
420   - List<CombinationRecordDO> records = combinationRecordMapper.selectListByHeadIds(
421   - convertSet(headRecords, CombinationRecordDO::getId));
  420 + // TODO @puhui999：写下方法注释；
  421 + private List<CombinationRecordDO> updateBatchCombinationRecords(CombinationRecordDO headRecord, CombinationRecordStatusEnum status) {
  422 + // 1. 查询团成员（包含团长）
  423 + List<CombinationRecordDO> records = combinationRecordMapper.selectListByHeadId(headRecord.getId());
  424 + // TODO @puhui999：是不是不用判断空哈；例如说，就一个团长，然后过期。
422 425 if (CollUtil.isEmpty(records)) {
423 426 return null;
424 427 }
425   - Map<Long, List<CombinationRecordDO>> recordsMap = convertMultiMap(records, CombinationRecordDO::getHeadId);
426   - headRecords.forEach(item -> {
427   - recordsMap.get(item.getId()).add(item); // 把团长加进团里
428   - });
429   - // 2.批量更新拼团记录 status 和 失败/成团时间
430   - List<CombinationRecordDO> headsAndRecords = mergeValuesFromMap(recordsMap);
431   - List<CombinationRecordDO> updateRecords = new ArrayList<>(headsAndRecords.size());
  428 + records.add(headRecord);// 把团长加进去
  429 +
  430 + // 2. 批量更新拼团记录 status 和 endTime
  431 + List<CombinationRecordDO> updateRecords = new ArrayList<>(records.size());
432 432 LocalDateTime now = LocalDateTime.now();
433   - headsAndRecords.forEach(item -> {
  433 + records.forEach(item -> {
  434 + // TODO @puhui999：record 改成 updateRecord
434 435 CombinationRecordDO record = new CombinationRecordDO().setId(item.getId())
435 436 .setStatus(status.getStatus()).setEndTime(now);
436 437 if (CombinationRecordStatusEnum.isSuccess(status.getStatus())) { // 虚拟成团完事更改状态成功后还需要把参与人数修改为成团需要人数
... ... @@ -439,7 +440,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
439 440 updateRecords.add(record);
440 441 });
441 442 combinationRecordMapper.updateBatch(updateRecords);
442   - return headsAndRecords;
  443 + return records;
443 444 }
444 445  
445 446 /**
... ...
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
  View file @0dcab03
... ... @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.promotion.service.article;
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
5 5 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleCreateReqVO;
6   -import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.ArticleExportReqVO;
7 6 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticlePageReqVO;
8 7 import cn.iocoder.yudao.module.promotion.controller.admin.article.vo.article.ArticleUpdateReqVO;
9 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.article.ArticleDO;
... ... @@ -13,7 +12,6 @@ import org.junit.jupiter.api.Test;
13 12 import org.springframework.context.annotation.Import;
14 13  
15 14 import javax.annotation.Resource;
16   -import java.util.List;
17 15  
18 16 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
19 17 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
... ... @@ -166,68 +164,4 @@ public class ArticleServiceImplTest extends BaseDbUnitTest {
166 164 assertPojoEquals(dbArticle, pageResult.getList().get(0));
167 165 }
168 166  
169   - @Test
170   - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
171   - public void testGetArticleList() {
172   - // mock 数据
173   - ArticleDO dbArticle = randomPojo(ArticleDO.class, o -> { // 等会查询到
174   - o.setCategoryId(null);
175   - o.setTitle(null);
176   - o.setAuthor(null);
177   - o.setPicUrl(null);
178   - o.setIntroduction(null);
179   - o.setBrowseCount(null);
180   - o.setSort(null);
181   - o.setStatus(null);
182   - o.setSpuId(null);
183   - o.setRecommendHot(null);
184   - o.setRecommendBanner(null);
185   - o.setContent(null);
186   - o.setCreateTime(null);
187   - });
188   - articleMapper.insert(dbArticle);
189   - // 测试 categoryId 不匹配
190   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setCategoryId(null)));
191   - // 测试 title 不匹配
192   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setTitle(null)));
193   - // 测试 author 不匹配
194   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setAuthor(null)));
195   - // 测试 picUrl 不匹配
196   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setPicUrl(null)));
197   - // 测试 introduction 不匹配
198   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setIntroduction(null)));
199   - // 测试 browseCount 不匹配
200   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setBrowseCount(null)));
201   - // 测试 sort 不匹配
202   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setSort(null)));
203   - // 测试 status 不匹配
204   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setStatus(null)));
205   - // 测试 spuId 不匹配
206   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setSpuId(null)));
207   - // 测试 recommendHot 不匹配
208   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setRecommendHot(null)));
209   - // 测试 recommendBanner 不匹配
210   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setRecommendBanner(null)));
211   - // 测试 content 不匹配
212   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setContent(null)));
213   - // 测试 createTime 不匹配
214   - articleMapper.insert(cloneIgnoreId(dbArticle, o -> o.setCreateTime(null)));
215   - // 准备参数
216   - ArticleExportReqVO reqVO = new ArticleExportReqVO();
217   - reqVO.setCategoryId(null);
218   - reqVO.setTitle(null);
219   - reqVO.setAuthor(null);
220   - reqVO.setStatus(null);
221   - reqVO.setSpuId(null);
222   - reqVO.setRecommendHot(null);
223   - reqVO.setRecommendBanner(null);
224   - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
225   -
226   - // 调用
227   - List<ArticleDO> list = articleService.getArticleList(reqVO);
228   - // 断言
229   - assertEquals(1, list.size());
230   - assertPojoEquals(dbArticle, list.get(0));
231   - }
232   -
233 167 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/MemberStatisticsController.java
  View file @0dcab03
... ... @@ -77,8 +77,7 @@ public class MemberStatisticsController {
77 77 }
78 78  
79 79 // TODO 芋艿：已经 review
80   - // TODO @疯狂：要不 get 前缀去掉，和下面的 list 接口保持一致
81   - @GetMapping("/get-area-statistics-list")
  80 + @GetMapping("/area-statistics-list")
82 81 @Operation(summary = "按照省份，获得会员统计列表")
83 82 @PreAuthorize("@ss.hasPermission('statistics:member:query')")
84 83 public CommonResult<List<MemberAreaStatisticsRespVO>> getMemberAreaStatisticsList() {
... ... @@ -86,8 +85,7 @@ public class MemberStatisticsController {
86 85 }
87 86  
88 87 // TODO 芋艿：已经 review
89   - // TODO @疯狂：要不 get 前缀去掉，和下面的 list 接口保持一致
90   - @GetMapping("/get-sex-statistics-list")
  88 + @GetMapping("/sex-statistics-list")
91 89 @Operation(summary = "按照性别，获得会员统计列表")
92 90 @PreAuthorize("@ss.hasPermission('statistics:member:query')")
93 91 public CommonResult<List<MemberSexStatisticsRespVO>> getMemberSexStatisticsList() {
... ... @@ -95,14 +93,15 @@ public class MemberStatisticsController {
95 93 }
96 94  
97 95 // TODO 芋艿：已经 review
98   - // TODO @疯狂：要不 get 前缀去掉，和下面的 list 接口保持一致
99   - @GetMapping("/get-terminal-statistics-list")
  96 + @GetMapping("/terminal-statistics-list")
100 97 @Operation(summary = "按照终端，获得会员统计列表")
101 98 @PreAuthorize("@ss.hasPermission('statistics:member:query')")
102 99 public CommonResult<List<MemberTerminalStatisticsRespVO>> getMemberTerminalStatisticsList() {
103   - return success(memberStatisticsService.getRegisterTerminalStatisticsList());
  100 + return success(memberStatisticsService.getMemberTerminalStatisticsList());
104 101 }
105 102  
  103 + // TODO 芋艿：已经 review
  104 + // TODO @疯狂：要注意 date 的排序；
106 105 @GetMapping("/user-count-comparison")
107 106 @Operation(summary = "获得用户数量对照")
108 107 @PreAuthorize("@ss.hasPermission('statistics:member:query')")
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberCountRespVO.java
  View file @0dcab03
... ... @@ -10,8 +10,7 @@ public class MemberCountRespVO {
10 10 @Schema(description = "用户访问量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
11 11 private Integer visitUserCount;
12 12  
13   - // TODO @疯狂：要不改成 registerUserCount，注册
14   - @Schema(description = "新增用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
15   - private Integer createUserCount;
  13 + @Schema(description = "注册用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  14 + private Integer registerUserCount;
16 15  
17 16 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/pay/PayStatisticsController.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.statistics.controller.admin.pay;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.module.statistics.controller.admin.pay.vo.PaySummaryRespVO;
  5 +import cn.iocoder.yudao.module.statistics.convert.pay.PayStatisticsConvert;
4 6 import cn.iocoder.yudao.module.statistics.service.pay.PayWalletStatisticsService;
5 7 import io.swagger.v3.oas.annotations.Operation;
6 8 import io.swagger.v3.oas.annotations.tags.Tag;
... ... @@ -24,11 +26,11 @@ public class PayStatisticsController {
24 26 @Resource
25 27 private PayWalletStatisticsService payWalletStatisticsService;
26 28  
27   - // TODO @疯狂：要不搞成 PaySummary？只是目前只有 rechargePrice 充值金额？
28   - @GetMapping("/wallet-recharge-price")
  29 + @GetMapping("/summary")
29 30 @Operation(summary = "获取充值金额")
30   - public CommonResult<Integer> getWalletRechargePrice() {
31   - return success(payWalletStatisticsService.getRechargePriceSummary());
  31 + public CommonResult<PaySummaryRespVO> getWalletRechargePrice() {
  32 + Integer rechargePrice = payWalletStatisticsService.getRechargePriceSummary();
  33 + return success(PayStatisticsConvert.INSTANCE.convert(rechargePrice));
32 34 }
33 35  
34 36 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/pay/vo/PaySummaryRespVO.java 0 → 100644
  View file @0dcab03
  1 +package cn.iocoder.yudao.module.statistics.controller.admin.pay.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "管理后台 - 支付统计 Response VO")
  7 +@Data
  8 +public class PaySummaryRespVO {
  9 +
  10 + @Schema(description = "充值金额，单位分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  11 + private Integer rechargePrice;
  12 +
  13 +}
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/TradeStatisticsController.java
  View file @0dcab03
... ... @@ -14,6 +14,8 @@ import cn.iocoder.yudao.module.statistics.service.trade.TradeStatisticsService;
14 14 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO;
15 15 import cn.iocoder.yudao.module.trade.enums.aftersale.AfterSaleStatusEnum;
16 16 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
  17 +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
  18 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
17 19 import io.swagger.v3.oas.annotations.Operation;
18 20 import io.swagger.v3.oas.annotations.tags.Tag;
19 21 import lombok.extern.slf4j.Slf4j;
... ... @@ -104,11 +106,15 @@ public class TradeStatisticsController {
104 106 @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
105 107 public CommonResult<TradeOrderCountRespVO> getOrderCount() {
106 108 // 订单统计
107   - TradeOrderCountRespVO vo = tradeOrderStatisticsService.getOrderCount();
  109 + Long undeliveredCount = tradeOrderStatisticsService.getCountByStatusAndDeliveryType(
  110 + TradeOrderStatusEnum.UNDELIVERED.getStatus(), DeliveryTypeEnum.EXPRESS.getType());
  111 + Long pickUpCount = tradeOrderStatisticsService.getCountByStatusAndDeliveryType(
  112 + TradeOrderStatusEnum.DELIVERED.getStatus(), DeliveryTypeEnum.PICK_UP.getType());
108 113 // 售后统计
109   - vo.setAfterSaleApply(afterSaleStatisticsService.getCountByStatus(AfterSaleStatusEnum.APPLY))
110   - .setAuditingWithdraw(brokerageStatisticsService.getWithdrawCountByStatus(BrokerageWithdrawStatusEnum.AUDITING));
111   - return success(vo);
  114 + Long afterSaleApplyCount = afterSaleStatisticsService.getCountByStatus(AfterSaleStatusEnum.APPLY);
  115 + Long auditingWithdrawCount = brokerageStatisticsService.getWithdrawCountByStatus(BrokerageWithdrawStatusEnum.AUDITING);
  116 + // 拼接返回
  117 + return success(TradeStatisticsConvert.INSTANCE.convert(undeliveredCount, pickUpCount, afterSaleApplyCount, auditingWithdrawCount));
112 118 }
113 119  
114 120 // TODO 芋艿：已经 review
... ... @@ -124,6 +130,7 @@ public class TradeStatisticsController {
124 130 @Operation(summary = "获得订单量趋势统计")
125 131 @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
126 132 public CommonResult<List<DataComparisonRespVO<TradeOrderTrendRespVO>>> getOrderCountTrendComparison(@Valid TradeOrderTrendReqVO reqVO) {
  133 + // TODO @疯狂：要注意 date 的排序；
127 134 return success(tradeOrderStatisticsService.getOrderCountTrendComparison(reqVO));
128 135 }
129 136  
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryExcelVO.java
  View file @0dcab03
... ... @@ -34,11 +34,11 @@ public class TradeTrendSummaryExcelVO {
34 34 private Integer expensePrice;
35 35  
36 36 @ExcelProperty(value = "余额支付金额", converter = MoneyConvert.class)
37   - private Integer orderWalletPayPrice;
  37 + private Integer walletPayPrice;
38 38  
39 39 @ExcelProperty(value = "支付佣金金额", converter = MoneyConvert.class)
40 40 private Integer brokerageSettlementPrice;
41 41  
42 42 @ExcelProperty(value = "商品退款金额", converter = MoneyConvert.class)
43   - private Integer orderRefundPrice;
  43 + private Integer afterSaleRefundPrice;
44 44 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryRespVO.java
  View file @0dcab03
... ... @@ -23,10 +23,10 @@ public class TradeTrendSummaryRespVO {
23 23 private Integer orderPayPrice;
24 24  
25 25 @Schema(description = "余额支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
26   - private Integer orderWalletPayPrice;
  26 + private Integer walletPayPrice;
27 27  
28 28 @Schema(description = "订单退款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
29   - private Integer orderRefundPrice;
  29 + private Integer afterSaleRefundPrice;
30 30  
31 31 @Schema(description = "支付佣金金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
32 32 private Integer brokerageSettlementPrice;
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/convert/member/MemberStatisticsConvert.java
  View file @0dcab03
... ... @@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAnaly
9 9 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAnalyseRespVO;
10 10 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
11 11 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSummaryRespVO;
  12 +import cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO;
12 13 import cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO;
13 14 import org.mapstruct.Mapper;
14 15 import org.mapstruct.factory.Mappers;
... ... @@ -29,10 +30,10 @@ public interface MemberStatisticsConvert {
29 30  
30 31 default List<MemberAreaStatisticsRespVO> convertList(List<Area> areaList,
31 32 Map<Integer, Integer> userCountMap,
32   - Map<Integer, MemberAreaStatisticsRespVO> orderMap) {
  33 + Map<Integer, MemberAreaStatisticsRespBO> orderMap) {
33 34 return CollectionUtils.convertList(areaList, area -> {
34   - MemberAreaStatisticsRespVO orderVo = Optional.ofNullable(orderMap.get(area.getId()))
35   - .orElseGet(MemberAreaStatisticsRespVO::new);
  35 + MemberAreaStatisticsRespBO orderVo = Optional.ofNullable(orderMap.get(area.getId()))
  36 + .orElseGet(MemberAreaStatisticsRespBO::new);
36 37 return new MemberAreaStatisticsRespVO()
37 38 .setAreaId(area.getId()).setAreaName(area.getName())
38 39 .setUserCount(MapUtil.getInt(userCountMap, area.getId(), 0))
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/convert/pay/PayStatisticsConvert.java 0 → 100644
  View file @0dcab03
  1 +package cn.iocoder.yudao.module.statistics.convert.pay;
  2 +
  3 +import cn.iocoder.yudao.module.statistics.controller.admin.pay.vo.PaySummaryRespVO;
  4 +import org.mapstruct.Mapper;
  5 +import org.mapstruct.factory.Mappers;
  6 +
  7 +/**
  8 + * 支付统计 Convert
  9 + *
  10 + * @author owen
  11 + */
  12 +@Mapper
  13 +public interface PayStatisticsConvert {
  14 +
  15 + PayStatisticsConvert INSTANCE = Mappers.getMapper(PayStatisticsConvert.class);
  16 +
  17 + PaySummaryRespVO convert(Integer rechargePrice);
  18 +
  19 +}
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/convert/trade/TradeStatisticsConvert.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.statistics.convert.trade;
2 2  
3 3 import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
  4 +import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderCountRespVO;
4 5 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeSummaryRespVO;
5 6 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryExcelVO;
6 7 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO;
... ... @@ -9,7 +10,9 @@ import cn.iocoder.yudao.module.statistics.service.trade.bo.AfterSaleSummaryRespB
9 10 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeOrderSummaryRespBO;
10 11 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO;
11 12 import cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO;
  13 +import org.mapstruct.IterableMapping;
12 14 import org.mapstruct.Mapper;
  15 +import org.mapstruct.Named;
13 16 import org.mapstruct.factory.Mappers;
14 17  
15 18 import java.time.LocalDateTime;
... ... @@ -50,21 +53,22 @@ public interface TradeStatisticsConvert {
50 53 AfterSaleSummaryRespBO afterSaleSummary, Integer brokerageSettlementPrice,
51 54 WalletSummaryRespBO walletSummary);
52 55  
  56 + @IterableMapping(qualifiedByName = "convert")
53 57 List<TradeTrendSummaryRespVO> convertList(List<TradeStatisticsDO> list);
54 58  
55   - // TODO @疯狂：要不要搞个默认的 convertA 方法，然后这个 convert 去调用 convertA，特殊字段再去 set？
  59 + TradeTrendSummaryRespVO convertA(TradeStatisticsDO tradeStatistics);
  60 +
  61 + @Named("convert")
56 62 default TradeTrendSummaryRespVO convert(TradeStatisticsDO tradeStatistics) {
57   - return new TradeTrendSummaryRespVO()
  63 + TradeTrendSummaryRespVO vo = convertA(tradeStatistics);
  64 + return vo
58 65 .setDate(tradeStatistics.getTime().toLocalDate())
59 66 // 营业额 = 商品支付金额 + 充值金额
60 67 .setTurnoverPrice(tradeStatistics.getOrderPayPrice() + tradeStatistics.getRechargePayPrice())
61   - .setOrderPayPrice(tradeStatistics.getOrderPayPrice())
62   - .setRechargePrice(tradeStatistics.getRechargePayPrice())
63 68 // 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
64   - .setExpensePrice(tradeStatistics.getOrderWalletPayPrice() + tradeStatistics.getBrokerageSettlementPrice() + tradeStatistics.getAfterSaleRefundPrice())
65   - .setOrderWalletPayPrice(tradeStatistics.getOrderWalletPayPrice())
66   - .setBrokerageSettlementPrice(tradeStatistics.getBrokerageSettlementPrice())
67   - .setOrderRefundPrice(tradeStatistics.getAfterSaleRefundPrice());
  69 + .setExpensePrice(tradeStatistics.getWalletPayPrice() + tradeStatistics.getBrokerageSettlementPrice() + tradeStatistics.getAfterSaleRefundPrice());
68 70 }
69 71  
  72 + TradeOrderCountRespVO convert(Long undelivered, Long pickUp, Long afterSaleApply, Long auditingWithdraw);
  73 +
70 74 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/trade/TradeStatisticsDO.java
  View file @0dcab03
... ... @@ -63,11 +63,10 @@ public class TradeStatisticsDO extends TenantBaseDO {
63 63 */
64 64 private Integer brokerageSettlementPrice;
65 65  
66   - // TODO @疯狂：walletPayPrice，钱包支付金额
67 66 /**
68 67 * 总支付金额（余额），单位：分
69 68 */
70   - private Integer orderWalletPayPrice;
  69 + private Integer walletPayPrice;
71 70 /**
72 71 * 充值订单数
73 72 * <p>
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeOrderStatisticsMapper.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.statistics.dal.mysql.trade;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4   -import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
5 4 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderSummaryRespVO;
6 5 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendRespVO;
7 6 import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
  7 +import cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9 import org.apache.ibatis.annotations.Param;
10 10  
... ... @@ -20,7 +20,7 @@ import java.util.List;
20 20 public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
21 21  
22 22 // TODO 芋艿：已经 review
23   - List<MemberAreaStatisticsRespVO> selectSummaryListByAreaId();
  23 + List<MemberAreaStatisticsRespBO> selectSummaryListByAreaId();
24 24  
25 25 // TODO 芋艿：已经 review
26 26 Integer selectCountByCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
... ... @@ -65,10 +65,7 @@ public interface TradeOrderStatisticsMapper extends BaseMapperX&lt;TradeStatisticsD
65 65 @Param("endTime") LocalDateTime endTime);
66 66  
67 67 // TODO @芋艿：已经 review
68   - Long selectCountByStatus(@Param("status") Integer status);
69   -
70   - // TODO 芋艿：已经 review
71   - Long selectCountByStatusAndPickUpStoreIdIsNotNull(@Param("status") Integer status);
  68 + Long selectCountByStatusAndDeliveryType(@Param("status") Integer status, @Param("deliveryType") Integer deliveryType);
72 69  
73 70 // TODO 芋艿：已经 review
74 71 TradeOrderSummaryRespVO selectPaySummaryByStatusAndPayTimeBetween(@Param("status") Integer status,
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/job/trade/TradeStatisticsJob.java
  View file @0dcab03
... ... @@ -30,8 +30,10 @@ public class TradeStatisticsJob implements JobHandler {
30 30 @Override
31 31 @TenantJob
32 32 public String execute(String param) {
33   - // TODO @疯狂：要搞个默认的 1 哈；
34   - if (NumberUtil.isInteger(param)) {
  33 + // 默认 昨日
  34 + if (StrUtil.isBlank(param)) {
  35 + param = "1";
  36 + } else if (!NumberUtil.isInteger(param)) {
35 37 throw new RuntimeException("交易统计任务的参数只能为是正整数");
36 38 }
37 39 Integer days = Convert.toInt(param, 0);
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsService.java
  View file @0dcab03
... ... @@ -48,13 +48,12 @@ public interface MemberStatisticsService {
48 48 */
49 49 List<MemberSexStatisticsRespVO> getMemberSexStatisticsList();
50 50  
51   - // TODO @疯狂：这个要不要使用 getMemberTerminalStatisticsList；保持统一？
52 51 /**
53 52 * 按照终端，获得会员统计列表
54 53 *
55 54 * @return 会员统计列表
56 55 */
57   - List<MemberTerminalStatisticsRespVO> getRegisterTerminalStatisticsList();
  56 + List<MemberTerminalStatisticsRespVO> getMemberTerminalStatisticsList();
58 57  
59 58 // TODO 芋艿：已经 review
60 59 /**
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
  View file @0dcab03
... ... @@ -65,10 +65,10 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
65 65 vo -> AreaUtils.getParentIdByType(vo.getAreaId(), AreaTypeEnum.PROVINCE),
66 66 MemberAreaStatisticsRespBO::getUserCount, Integer::sum);
67 67 // 统计订单
68   - Map<Integer, MemberAreaStatisticsRespVO> orderMap = convertMap(tradeOrderStatisticsService.getSummaryListByAreaId(),
69   - vo -> AreaUtils.getParentIdByType(vo.getAreaId(), AreaTypeEnum.PROVINCE),
70   - vo -> vo,
71   - (a, b) -> new MemberAreaStatisticsRespVO()
  68 + Map<Integer, MemberAreaStatisticsRespBO> orderMap = convertMap(tradeOrderStatisticsService.getSummaryListByAreaId(),
  69 + bo -> AreaUtils.getParentIdByType(bo.getAreaId(), AreaTypeEnum.PROVINCE),
  70 + bo -> bo,
  71 + (a, b) -> new MemberAreaStatisticsRespBO()
72 72 .setOrderCreateUserCount(a.getOrderCreateUserCount() + b.getOrderCreateUserCount())
73 73 .setOrderPayUserCount(a.getOrderPayUserCount() + b.getOrderPayUserCount())
74 74 .setOrderPayPrice(a.getOrderPayPrice() + b.getOrderPayPrice()));
... ... @@ -105,7 +105,7 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
105 105 }
106 106  
107 107 @Override
108   - public List<MemberTerminalStatisticsRespVO> getRegisterTerminalStatisticsList() {
  108 + public List<MemberTerminalStatisticsRespVO> getMemberTerminalStatisticsList() {
109 109 return memberStatisticsMapper.selectSummaryListByRegisterTerminal();
110 110 }
111 111  
... ... @@ -129,7 +129,7 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
129 129  
130 130 private MemberCountRespVO getUserCount(LocalDateTime beginTime, LocalDateTime endTime) {
131 131 return new MemberCountRespVO()
132   - .setCreateUserCount(memberStatisticsMapper.selectUserCount(beginTime, endTime))
  132 + .setRegisterUserCount(memberStatisticsMapper.selectUserCount(beginTime, endTime))
133 133 .setVisitUserCount(apiAccessLogStatisticsService.getIpCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime));
134 134 }
135 135  
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/PayWalletStatisticsServiceImpl.java
  View file @0dcab03
... ... @@ -33,7 +33,7 @@ public class PayWalletStatisticsServiceImpl implements PayWalletStatisticsServic
33 33 Integer walletPayPrice = payWalletStatisticsMapper.selectPriceSummaryByBizTypeAndCreateTimeBetween(
34 34 beginTime, endTime, PayWalletBizTypeEnum.PAYMENT.getType());
35 35 // 拼接
36   - paySummary.setOrderWalletPayPrice(walletPayPrice)
  36 + paySummary.setWalletPayPrice(walletPayPrice)
37 37 .setRechargeRefundCount(refundSummary.getRechargeRefundCount())
38 38 .setRechargeRefundPrice(refundSummary.getRechargeRefundPrice());
39 39 return paySummary;
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsService.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.statistics.service.trade;
2 2  
3 3 import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
4   -import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
5 4 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.*;
  5 +import cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO;
6 6 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeOrderSummaryRespBO;
7 7  
8 8 import java.time.LocalDateTime;
... ... @@ -30,7 +30,7 @@ public interface TradeOrderStatisticsService {
30 30 *
31 31 * @return 订单统计结果
32 32 */
33   - List<MemberAreaStatisticsRespVO> getSummaryListByAreaId();
  33 + List<MemberAreaStatisticsRespBO> getSummaryListByAreaId();
34 34  
35 35 // TODO 芋艿：已经 review
36 36 /**
... ... @@ -62,13 +62,12 @@ public interface TradeOrderStatisticsService {
62 62 */
63 63 Integer getOrderPayPrice(LocalDateTime beginTime, LocalDateTime endTime);
64 64  
65   - // TODO 芋艿：已经 review
66 65 /**
67   - * 获得交易订单数量
  66 + * 根据订单状态、物流类型，获得交易订单数量
68 67 *
69 68 * @return 订单数量
70 69 */
71   - TradeOrderCountRespVO getOrderCount();
  70 + Long getCountByStatusAndDeliveryType(Integer status, Integer deliveryType);
72 71  
73 72 // TODO 芋艿：已经 review
74 73 /**
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsServiceImpl.java
  View file @0dcab03
... ... @@ -2,15 +2,15 @@ package cn.iocoder.yudao.module.statistics.service.trade;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.date.LocalDateTimeUtil;
5   -import cn.hutool.core.util.ObjUtil;
6 5 import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
7 6 import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
8   -import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
9   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.*;
  7 +import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderSummaryRespVO;
  8 +import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendReqVO;
  9 +import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendRespVO;
10 10 import cn.iocoder.yudao.module.statistics.dal.mysql.trade.TradeOrderStatisticsMapper;
11 11 import cn.iocoder.yudao.module.statistics.enums.TimeRangeTypeEnum;
  12 +import cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO;
12 13 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeOrderSummaryRespBO;
13   -import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
14 14 import org.springframework.stereotype.Service;
15 15 import org.springframework.validation.annotation.Validated;
16 16  
... ... @@ -42,7 +42,7 @@ public class TradeOrderStatisticsServiceImpl implements TradeOrderStatisticsServ
42 42 }
43 43  
44 44 @Override
45   - public List<MemberAreaStatisticsRespVO> getSummaryListByAreaId() {
  45 + public List<MemberAreaStatisticsRespBO> getSummaryListByAreaId() {
46 46 return tradeOrderStatisticsMapper.selectSummaryListByAreaId();
47 47 }
48 48  
... ... @@ -62,13 +62,8 @@ public class TradeOrderStatisticsServiceImpl implements TradeOrderStatisticsServ
62 62 }
63 63  
64 64 @Override
65   - public TradeOrderCountRespVO getOrderCount() {
66   - // TODO 疯狂：这个可以根据 status + delivertyType 来过滤呀；ps：是不是搞个 service 方法，交给上层去聚合，这样 TradeOrderCountRespVO 可以更明确返回，不用搞 bo；
67   - Long undeliveredCount = tradeOrderStatisticsMapper.selectCountByStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus());
68   - Long pickUpCount = tradeOrderStatisticsMapper.selectCountByStatusAndPickUpStoreIdIsNotNull(TradeOrderStatusEnum.DELIVERED.getStatus());
69   - return new TradeOrderCountRespVO()
70   - .setPickUp(ObjUtil.defaultIfNull(pickUpCount, 0L))
71   - .setUndelivered(ObjUtil.defaultIfNull(undeliveredCount, 0L));
  65 + public Long getCountByStatusAndDeliveryType(Integer status, Integer deliveryType) {
  66 + return tradeOrderStatisticsMapper.selectCountByStatusAndDeliveryType(status, deliveryType);
72 67 }
73 68  
74 69 @Override
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeStatisticsServiceImpl.java
  View file @0dcab03
... ... @@ -83,9 +83,7 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
83 83 @Override
84 84 public String statisticsTrade(Integer days) {
85 85 LocalDateTime today = LocalDateTime.now();
86   - // TODO @疯狂：不用并发哈，因为租户可能会丢；然后，一般串行就好，对性能没绝对的要求哈，天数也不会多；
87 86 return IntStream.rangeClosed(1, days)
88   - .parallel()
89 87 .mapToObj(day -> statisticsTrade(today.minusDays(day)))
90 88 .sorted()
91 89 .collect(Collectors.joining("\n"));
... ... @@ -131,7 +129,7 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
131 129 entity = TradeStatisticsConvert.INSTANCE.convert(date, orderSummary, afterSaleSummary, brokerageSettlementPrice,
132 130 walletSummary);
133 131 tradeStatisticsMapper.insert(entity);
134   - // TODO @疯狂：这里是不是也要把日期带上？类似 108 那边
  132 + // TODO @疯狂：这里是不是也要把日期带上？类似 108 那边; 110 已经带上了
135 133 return stopWatch.prettyPrint();
136 134 }
137 135  
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/bo/MemberAreaStatisticsRespBO.java 0 → 100644
  View file @0dcab03
  1 +package cn.iocoder.yudao.module.statistics.service.trade.bo;
  2 +
  3 +import lombok.Data;
  4 +
  5 +/**
  6 + * 会员地区统计 Response BO
  7 + *
  8 + * @author owen
  9 + */
  10 +@Data
  11 +public class MemberAreaStatisticsRespBO {
  12 +
  13 + /**
  14 + * 省份编号
  15 + */
  16 + private Integer areaId;
  17 + /**
  18 + * 省份名称
  19 + */
  20 + private String areaName;
  21 +
  22 + /**
  23 + * 会员数量
  24 + */
  25 + private Integer userCount;
  26 +
  27 + /**
  28 + * 下单的会员数量
  29 + */
  30 + private Integer orderCreateUserCount;
  31 + /**
  32 + * 支付订单的会员数量
  33 + */
  34 + private Integer orderPayUserCount;
  35 +
  36 + /**
  37 + * 订单支付金额，单位：分
  38 + */
  39 + private Integer orderPayPrice;
  40 +
  41 +}
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/bo/WalletSummaryRespBO.java
  View file @0dcab03
... ... @@ -13,7 +13,7 @@ public class WalletSummaryRespBO {
13 13 /**
14 14 * 总支付金额（余额），单位：分
15 15 */
16   - private Integer orderWalletPayPrice;
  16 + private Integer walletPayPrice;
17 17  
18 18 /**
19 19 * 充值订单数
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml
  View file @0dcab03
... ... @@ -2,9 +2,8 @@
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 <mapper namespace="cn.iocoder.yudao.module.statistics.dal.mysql.trade.TradeOrderStatisticsMapper">
4 4  
5   - <!-- TODO @疯狂：是返回不是的 MemberAreaStatisticsRespBO 哈 -->
6 5 <select id="selectSummaryListByAreaId"
7   - resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO">
  6 + resultType="cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO">
8 7 SELECT receiver_area_id AS areaId,
9 8 (SELECT COUNT(DISTINCT s.user_id)
10 9 FROM trade_order AS s
... ... @@ -86,18 +85,11 @@
86 85 GROUP BY date
87 86 </select>
88 87  
89   - <select id="selectCountByStatus" resultType="java.lang.Long">
  88 + <select id="selectCountByStatusAndDeliveryType" resultType="java.lang.Long">
90 89 SELECT COUNT(1)
91 90 FROM trade_order
92 91 WHERE status = #{status}
93   - AND deleted = FALSE
94   - </select>
95   -
96   - <select id="selectCountByStatusAndPickUpStoreIdIsNotNull" resultType="java.lang.Long">
97   - SELECT COUNT(1)
98   - FROM trade_order
99   - WHERE status = #{status}
100   - AND pick_up_store_id IS NOT NULL
  92 + ANd delivery_type = #{deliveryType}
101 93 AND deleted = FALSE
102 94 </select>
103 95  
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeStatisticsMapper.xml
  View file @0dcab03
... ... @@ -15,14 +15,14 @@
15 15 resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO">
16 16 SELECT
17 17 -- 营业额 = 商品支付金额 + 充值金额
18   - SUM(order_pay_price + recharge_pay_price) AS turnoverPrice,
19   - SUM(order_pay_price) AS orderPayPrice,
20   - SUM(recharge_pay_price) AS rechargePrice,
  18 + SUM(order_pay_price + recharge_pay_price) AS turnoverPrice,
  19 + SUM(order_pay_price) AS orderPayPrice,
  20 + SUM(recharge_pay_price) AS rechargePrice,
21 21 -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
22   - SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice,
23   - SUM(order_wallet_pay_price) AS orderWalletPayPrice,
24   - SUM(brokerage_settlement_price) AS brokerageSettlementPrice,
25   - SUM(after_sale_refund_price) AS orderRefundPrice
  22 + SUM(wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice,
  23 + SUM(wallet_pay_price) AS walletPayPrice,
  24 + SUM(brokerage_settlement_price) AS brokerageSettlementPrice,
  25 + SUM(after_sale_refund_price) AS afterSaleRefundPrice
26 26 FROM trade_statistics
27 27 WHERE time BETWEEN #{beginTime} AND #{endTime}
28 28 AND deleted = FALSE
... ... @@ -30,7 +30,7 @@
30 30  
31 31 <select id="selectExpensePriceByTimeBetween" resultType="java.lang.Integer">
32 32 SELECT -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
33   - SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
  33 + SUM(wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
34 34 FROM trade_statistics
35 35 WHERE deleted = FALSE
36 36 <if test="beginTime != null">
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
  View file @0dcab03
... ... @@ -56,7 +56,7 @@ public class TradeOrderController {
56 56 }
57 57  
58 58 // 查询用户信息
59   - Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), TradeOrderDO::getUserId));;
  59 + Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), TradeOrderDO::getUserId));
60 60 // 查询订单项
61 61 List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(
62 62 convertSet(pageResult.getList(), TradeOrderDO::getId));
... ... @@ -126,18 +126,31 @@ public class TradeOrderController {
126 126 return success(true);
127 127 }
128 128  
129   - // TODO @疯狂：1、在【订单列表】界面，增加一个【核销按钮】。点击后，弹窗出一个核销码输入的窗口。
130   - //
131   - //2、输入核销码后，点击确认，基于 code 查询对应的订单，之后弹窗展示。
132   - //
133   - //3、新的弹窗，下面有个【确认核销】按钮。确认后，进行订单核销逻辑。注意，只有门店自提的订单，才可以核销。
134   - // TODO 这里的 id 应该是 pickUpVerifyCode 参数哈；
135   - @PutMapping("/pick-up")
  129 + @PutMapping("/pick-up-by-id")
136 130 @Operation(summary = "订单核销")
  131 + @Parameter(name = "id", description = "交易订单编号")
137 132 @PreAuthorize("@ss.hasPermission('trade:order:pick-up')")
138   - public CommonResult<Boolean> pickUpOrder(@RequestParam("id") Long id) {
  133 + public CommonResult<Boolean> pickUpOrderById(@RequestParam("id") Long id) {
139 134 tradeOrderUpdateService.pickUpOrderByMember(id);
140 135 return success(true);
141 136 }
142 137  
  138 + @PutMapping("/pick-up-by-verify-code")
  139 + @Operation(summary = "订单核销")
  140 + @Parameter(name = "pickUpVerifyCode", description = "自提核销码")
  141 + @PreAuthorize("@ss.hasPermission('trade:order:pick-up')")
  142 + public CommonResult<Boolean> pickUpOrderByVerifyCode(@RequestParam("pickUpVerifyCode") String pickUpVerifyCode) {
  143 + tradeOrderUpdateService.pickUpOrderByAdmin(pickUpVerifyCode);
  144 + return success(true);
  145 + }
  146 +
  147 + @GetMapping("/get-by-pick-up-verify-code")
  148 + @Operation(summary = "查询核销码对应的订单")
  149 + @Parameter(name = "pickUpVerifyCode", description = "自提核销码")
  150 + @PreAuthorize("@ss.hasPermission('trade:order:query')")
  151 + public CommonResult<TradeOrderDetailRespVO> getByPickUpVerifyCode(@RequestParam("pickUpVerifyCode") String pickUpVerifyCode) {
  152 + TradeOrderDO tradeOrder = tradeOrderUpdateService.getByPickUpVerifyCode(pickUpVerifyCode);
  153 + return success(TradeOrderConvert.INSTANCE.convert2(tradeOrder, null));
  154 + }
  155 +
143 156 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
  View file @0dcab03
... ... @@ -93,6 +93,9 @@ public class TradeOrderBaseVO {
93 93 @Schema(description = "自提门店", example = "10")
94 94 private Long pickUpStoreId;
95 95  
  96 + @Schema(description = "自提核销码", example = "10")
  97 + private Long pickUpVerifyCode;
  98 +
96 99 @Schema(description = "配送模板编号", example = "1024")
97 100 private Long deliveryTemplateId;
98 101  
... ... @@ -102,9 +105,6 @@ public class TradeOrderBaseVO {
102 105 @Schema(description = "发货物流单号", example = "1024")
103 106 private String logisticsNo;
104 107  
105   - @Schema(description = "发货状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
106   - private Integer deliveryStatus;
107   -
108 108 @Schema(description = "发货时间")
109 109 private LocalDateTime deliveryTime;
110 110  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
  View file @0dcab03
... ... @@ -61,8 +61,9 @@ public class AppTradeOrderController {
61 61 @PostMapping("/create")
62 62 @Operation(summary = "创建订单")
63 63 @PreAuthenticated
64   - public CommonResult<AppTradeOrderCreateRespVO> createOrder(@Valid @RequestBody AppTradeOrderCreateReqVO createReqVO) {
65   - TradeOrderDO order = tradeOrderUpdateService.createOrder(getLoginUserId(), getClientIP(), createReqVO);
  64 + public CommonResult<AppTradeOrderCreateRespVO> createOrder(@Valid @RequestBody AppTradeOrderCreateReqVO createReqVO,
  65 + @RequestHeader Integer terminal) {
  66 + TradeOrderDO order = tradeOrderUpdateService.createOrder(getLoginUserId(), getClientIP(), createReqVO, terminal);
66 67 return success(new AppTradeOrderCreateRespVO().setId(order.getId()).setPayOrderId(order.getPayOrderId()));
67 68 }
68 69  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
  View file @0dcab03
... ... @@ -92,21 +92,12 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; {
92 92 default TradeOrderDO selectOneByPickUpVerifyCode(String pickUpVerifyCode) {
93 93 return selectOne(TradeOrderDO::getPickUpVerifyCode, pickUpVerifyCode);
94 94 }
95   -
96   - // TODO @puhui999：selectByUserIdAndCombinationActivityIdAndStatus，这样更容易理解哈。
97   - /**
98   - * 只针对 combinationActivityId 的查询
99   - *
100   - * @param userId 用户编号
101   - * @param activityId 拼团活动编号
102   - * @param status 订单状态
103   - * @return 交易订单
104   - */
105   - default TradeOrderDO selectByUserIdAndActivityIdAndStatus(Long userId, Long activityId, Integer status) {
  95 +
  96 + default TradeOrderDO selectByUserIdAndCombinationActivityIdAndStatus(Long userId, Long combinationActivityId, Integer status) {
106 97 return selectOne(new LambdaQueryWrapperX<TradeOrderDO>()
107 98 .eq(TradeOrderDO::getUserId, userId)
108 99 .eq(TradeOrderDO::getStatus, status)
109   - .eq(TradeOrderDO::getCombinationActivityId, activityId)
  100 + .eq(TradeOrderDO::getCombinationActivityId, combinationActivityId)
110 101 );
111 102 }
112 103  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryService.java
  View file @0dcab03
... ... @@ -42,11 +42,11 @@ public interface TradeOrderQueryService {
42 42 * 获得指定用户，指定活动，指定状态的交易订单
43 43 *
44 44 * @param userId 用户编号
45   - * @param activityId 活动编号
  45 + * @param combinationActivityId 活动编号
46 46 * @param status 订单状态
47 47 * @return 交易订单
48 48 */
49   - TradeOrderDO getActivityOrderByUserIdAndActivityIdAndStatus(Long userId, Long activityId, Integer status);
  49 + TradeOrderDO getOrderByUserIdAndStatusAndCombination(Long userId, Long combinationActivityId, Integer status);
50 50  
51 51 /**
52 52 * 获得订单列表
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
  View file @0dcab03
... ... @@ -71,8 +71,8 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
71 71 }
72 72  
73 73 @Override
74   - public TradeOrderDO getActivityOrderByUserIdAndActivityIdAndStatus(Long userId, Long activityId, Integer status) {
75   - return tradeOrderMapper.selectByUserIdAndActivityIdAndStatus(userId, activityId, status);
  74 + public TradeOrderDO getOrderByUserIdAndStatusAndCombination(Long userId, Long combinationActivityId, Integer status) {
  75 + return tradeOrderMapper.selectByUserIdAndCombinationActivityIdAndStatus(userId, combinationActivityId, status);
76 76 }
77 77  
78 78 @Override
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.trade.service.order;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
3 4 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
4 5 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
5 6 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
... ... @@ -37,9 +38,10 @@ public interface TradeOrderUpdateService {
37 38 * @param userId 登录用户
38 39 * @param userIp 用户 IP 地址
39 40 * @param createReqVO 创建交易订单请求模型
  41 + * @param terminal 终端 {@link TerminalEnum}
40 42 * @return 交易订单的
41 43 */
42   - TradeOrderDO createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO);
  44 + TradeOrderDO createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO, Integer terminal);
43 45  
44 46 /**
45 47 * 更新交易订单已支付
... ... @@ -129,6 +131,13 @@ public interface TradeOrderUpdateService {
129 131 */
130 132 void pickUpOrderByAdmin(String pickUpVerifyCode);
131 133  
  134 + /**
  135 + * 【管理员】根据自提核销码，查询订单
  136 + *
  137 + * @param pickUpVerifyCode 自提核销码
  138 + */
  139 + TradeOrderDO getByPickUpVerifyCode(String pickUpVerifyCode);
  140 +
132 141 // =================== Order Item ===================
133 142  
134 143 /**
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @0dcab03
... ... @@ -11,7 +11,6 @@ import cn.iocoder.yudao.framework.common.core.KeyValue;
11 11 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
12 12 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
13 13 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
14   -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
15 14 import cn.iocoder.yudao.module.member.api.address.AddressApi;
16 15 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
17 16 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
... ... @@ -159,11 +158,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
159 158 @Override
160 159 @Transactional(rollbackFor = Exception.class)
161 160 @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_CREATE)
162   - public TradeOrderDO createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO) {
  161 + public TradeOrderDO createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO, Integer terminal) {
163 162 // 1.1 价格计算
164 163 TradePriceCalculateRespBO calculateRespBO = calculatePrice(userId, createReqVO);
165 164 // 1.2 构建订单
166   - TradeOrderDO order = buildTradeOrder(userId, userIp, createReqVO, calculateRespBO);
  165 + TradeOrderDO order = buildTradeOrder(userId, userIp, createReqVO, calculateRespBO, terminal);
167 166 List<TradeOrderItemDO> orderItems = buildTradeOrderItems(order, calculateRespBO);
168 167  
169 168 // 2. 订单创建前的逻辑
... ... @@ -180,15 +179,14 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
180 179 }
181 180  
182 181 private TradeOrderDO buildTradeOrder(Long userId, String clientIp, AppTradeOrderCreateReqVO createReqVO,
183   - TradePriceCalculateRespBO calculateRespBO) {
  182 + TradePriceCalculateRespBO calculateRespBO, Integer terminal) {
184 183 TradeOrderDO order = TradeOrderConvert.INSTANCE.convert(userId, clientIp, createReqVO, calculateRespBO);
185 184 order.setType(calculateRespBO.getType());
186 185 order.setNo(tradeNoRedisDAO.generate(TradeNoRedisDAO.TRADE_ORDER_NO_PREFIX));
187 186 order.setStatus(TradeOrderStatusEnum.UNPAID.getStatus());
188 187 order.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus());
189 188 order.setProductCount(getSumValue(calculateRespBO.getItems(), TradePriceCalculateRespBO.OrderItem::getCount, Integer::sum));
190   - // TODO @疯狂：无状态，terminal 不从 servletuTILS 拿，而是通过 controller 传递给 service；
191   - order.setTerminal(ServletUtils.getTerminal());
  189 + order.setTerminal(terminal);
192 190 // 支付 + 退款信息
193 191 order.setAdjustPrice(0).setPayStatus(false);
194 192 order.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus()).setRefundPrice(0);
... ... @@ -682,6 +680,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
682 680 getSelf().pickUpOrder(tradeOrderMapper.selectOneByPickUpVerifyCode(pickUpVerifyCode));
683 681 }
684 682  
  683 + @Override
  684 + public TradeOrderDO getByPickUpVerifyCode(String pickUpVerifyCode) {
  685 + return tradeOrderMapper.selectOneByPickUpVerifyCode(pickUpVerifyCode);
  686 + }
  687 +
685 688 @Transactional(rollbackFor = Exception.class)
686 689 public void pickUpOrder(TradeOrderDO order) {
687 690 if (order == null) {
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
  View file @0dcab03
... ... @@ -49,7 +49,7 @@ public class TradeCombinationOrderHandler implements TradeOrderHandler {
49 49 order.getCombinationHeadId(), item.getSkuId(), item.getCount());
50 50  
51 51 // 2. 校验该用户是否存在未支付的拼团活动订单，避免一个拼团可以下多个单子了
52   - TradeOrderDO activityOrder = orderQueryService.getActivityOrderByUserIdAndActivityIdAndStatus(
  52 + TradeOrderDO activityOrder = orderQueryService.getOrderByUserIdAndStatusAndCombination(
53 53 order.getUserId(), order.getCombinationActivityId(), TradeOrderStatusEnum.UNPAID.getStatus());
54 54 if (activityOrder != null) {
55 55 throw exception(ORDER_CREATE_FAIL_EXIST_UNPAID);
... ... @@ -69,9 +69,8 @@ public class TradeCombinationOrderHandler implements TradeOrderHandler {
69 69 CombinationRecordCreateRespDTO combinationRecord = combinationRecordApi.createCombinationRecord(
70 70 TradeOrderConvert.INSTANCE.convert(order, item));
71 71  
72   - // 3. 更新拼团相关信息到订单
73   - // 为什么几个字段都要更新？原因是：
74   - // 如果创建订单时自己是团长的情况下 combinationHeadId 是为 null 的，设置团长编号这个操作时在订单是否后创建拼团记录时才设置的。
  72 + // 3. 更新拼团相关信息到订单。为什么几个字段都要更新？
  73 + // 原因是：如果创建订单时自己是团长的情况下 combinationHeadId 是为 null 的，设置团长编号这个操作时在订单是否后创建拼团记录时才设置的。
75 74 orderUpdateService.updateOrderCombinationInfo(order.getId(), order.getCombinationActivityId(),
76 75 combinationRecord.getCombinationRecordId(), combinationRecord.getCombinationHeadId());
77 76 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
  View file @0dcab03
... ... @@ -152,7 +152,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest {
152 152 }))).thenReturn(1000L);
153 153  
154 154 // 调用方法
155   - TradeOrderDO order = tradeOrderUpdateService.createOrder(userId, userIp, reqVO);
  155 + TradeOrderDO order = tradeOrderUpdateService.createOrder(userId, userIp, reqVO, null);
156 156 // 断言 TradeOrderDO 订单
157 157 List<TradeOrderDO> tradeOrderDOs = tradeOrderMapper.selectList();
158 158 assertEquals(tradeOrderDOs.size(), 1);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/AppAuthController.java
  View file @0dcab03
... ... @@ -65,8 +65,9 @@ public class AppAuthController {
65 65  
66 66 @PostMapping("/sms-login")
67 67 @Operation(summary = "使用手机 + 验证码登录")
68   - public CommonResult<AppAuthLoginRespVO> smsLogin(@RequestBody @Valid AppAuthSmsLoginReqVO reqVO) {
69   - return success(authService.smsLogin(reqVO));
  68 + public CommonResult<AppAuthLoginRespVO> smsLogin(@RequestBody @Valid AppAuthSmsLoginReqVO reqVO,
  69 + @RequestHeader Integer terminal) {
  70 + return success(authService.smsLogin(reqVO, terminal));
70 71 }
71 72  
72 73 @PostMapping("/send-sms-code")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthService.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.member.service.auth;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
3 4 import cn.iocoder.yudao.module.member.controller.app.auth.vo.*;
4 5  
5 6 import javax.validation.Valid;
... ... @@ -31,10 +32,11 @@ public interface MemberAuthService {
31 32 /**
32 33 * 手机 + 验证码登陆
33 34 *
34   - * @param reqVO 登陆信息
  35 + * @param reqVO 登陆信息
  36 + * @param terminal 终端 {@link TerminalEnum}
35 37 * @return 登录结果
36 38 */
37   - AppAuthLoginRespVO smsLogin(@Valid AppAuthSmsLoginReqVO reqVO);
  39 + AppAuthLoginRespVO smsLogin(@Valid AppAuthSmsLoginReqVO reqVO, Integer terminal);
38 40  
39 41 /**
40 42 * 社交登录，使用 code 授权码
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
  View file @0dcab03
... ... @@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
5 5 import cn.hutool.core.lang.Assert;
6 6 import cn.hutool.core.util.ObjectUtil;
7 7 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  8 +import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
8 9 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
9 10 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
10 11 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
... ... @@ -78,13 +79,13 @@ public class MemberAuthServiceImpl implements MemberAuthService {
78 79  
79 80 @Override
80 81 @Transactional
81   - public AppAuthLoginRespVO smsLogin(AppAuthSmsLoginReqVO reqVO) {
  82 + public AppAuthLoginRespVO smsLogin(AppAuthSmsLoginReqVO reqVO, Integer terminal) {
82 83 // 校验验证码
83 84 String userIp = getClientIP();
84 85 smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MEMBER_LOGIN.getScene(), userIp));
85 86  
86 87 // 获得获得注册用户
87   - MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(), userIp);
  88 + MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(), userIp, terminal);
88 89 Assert.notNull(user, "获取用户失败，结果为空");
89 90  
90 91 // 如果 socialType 非空，说明需要绑定社交用户
... ... @@ -128,7 +129,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
128 129 throw exception(AUTH_WEIXIN_MINI_APP_PHONE_CODE_ERROR);
129 130 }
130 131 // 获得获得注册用户
131   - MemberUserDO user = userService.createUserIfAbsent(phoneNumberInfo.getPurePhoneNumber(), getClientIP());
  132 + MemberUserDO user = userService.createUserIfAbsent(phoneNumberInfo.getPurePhoneNumber(), getClientIP(), TerminalEnum.WECHAT_MINI_PROGRAM.getTerminal());
132 133 Assert.notNull(user, "获取用户失败，结果为空");
133 134  
134 135 // 绑定社交用户
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
  View file @0dcab03
1 1 package cn.iocoder.yudao.module.member.service.user;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.framework.common.validation.Mobile;
5 6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
... ... @@ -43,9 +44,10 @@ public interface MemberUserService {
43 44 *
44 45 * @param mobile 手机号
45 46 * @param registerIp 注册 IP
  47 + * @param terminal 终端 {@link TerminalEnum}
46 48 * @return 用户对象
47 49 */
48   - MemberUserDO createUserIfAbsent(@Mobile String mobile, String registerIp);
  50 + MemberUserDO createUserIfAbsent(@Mobile String mobile, String registerIp, Integer terminal);
49 51  
50 52 /**
51 53 * 更新用户的最后登陆信息
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
  View file @0dcab03
... ... @@ -7,7 +7,6 @@ import cn.hutool.core.util.ObjectUtil;
7 7 import cn.hutool.core.util.StrUtil;
8 8 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
9 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10   -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
11 10 import cn.iocoder.yudao.module.infra.api.file.FileApi;
12 11 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
13 12 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
... ... @@ -81,17 +80,17 @@ public class MemberUserServiceImpl implements MemberUserService {
81 80  
82 81 @Override
83 82 @Transactional(rollbackFor = Exception.class)
84   - public MemberUserDO createUserIfAbsent(String mobile, String registerIp) {
  83 + public MemberUserDO createUserIfAbsent(String mobile, String registerIp, Integer terminal) {
85 84 // 用户已经存在
86 85 MemberUserDO user = memberUserMapper.selectByMobile(mobile);
87 86 if (user != null) {
88 87 return user;
89 88 }
90 89 // 用户不存在，则进行创建
91   - return createUser(mobile, registerIp);
  90 + return createUser(mobile, registerIp, terminal);
92 91 }
93 92  
94   - private MemberUserDO createUser(String mobile, String registerIp) {
  93 + private MemberUserDO createUser(String mobile, String registerIp, Integer terminal) {
95 94 // 生成密码
96 95 String password = IdUtil.fastSimpleUUID();
97 96 // 插入用户
... ... @@ -100,8 +99,7 @@ public class MemberUserServiceImpl implements MemberUserService {
100 99 user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
101 100 user.setPassword(encodePassword(password)); // 加密密码
102 101 user.setRegisterIp(registerIp);
103   - // TODO @疯狂：无状态，terminal 不从 servletuTILS 拿，而是通过 controller 传递给 service；
104   - user.setRegisterTerminal(ServletUtils.getTerminal());
  102 + user.setRegisterTerminal(terminal);
105 103 memberUserMapper.insert(user);
106 104  
107 105 // 发送 MQ 消息：用户创建
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java
  View file @0dcab03
... ... @@ -24,6 +24,9 @@ public class PayWalletTransactionRespVO {
24 24 @Schema(description = "流水标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆土豆")
25 25 private String title;
26 26  
  27 + @Schema(description = "交易后的余额，单位分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  28 + private Long balance;
  29 +
27 30 @Schema(description = "交易时间", requiredMode = Schema.RequiredMode.REQUIRED)
28 31 private LocalDateTime createTime;
29 32 }
... ...