hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-18 20:21:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product

Browse Source
This commit is contained in:
puhui999
2023-10-15 16:17:14 +08:00
parent 55eed1377a 6e4a9c3b01
commit 1fe6c82899
62 changed files with 725 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountActivityDO.java
View File

@@ -33,7 +33,6 @@ public class DiscountActivityDO extends BaseDO {
* 活动标题
*/
private String name;
// TODO 芋艿：状态调整，只有开启和关闭；
/**
* 状态
*

24
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
View File

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
/**
* 限时折扣商品 DO
*
@@ -25,7 +27,6 @@ public class DiscountProductDO extends BaseDO {
@TableId
private Long id;
// TODO 芋艿：把 activity 所有的字段冗余过来
/**
* 限时折扣活动的编号
*
@@ -33,6 +34,7 @@ public class DiscountProductDO extends BaseDO {
*/
private Long activityId;
/**
* 商品 SPU 编号
*
@@ -65,4 +67,24 @@ public class DiscountProductDO extends BaseDO {
*/
private Integer discountPrice;
// TODO 芋艿：这几个字段，要新增下；
/**
* 活动状态
*
* 关联 {@link DiscountActivityDO#getStatus()}
*/
private Integer activityStatus;
/**
* 活动开始时间点
*
* 冗余 {@link DiscountActivityDO#getStartTime()}
*/
private LocalDateTime activityStartTime;
/**
* 活动结束时间点
*
* 冗余 {@link DiscountActivityDO#getEndTime()}
*/
private LocalDateTime activityEndTime;
}

1
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
View File

@@ -38,7 +38,6 @@ public class RewardActivityDO extends BaseDO {
* 活动标题
*/
private String name;
// TODO @芋艿：改成开启、禁用两种状态
/**
* 状态
*

7
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/MemberStatisticsController.java
View File

@@ -30,13 +30,15 @@ public class MemberStatisticsController {
@Resource
private MemberStatisticsService memberStatisticsService;
// TODO 芋艿：已经 review
@GetMapping("/summary")
@Operation(summary = "获得会员统计")
@Operation(summary = "获得会员统计（实时统计）")
@PreAuthorize("@ss.hasPermission('statistics:member:query')")
public CommonResult<MemberSummaryRespVO> getMemberSummary() {
return success(memberStatisticsService.getMemberSummary());
}
// TODO 芋艿：已经 review
@GetMapping("/analyse")
@Operation(summary = "获得会员分析数据")
@PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -45,6 +47,7 @@ public class MemberStatisticsController {
ArrayUtil.get(reqVO.getTimes(), 0), ArrayUtil.get(reqVO.getTimes(), 1)));
}
// TODO 芋艿：已经 review
@GetMapping("/get-area-statistics-list")
@Operation(summary = "按照省份，获得会员统计列表")
@PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -52,6 +55,7 @@ public class MemberStatisticsController {
return success(memberStatisticsService.getMemberAreaStatisticsList());
}
// TODO 芋艿：已经 review
@GetMapping("/get-sex-statistics-list")
@Operation(summary = "按照性别，获得会员统计列表")
@PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -64,6 +68,7 @@ public class MemberStatisticsController {
@PreAuthorize("@ss.hasPermission('statistics:member:query')")
public CommonResult<List<MemberTerminalStatisticsRespVO>> getMemberTerminalStatisticsList() {
// TODO 疯狂：这个可以晚点写，因为 user = = 上还没记录 terminal
// TODO @疯狂：在 member_user 上，增加 registerTerminal 字段，基于它来统计哈；
List<MemberTerminalStatisticsRespVO> list = convertList(TerminalEnum.values(),
t -> new MemberTerminalStatisticsRespVO()
.setTerminal(t.getTerminal()).setUserCount(t.getTerminal() * 100));

2
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberAnalyseComparisonRespVO.java
View File

@@ -7,9 +7,11 @@ import lombok.Data;
@Data
public class MemberAnalyseComparisonRespVO {
// TODO @疯狂：这个字段，要不改成注册用户量；registerUserCount;
@Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer userCount;
// TODO @疯狂：这个字段，名字改成 visitUserCount；有访问，就算活跃；
@Schema(description = "活跃用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer activeUserCount;

3
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberAnalyseRespVO.java
View File

@@ -8,6 +8,7 @@ import lombok.Data;
@Data
public class MemberAnalyseRespVO {
// TODO @疯狂：这个字段改成 visitUserCount，保持和 userCount 字段统一
@Schema(description = "访客数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer visitorCount;
@@ -17,7 +18,7 @@ public class MemberAnalyseRespVO {
@Schema(description = "成交用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer payUserCount;
@Schema(description = "客单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@Schema(description = "客单价，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer atv;
@Schema(description = "对照数据", requiredMode = Schema.RequiredMode.REQUIRED)

2
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberAreaStatisticsRespVO.java
View File

@@ -15,10 +15,12 @@ public class MemberAreaStatisticsRespVO {
@Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer userCount;
// TODO @疯狂：要不 orderCreateUserCount 和 orderPayUserCount 貌似更统一一些；
@Schema(description = "订单创建数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer orderCreateCount;
@Schema(description = "订单支付数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "512")
private Integer orderPayCount;
@Schema(description = "订单支付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "622")
private Integer orderPayPrice;

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberSexStatisticsRespVO.java
View File

@@ -10,6 +10,7 @@ public class MemberSexStatisticsRespVO {
@Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer sex;
// TODO @疯狂：要不还是其它字段，我们也补全，这样方便使用的用户，做定制化；就保持和 MemberAreaStatisticsRespVO 一致；
@Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer userCount;

7
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberSummaryRespVO.java
View File

@@ -13,10 +13,11 @@ public class MemberSummaryRespVO {
@Schema(description = "充值会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "221")
private Integer rechargeUserCount;
@Schema(description = "充值金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@Schema(description = "充值金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer rechargePrice;
@Schema(description = "支出金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer expensePrice;
// TODO @疯狂：要不干脆这个字段改成：orderPayPrice？？
@Schema(description = "支出金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer expensePrice; // 只计算 mall 交易订单的支付金额，不考虑退款
}

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberTerminalStatisticsRespVO.java
View File

@@ -10,6 +10,7 @@ public class MemberTerminalStatisticsRespVO {
@Schema(description = "终端", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer terminal;
// TODO @疯狂：要不 orderCreateUserCount 和 orderPayUserCount 貌似更统一一些；
@Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer userCount;

5
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/TradeStatisticsController.java
View File

@@ -36,9 +36,11 @@ public class TradeStatisticsController {
@Operation(summary = "获得交易统计")
@PreAuthorize("@ss.hasPermission('statistics:trade:query')")
public CommonResult<TradeStatisticsComparisonRespVO<TradeSummaryRespVO>> getTradeSummaryComparison() {
// TODO @疯狂：这个要不要 tradeStatisticsService 调用里面的多个方法，组合出最终的 TradeSummaryRespVO；
return success(tradeStatisticsService.getTradeSummaryComparison());
}
// TODO @疯狂：【晚点再改和讨论；等首页的接口出来】这个要不还是叫 analyse，对比选中的时间段，和上一个时间段；类似 MemberStatisticsController 的 getMemberAnalyse
@GetMapping("/trend/summary")
@Operation(summary = "获得交易状况统计")
@PreAuthorize("@ss.hasPermission('statistics:trade:query')")
@@ -48,6 +50,8 @@ public class TradeStatisticsController {
ArrayUtil.get(reqVO.getTimes(), 1)));
}
// TODO 芋艿：已经 review
// TODO @疯狂：这个要不直接叫 list；它即使就是把每条统计拿出来
@GetMapping("/trend/list")
@Operation(summary = "获得交易状况明细")
@PreAuthorize("@ss.hasPermission('statistics:trade:query')")
@@ -57,6 +61,7 @@ public class TradeStatisticsController {
ArrayUtil.get(reqVO.getTimes(), 1)));
}
// TODO @疯狂：这个要不直接叫 export；它即使就是把每条统计导出
@GetMapping("/trend/export-excel")
@Operation(summary = "导出获得交易状况明细 Excel")
@PreAuthorize("@ss.hasPermission('statistics:trade:export')")

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeStatisticsComparisonRespVO.java
View File

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
// TODO @疯狂：是不是搞成公用的哈；类似，controller/admin/common，下面直接放它
@Schema(description = "管理后台 - 交易统计对照 Response VO")
@Data
@NoArgsConstructor

21
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryRespVO.java
View File

@@ -16,25 +16,26 @@ public class TradeTrendSummaryRespVO {
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate date;
// TODO @疯狂，要不加个 turnoverPrice？
@Schema(description = "营业额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer turnover;
private Integer turnover; // 营业额 = 商品支付金额 + 充值金额
@Schema(description = "商品支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@Schema(description = "订单支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer orderPayPrice;
@Schema(description = "订单退款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer orderRefundPrice;
@Schema(description = "支付佣金金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer brokerageSettlementPrice;
@Schema(description = "充值金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer rechargePrice;
@Schema(description = "支出金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer expensePrice;
private Integer expensePrice; // 余额支付金额 + 支付佣金金额 + 商品退款金额
@Schema(description = "余额支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer balancePrice;
@Schema(description = "支付佣金金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer brokerageSettlementPrice;
@Schema(description = "商品退款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer orderRefundPrice;
private Integer balancePrice; // TODO @疯狂：这个字段要不改成：walletPayPrice
}

4
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/convert/member/MemberStatisticsConvert.java
View File

@@ -5,6 +5,8 @@ import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.ip.core.Area;
import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSummaryRespVO;
import cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@@ -36,4 +38,6 @@ public interface MemberStatisticsConvert {
});
}
MemberSummaryRespVO convert(RechargeSummaryRespBO rechargeSummary, Integer expensePrice, Integer userCount);
}

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/trade/TradeStatisticsDO.java
View File

@@ -48,6 +48,7 @@ public class TradeStatisticsDO extends TenantBaseDO {
* 总支付金额，单位：分
*/
private Integer orderPayPrice;
// TODO @疯狂：这个字段改成 walletPayPrice，然后挪到 rechargePayCount 前面；
/**
* 总支付金额（余额），单位：分
*/

3
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/infra/ApiAccessLogStatisticsMapper.java
View File

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
// TODO @芋艿：api 访问日志，现在会清理，可能要单独有个偏业务的访问表；
/**
* API 访问日志的统计 Mapper
*
@@ -14,9 +15,11 @@ import java.time.LocalDateTime;
@Mapper
public interface ApiAccessLogStatisticsMapper extends BaseMapperX<Object> {
// TODO @疯狂：是不是 selectIpCount
Integer selectCountByIp(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
// TODO @疯狂：是不是 selectUserCount
Integer selectCountByUserId(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);

3
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/member/MemberStatisticsMapper.java
View File

@@ -17,10 +17,13 @@ import java.util.List;
@Mapper
public interface MemberStatisticsMapper extends BaseMapperX<Object> {
// TODO @芋艿：已经 review
// TODO @疯狂：要不还是搞下 bo？虽然可能冗余了点~~
List<MemberAreaStatisticsRespVO> selectSummaryListByAreaId();
List<MemberSexStatisticsRespVO> selectSummaryListBySex();
// TODO @芋艿：已经 review
Integer selectUserCount(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);

15
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/pay/PayWalletStatisticsMapper.java
View File

@@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.statistics.dal.mysql.pay;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSummaryRespVO;
import cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO;
import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
import cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO;
import cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -17,21 +17,24 @@ import java.time.LocalDateTime;
@Mapper
public interface PayWalletStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
// TODO 芋艿：已经 review；
WalletSummaryRespBO selectRechargeSummaryByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime,
@Param("payStatus") Boolean payStatus);
// TODO 芋艿：已经 review；
WalletSummaryRespBO selectRechargeSummaryByRefundTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime,
@Param("refundStatus") Integer refundStatus);
// TODO 芋艿：已经 review；
Integer selectPriceSummaryByBizTypeAndCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime,
@Param("bizType") Integer bizType);
// TODO @疯狂：是不是搞个单独的 BO 呀；
MemberSummaryRespVO selectRechargeSummaryGroupByWalletId(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime,
@Param("payStatus") Boolean payStatus);
// TODO 芋艿：已经 review；
RechargeSummaryRespBO selectRechargeSummaryGroupByWalletId(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime,
@Param("payStatus") Boolean payStatus);
}

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/AfterSaleStatisticsMapper.java
View File

@@ -16,6 +16,7 @@ import java.time.LocalDateTime;
@Mapper
public interface AfterSaleStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
// TODO 芋艿：已 review
AfterSaleSummaryRespBO selectSummaryByRefundTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);

6
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeOrderStatisticsMapper.java
View File

@@ -17,20 +17,26 @@ import java.util.List;
@Mapper
public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
// TODO 芋艿：已经 review
List<MemberAreaStatisticsRespVO> selectSummaryListByAreaId();
// TODO 芋艿：已经 review
Integer selectCountByCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
// TODO 芋艿：已经 review
Integer selectCountByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
// TODO 芋艿：已经 review
Integer selectSummaryPriceByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
// TODO 芋艿：已经 review
Integer selectUserCountByCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
// TODO 芋艿：已经 review
Integer selectUserCountByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);

6
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeStatisticsMapper.java
View File

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO
import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.time.LocalDateTime;
import java.util.List;
@@ -19,16 +18,13 @@ import java.util.List;
@Mapper
public interface TradeStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
// TODO @疯狂：这个要不要也挪到 xml 里，保持统一？
@Select("SELECT IFNULL(SUM(order_create_count), 0) AS count, IFNULL(SUM(order_pay_price), 0) AS summary " +
"FROM trade_statistics " +
"WHERE time BETWEEN #{beginTime} AND #{endTime} AND deleted = FALSE")
TradeSummaryRespBO selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
TradeTrendSummaryRespVO selectByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
// TODO @芋艿：已经 review
List<TradeTrendSummaryRespVO> selectListByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);

4
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/infra/ApiAccessLogStatisticsService.java
View File

@@ -9,6 +9,8 @@ import java.time.LocalDateTime;
*/
public interface ApiAccessLogStatisticsService {
// TODO @疯狂：需要传递 userType；因为访问日志，可能涉及多种用户类型；
// TODO @疯狂：方法名，要不改成 getUserCount；原因：让它更业务无关
/**
* 获取活跃用户数量
*
@@ -18,6 +20,8 @@ public interface ApiAccessLogStatisticsService {
*/
Integer getActiveUserCount(LocalDateTime beginTime, LocalDateTime endTime);
// TODO @疯狂：需要传递 userType；因为访问日志，可能涉及多种用户类型；
// TODO @疯狂：方法名，要不改成 getIpCount；原因：让它更业务无关
/**
* 获取访问用户数量
*

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/infra/ApiAccessLogStatisticsServiceImpl.java
View File

@@ -28,4 +28,5 @@ public class ApiAccessLogStatisticsServiceImpl implements ApiAccessLogStatistics
public Integer getVisitorUserCount(LocalDateTime beginTime, LocalDateTime endTime) {
return apiAccessLogStatisticsMapper.selectCountByIp(beginTime, endTime);
}
}

22
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsService.java
View File

@@ -15,13 +15,24 @@ import java.util.List;
*/
public interface MemberStatisticsService {
// TODO 芋艿：已经 review
/**
* 获取会员统计
* 获取会员统计（实时统计）
*
* @return 会员统计
*/
MemberSummaryRespVO getMemberSummary();
// TODO 芋艿：已经 review
/**
* 获取用户分析数据
*
* @param beginTime 起始时间
* @param endTime 截止时间
* @return 用户分析数据
*/
MemberAnalyseRespVO getMemberAnalyse(LocalDateTime beginTime, LocalDateTime endTime);
/**
* 按照省份，获得会员统计列表
*
@@ -36,13 +47,4 @@ public interface MemberStatisticsService {
*/
List<MemberSexStatisticsRespVO> getMemberSexStatisticsList();
/**
* 获取用户分析数据
*
* @param beginTime 起始时间
* @param endTime 截止时间
* @return 用户分析数据
*/
MemberAnalyseRespVO getMemberAnalyse(LocalDateTime beginTime, LocalDateTime endTime);
}

34
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
View File

@@ -5,14 +5,15 @@ import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.*;
import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
import cn.iocoder.yudao.module.statistics.convert.member.MemberStatisticsConvert;
import cn.iocoder.yudao.module.statistics.dal.mysql.member.MemberStatisticsMapper;
import cn.iocoder.yudao.module.statistics.service.infra.ApiAccessLogStatisticsService;
import cn.iocoder.yudao.module.statistics.service.pay.PayWalletStatisticsService;
import cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO;
import cn.iocoder.yudao.module.statistics.service.trade.TradeOrderStatisticsService;
import cn.iocoder.yudao.module.statistics.service.trade.TradeStatisticsService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import cn.iocoder.yudao.module.statistics.convert.member.MemberStatisticsConvert;
import javax.annotation.Resource;
import java.time.Duration;
@@ -46,19 +47,18 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
@Override
public MemberSummaryRespVO getMemberSummary() {
MemberSummaryRespVO vo = payWalletStatisticsService.getUserRechargeSummary(null, null);
RechargeSummaryRespBO rechargeSummary = payWalletStatisticsService.getUserRechargeSummary(null, null);
// TODO @疯狂：1）这里是实时统计，不好走走 TradeStatistics 表；2）因为这个放在商城下，所以只考虑订单数据，即按照 trade_order 的 pay_price 并且已支付来计算；
Integer expensePrice = tradeStatisticsService.getExpensePrice(null, null);
Integer userCount = memberStatisticsMapper.selectUserCount(null, null);
// 拼接数据
if (vo == null) {
vo = new MemberSummaryRespVO().setRechargeUserCount(0).setRechargePrice(0);
}
return vo.setUserCount(userCount).setExpensePrice(expensePrice);
return MemberStatisticsConvert.INSTANCE.convert(rechargeSummary, expensePrice, userCount);
}
@Override
public List<MemberAreaStatisticsRespVO> getMemberAreaStatisticsList() {
// 统计用户
// TODO @疯狂：要处理下，未知省份；就是没填写省份的情况；
// TODO @疯狂：可能得把每个省的用户，都查询出来，然后去 order 那边 in；因为要按照这些人为基础来计算；；用户规模量大可能不太好，但是暂时就先这样搞吧 = =
Map<Integer, Integer> userCountMap = convertMap(memberStatisticsMapper.selectSummaryListByAreaId(),
vo -> AreaUtils.getParentIdByType(vo.getAreaId(), AreaTypeEnum.PROVINCE),
MemberAreaStatisticsRespVO::getUserCount, Integer::sum);
@@ -74,22 +74,22 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
return MemberStatisticsConvert.INSTANCE.convertList(AreaUtils.getByType(AreaTypeEnum.PROVINCE, area -> area), userCountMap, orderMap);
}
@Override
public List<MemberSexStatisticsRespVO> getMemberSexStatisticsList() {
return memberStatisticsMapper.selectSummaryListBySex();
}
// TODO @疯狂：这个方法，要不拆成：1）controller 调用 getMemberAnalyseComparisonData；2）tradeOrderStatisticsService.getPayUserCount；3）tradeOrderStatisticsService.getOrderPayPrice；4）。。。
// TODO 就是说：分析交给 controller 去组合；
@Override
public MemberAnalyseRespVO getMemberAnalyse(LocalDateTime beginTime, LocalDateTime endTime) {
// 对照数据
MemberAnalyseComparisonRespVO vo = getMemberAnalyseComparisonData(beginTime, endTime);
// TODO @疯狂：如果时间段这么处理，会不会 beginTime 重叠了。因为是 <= 一个时间；如果数据库插入的是 ，xxxx-yy-zz 00:00:00 的话，它既满足 >= ? 也满足 <= ；（如果不好理解，微信聊)
LocalDateTime referenceBeginTime = beginTime.minus(Duration.between(beginTime, endTime));
MemberAnalyseComparisonRespVO reference = getMemberAnalyseComparisonData(referenceBeginTime, beginTime);
Integer payUserCount = tradeOrderStatisticsService.getPayUserCount(beginTime, endTime);
// 计算客单价
// TODO @疯狂：这个可能有点特殊，要按照 create_time 来查询；不然它的漏斗就不统一；因为是访问数量 > 今日下单人 > 今日支付人；是一个统一的维度；
Integer payUserCount = tradeOrderStatisticsService.getPayUserCount(beginTime, endTime);
int atv = 0;
if (payUserCount != null && payUserCount > 0) {
// TODO @疯狂：类似上面的 payUserCount
Integer payPrice = tradeOrderStatisticsService.getOrderPayPrice(beginTime, endTime);
atv = NumberUtil.div(payPrice, payUserCount).intValue();
}
@@ -103,11 +103,17 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
private MemberAnalyseComparisonRespVO getMemberAnalyseComparisonData(LocalDateTime beginTime, LocalDateTime endTime) {
Integer rechargeUserCount = Optional.ofNullable(payWalletStatisticsService.getUserRechargeSummary(beginTime, endTime))
.map(MemberSummaryRespVO::getRechargeUserCount).orElse(0);
.map(RechargeSummaryRespBO::getRechargeUserCount).orElse(0);
return new MemberAnalyseComparisonRespVO()
.setUserCount(memberStatisticsMapper.selectUserCount(beginTime, endTime))
.setActiveUserCount(apiAccessLogStatisticsService.getActiveUserCount(beginTime, endTime))
.setRechargeUserCount(rechargeUserCount);
}
@Override
public List<MemberSexStatisticsRespVO> getMemberSexStatisticsList() {
// TODO @疯狂：需要考虑，用户性别为空，则是“未知”
return memberStatisticsMapper.selectSummaryListBySex();
}
}

6
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/PayWalletStatisticsService.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.statistics.service.pay;
import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSummaryRespVO;
import cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO;
import cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO;
import java.time.LocalDateTime;
@@ -12,6 +12,7 @@ import java.time.LocalDateTime;
*/
public interface PayWalletStatisticsService {
// TODO 芋艿：已经 review
/**
* 获取钱包统计
*
@@ -21,6 +22,7 @@ public interface PayWalletStatisticsService {
*/
WalletSummaryRespBO getWalletSummary(LocalDateTime beginTime, LocalDateTime endTime);
// TODO 芋艿：已经 review
/**
* 获取钱包充值统计
*
@@ -28,6 +30,6 @@ public interface PayWalletStatisticsService {
* @param endTime 截止时间
* @return 钱包充值统计
*/
MemberSummaryRespVO getUserRechargeSummary(LocalDateTime beginTime, LocalDateTime endTime);
RechargeSummaryRespBO getUserRechargeSummary(LocalDateTime beginTime, LocalDateTime endTime);
}

4
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/PayWalletStatisticsServiceImpl.java
View File

@@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.statistics.service.pay;
import cn.iocoder.yudao.module.pay.enums.member.PayWalletBizTypeEnum;
import cn.iocoder.yudao.module.pay.enums.refund.PayRefundStatusEnum;
import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSummaryRespVO;
import cn.iocoder.yudao.module.statistics.dal.mysql.pay.PayWalletStatisticsMapper;
import cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO;
import cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -39,7 +39,7 @@ public class PayWalletStatisticsServiceImpl implements PayWalletStatisticsServic
}
@Override
public MemberSummaryRespVO getUserRechargeSummary(LocalDateTime beginTime, LocalDateTime endTime) {
public RechargeSummaryRespBO getUserRechargeSummary(LocalDateTime beginTime, LocalDateTime endTime) {
return payWalletStatisticsMapper.selectRechargeSummaryGroupByWalletId(beginTime, endTime, true);
}

17
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/bo/RechargeSummaryRespBO.java Normal file
View File

@@ -0,0 +1,17 @@
package cn.iocoder.yudao.module.statistics.service.pay.bo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
// TODO @疯狂：BO 不用写 swagger 注解哈，写注释就好啦；
@Schema(description = "管理后台 - 充值统计 Response VO")
@Data
public class RechargeSummaryRespBO {
@Schema(description = "充值会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "221")
private Integer rechargeUserCount;
@Schema(description = "充值金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer rechargePrice;
}

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/AfterSaleStatisticsService.java
View File

@@ -11,6 +11,7 @@ import java.time.LocalDateTime;
*/
public interface AfterSaleStatisticsService {
// TODO 芋艿：已经 review
/**
* 获取售后单统计
*

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/BrokerageStatisticsService.java
View File

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
*/
public interface BrokerageStatisticsService {
// TODO 芋艿：已经 review
/**
* 获取已结算的佣金金额
*

6
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsService.java
View File

@@ -22,6 +22,7 @@ public interface TradeOrderStatisticsService {
*/
TradeOrderSummaryRespBO getOrderSummary(LocalDateTime beginTime, LocalDateTime endTime);
// TODO 芋艿：已经 review
/**
* 获取地区订单统计
*
@@ -29,15 +30,17 @@ public interface TradeOrderStatisticsService {
*/
List<MemberAreaStatisticsRespVO> getSummaryListByAreaId();
// TODO 芋艿：已经 review
/**
* 获取下单用户数量
*
* @param beginTime 起始时间
* @param endTime 截止时间
* @return 支付下单数量
* @return 下单用户数量
*/
Integer getOrderUserCount(LocalDateTime beginTime, LocalDateTime endTime);
// TODO 芋艿：已经 review
/**
* 获取支付用户数量
*
@@ -47,6 +50,7 @@ public interface TradeOrderStatisticsService {
*/
Integer getPayUserCount(LocalDateTime beginTime, LocalDateTime endTime);
// TODO 芋艿：已经 review
/**
* 获取支付金额
*

3
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeStatisticsService.java
View File

@@ -32,6 +32,8 @@ public interface TradeStatisticsService {
/**
* 获得交易状况统计
*
* @param beginTime 开始时间
* @param endTime 结束时间
* @return 统计数据对照
*/
Integer getExpensePrice(LocalDateTime beginTime, LocalDateTime endTime);
@@ -43,6 +45,7 @@ public interface TradeStatisticsService {
*/
List<TradeTrendSummaryRespVO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime);
// TODO 芋艿：已经 review；
/**
* 统计昨日交易
*

52
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeStatisticsServiceImpl.java
View File

@@ -57,6 +57,30 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
return TradeStatisticsConvert.INSTANCE.convert(yesterdayData, beforeYesterdayData, monthData, lastMonthData);
}
/**
* 统计指定日期的交易数据
*
* @param days 增加的天数
* @return 交易数据
*/
private TradeSummaryRespBO getTradeSummaryByDays(int days) {
LocalDateTime date = LocalDateTime.now().plusDays(days);
return tradeStatisticsMapper.selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(
LocalDateTimeUtil.beginOfDay(date), LocalDateTimeUtil.endOfDay(date));
}
/**
* 统计指定月份的交易数据
*
* @param months 增加的月数
* @return 交易数据
*/
private TradeSummaryRespBO getTradeSummaryByMonths(int months) {
LocalDateTime monthDate = LocalDateTime.now().plusMonths(months);
return tradeStatisticsMapper.selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(
LocalDateTimeUtils.beginOfMonth(monthDate), LocalDateTimeUtils.endOfMonth(monthDate));
}
@Override
public TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO> getTradeTrendSummaryComparison(LocalDateTime beginTime,
LocalDateTime endTime) {
@@ -73,6 +97,7 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
return tradeStatisticsMapper.selectExpensePriceByTimeBetween(beginTime, endTime);
}
// TODO @疯狂：是不是直接返回 TradeStatisticsDO；上层在去聚合？
@Override
public List<TradeTrendSummaryRespVO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime) {
return tradeStatisticsMapper.selectListByTimeBetween(beginTime, endTime);
@@ -80,6 +105,9 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
@Override
public String statisticsYesterdayTrade() {
// TODO @疯狂：如果已经统计，则跳过；
// TODO @疯狂：改成 statisticsTrade，然后传入 days，统计多少天；days 通过 job 传参；方便把历史给统计出来；或者大家有的时候要修复数据（会 fix 业务数据，然后清理统计表），重新统计的时候；
// 1. 从各个数据表，统计对应数据
LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(yesterday);
LocalDateTime endTime = LocalDateTimeUtil.endOfDay(yesterday);
@@ -108,28 +136,4 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
return stopWatch.prettyPrint();
}
/**
* 统计指定日期的交易数据
*
* @param days 增加的天数
* @return 交易数据
*/
private TradeSummaryRespBO getTradeSummaryByDays(int days) {
LocalDateTime date = LocalDateTime.now().plusDays(days);
return tradeStatisticsMapper.selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(
LocalDateTimeUtil.beginOfDay(date), LocalDateTimeUtil.endOfDay(date));
}
/**
* 统计指定月份的交易数据
*
* @param months 增加的月数
* @return 交易数据
*/
private TradeSummaryRespBO getTradeSummaryByMonths(int months) {
LocalDateTime monthDate = LocalDateTime.now().plusMonths(months);
return tradeStatisticsMapper.selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(
LocalDateTimeUtils.beginOfMonth(monthDate), LocalDateTimeUtils.endOfMonth(monthDate));
}
}

2
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml
View File

@@ -3,6 +3,7 @@
<mapper namespace="cn.iocoder.yudao.module.statistics.dal.mysql.infra.ApiAccessLogStatisticsMapper">
<select id="selectCountByIp" resultType="java.lang.Integer">
<!-- TODO @疯狂：distinct 会不会更合适哈 -->
SELECT COUNT(1)
FROM infra_api_access_log
WHERE create_time BETWEEN #{beginTime} AND #{endTime}
@@ -11,6 +12,7 @@
</select>
<select id="selectCountByUserId" resultType="java.lang.Integer">
<!-- TODO @疯狂：distinct 会不会更合适哈 -->
SELECT COUNT(1)
FROM infra_api_access_log
WHERE user_id > 0

4
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/member/MemberStatisticsMapper.xml
View File

@@ -8,8 +8,6 @@
FROM member_user
WHERE deleted = FALSE
GROUP BY area_id
<!-- TODO @疯狂：order by 是不是交给内存哈 -->
ORDER BY userCount DESC
</select>
<select id="selectSummaryListBySex"
@@ -18,8 +16,6 @@
FROM member_user
WHERE deleted = FALSE
GROUP BY sex
<!-- TODO @疯狂：order by 是不是交给内存哈 -->
ORDER BY userCount DESC
</select>
<select id="selectUserCount" resultType="java.lang.Integer">

4
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/pay/PayWalletStatisticsMapper.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.statistics.dal.mysql.pay.PayWalletStatisticsMapper">
<select id="selectRechargeSummaryByPayTimeBetween"
resultType="cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO">
SELECT COUNT(1) AS rechargePayCount,
@@ -30,7 +31,8 @@
</select>
<select id="selectRechargeSummaryGroupByWalletId"
resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSummaryRespVO">
resultType="cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO">
<!-- TODO @疯狂：是不是不用 group by，而是通过 DISTINCT wallet_id 更合适哈？ -->
SELECT COUNT(1) AS rechargeUserCount,
SUM(pay_price) AS rechargePrice
FROM pay_wallet_recharge

12
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeStatisticsMapper.xml
View File

@@ -2,6 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.statistics.dal.mysql.trade.TradeStatisticsMapper">
<select id="selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween"
resultType="cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO">
SELECT IFNULL(SUM(order_create_count), 0) AS count,
IFNULL(SUM(order_pay_price), 0) AS summary
FROM trade_statistics
WHERE time BETWEEN #{beginTime} AND #{endTime}
AND deleted = FALSE
</select>
<select id="selectByTimeBetween"
resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO">
SELECT
@@ -34,13 +43,14 @@
FROM trade_statistics
WHERE time BETWEEN #{beginTime} AND #{endTime}
AND deleted = FALSE
<!-- TODO @疯狂：已经不用 group by，它就是每天统计一条； -->
GROUP BY date
</select>
<select id="selectExpensePriceByTimeBetween" resultType="java.lang.Integer">
SELECT -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
FROM trade_statistics
FROM trade_statistics
WHERE deleted = FALSE
<if test="beginTime != null">
AND time >= #{beginTime}

3
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java
View File

@@ -20,7 +20,8 @@ public enum TradeOrderOperateTypeEnum {
ADMIN_DELIVERY(20, "已发货，快递公司：{deliveryName}，快递单号：{logisticsNo}"),
MEMBER_RECEIVE(30, "用户已收货"),
SYSTEM_RECEIVE(31, "到期未收货，系统自动确认收货"),
PICK_UP_RECEIVE(32, "自提收货"),
ADMIN_PICK_UP_RECEIVE(32, "管理员自提收货"),
MEMBER_PICK_UP_RECEIVE(32, "用户自提收货"),
MEMBER_COMMENT(33, "用户评价"),
SYSTEM_COMMENT(34, "到期未评价，系统自动评价"),
MEMBER_CANCEL(40, "取消订单"),

8
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
View File

@@ -126,11 +126,17 @@ public class TradeOrderController {
return success(true);
}
// TODO @疯狂：1、在【订单列表】界面，增加一个【核销按钮】。点击后，弹窗出一个核销码输入的窗口。
//
//2、输入核销码后，点击确认，基于 code 查询对应的订单，之后弹窗展示。
//
//3、新的弹窗，下面有个【确认核销】按钮。确认后，进行订单核销逻辑。注意，只有门店自提的订单，才可以核销。
// TODO 这里的 id 应该是 pickUpVerifyCode 参数哈；
@PutMapping("/pick-up")
@Operation(summary = "订单核销")
@PreAuthorize("@ss.hasPermission('trade:order:pick-up')")
public CommonResult<Boolean> pickUpOrder(@RequestParam("id") Long id) {
tradeOrderUpdateService.pickUpOrder(id);
tradeOrderUpdateService.pickUpOrderByMember(id);
return success(true);
}

6
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
View File

@@ -120,14 +120,14 @@ public interface TradeOrderUpdateService {
*
* @param id 订单编号
*/
void pickUpOrder(Long id);
void pickUpOrderByMember(Long id);
/**
* 【管理员】核销订单
*
* @param pickUpVerifyCode 自提核销码
*/
void pickUpOrder(String pickUpVerifyCode);
void pickUpOrderByAdmin(String pickUpVerifyCode);
// =================== Order Item ===================
@@ -178,9 +178,9 @@ public interface TradeOrderUpdateService {
* @param combinationRecordId 拼团记录编号
* @param headId 团长编号
*/
// TODO 芋艿：再 review 拼团
void updateOrderCombinationInfo(Long orderId, Long activityId, Long combinationRecordId, Long headId);
// TODO 芋艿：拼团取消，不调这个接口哈；
/**
* 取消支付订单
*

8
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
View File

@@ -670,17 +670,18 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
}
@Override
public void pickUpOrder(Long id) {
@TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_PICK_UP_RECEIVE)
public void pickUpOrderByMember(Long id) {
getSelf().pickUpOrder(tradeOrderMapper.selectById(id));
}
@Override
public void pickUpOrder(String pickUpVerifyCode) {
@TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ADMIN_PICK_UP_RECEIVE)
public void pickUpOrderByAdmin(String pickUpVerifyCode) {
getSelf().pickUpOrder(tradeOrderMapper.selectOneByPickUpVerifyCode(pickUpVerifyCode));
}
@Transactional(rollbackFor = Exception.class)
@TradeOrderLog(operateType = TradeOrderOperateTypeEnum.PICK_UP_RECEIVE)
public void pickUpOrder(TradeOrderDO order) {
if (order == null) {
throw exception(ORDER_NOT_FOUND);
@@ -688,7 +689,6 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
if (ObjUtil.notEqual(DeliveryTypeEnum.PICK_UP.getType(), order.getDeliveryType())) {
throw exception(ORDER_RECEIVE_FAIL_DELIVERY_TYPE_NOT_PICK_UP);
}
// todo 校验核销操作人？
receiveOrder0(order);
}