BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 3c6c8aab01ca2e72b973e4a77d7f84a34f48710e

Authored by 芋道源码
Committed by Gitee
2 parents d842708c b1e01290

!672 Review代码修改 

Merge pull request !672 from 疯狂的世界/feature/mall_product
Inline Side-by-side
Showing 35 changed files with 221 additions and 148 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
  View file @3c6c8aa
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-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/MemberStatisticsController.java
  View file @3c6c8aa
... ... @@ -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,12 +93,11 @@ 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  
106 103 // TODO 芋艿：已经 review
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberCountRespVO.java
  View file @3c6c8aa
... ... @@ -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 @3c6c8aa
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 @3c6c8aa
  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 @3c6c8aa
... ... @@ -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
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryExcelVO.java
  View file @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
  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 @3c6c8aa
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 @3c6c8aa
... ... @@ -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 @3c6c8aa
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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
  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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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/service/order/TradeOrderUpdateService.java
  View file @3c6c8aa
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 @3c6c8aa
... ... @@ -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/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
  View file @3c6c8aa
... ... @@ -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 @3c6c8aa
... ... @@ -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 @3c6c8aa
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 @3c6c8aa
... ... @@ -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 @3c6c8aa
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 @3c6c8aa
... ... @@ -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 消息：用户创建
... ...