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

sql/mysql/pay_wallet.sql

@@ -1,78 +1,3 @@
--- ----------------------------
--- 会员钱包表
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet`;
-CREATE TABLE `pay_wallet`
-(
-    `id`                   bigint   NOT NULL AUTO_INCREMENT COMMENT '编号',
-    `user_id`              bigint   NOT NULL COMMENT '用户编号',
-    `user_type`            tinyint  NOT NULL DEFAULT 0 COMMENT '用户类型',
-    `balance`              int      NOT NULL DEFAULT 0 COMMENT '余额，单位分',
-    `total_expense`        int      NOT NULL DEFAULT 0 COMMENT '累计支出，单位分',
-    `total_recharge`       int      NOT NULL DEFAULT 0 COMMENT '累计充值，单位分',
-    `freeze_price`         int      NOT NULL DEFAULT 0 COMMENT '冻结金额，单位分',
-    `creator`              varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-    `create_time`          datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`              varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-    `update_time`          datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`              bit(1)   NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`            bigint   NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB COMMENT='会员钱包表';
-
--- ----------------------------
--- 会员钱包流水表
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet_transaction`;
-CREATE TABLE `pay_wallet_transaction`
-(
-    `id`               bigint       NOT NULL AUTO_INCREMENT COMMENT '编号',
-    `wallet_id`        bigint       NOT NULL COMMENT '会员钱包 id',
-    `biz_type`         tinyint      NOT NULL COMMENT '关联类型',
-    `biz_id`           varchar(64)  NOT NULL COMMENT '关联业务编号',
-    `no`               varchar(64)  NOT NULL COMMENT '流水号',
-    `title`            varchar(128) NOT NULL COMMENT '流水标题',
-    `price`            int          NOT NULL COMMENT '交易金额, 单位分',
-    `balance`          int          NOT NULL COMMENT '余额, 单位分',
-    `creator`          varchar(64)  CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-    `create_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`          varchar(64)  CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-    `update_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`          bit(1)       NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`        bigint       NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB COMMENT='会员钱包流水表';
-
--- ----------------------------
--- 会员钱包充值
--- ----------------------------
-DROP TABLE IF EXISTS `pay_wallet_recharge`;
-CREATE TABLE `pay_wallet_recharge`
-(
-    `id`                            bigint      NOT NULL AUTO_INCREMENT COMMENT '编号',
-    `wallet_id`                     bigint      NOT NULL COMMENT '会员钱包 id',
-    `total_price`                   int         NOT NULL COMMENT '用户实际到账余额，例如充 100 送 20，则该值是 120',
-    `pay_price`                     int         NOT NULL COMMENT '实际支付金额',
-    `bonus_price`                   int         NOT NULL COMMENT '钱包赠送金额',
-    `pay_status`                    bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否已支付：[0:未支付 1:已经支付过]',
-    `pay_order_id`                  bigint      NULL COMMENT '支付订单编号',
-    `pay_channel_code`              varchar(16) NULL COMMENT '支付成功的支付渠道',
-    `pay_time`                      datetime    NULL COMMENT '订单支付时间',
-    `pay_refund_id`                 bigint      NULL COMMENT '支付退款单编号',
-    `refund_total_price`            int         NOT NULL DEFAULT 0 COMMENT '退款金额，包含赠送金额',
-    `refund_pay_price`              int         NOT NULL DEFAULT 0 COMMENT '退款支付金额',
-    `refund_bonus_price`            int         NOT NULL DEFAULT 0 COMMENT '退款钱包赠送金额',
-    `refund_time`                   datetime    NULL COMMENT '退款时间',
-    `refund_status`                 int         NOT NULL DEFAULT 0 COMMENT '退款状态',
-    `creator`         varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-    `create_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-    `update_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`        bit(1)   NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`      bigint   NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB COMMENT='会员钱包充值';
-
 -- ----------------------------
 -- 转账单表
 -- ----------------------------

yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
+// TODO @小吉祥：搞个 job，清理 14 天外的访问日志；
 /**
  * API 访问日志
  *

yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
+// TODO @小吉祥：搞个 job，清理 14 天外的异常日志；
 /**
  * API 错误日志
  *

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImpl.java

@@ -70,4 +70,5 @@ public class JobLogServiceImpl implements JobLogService {
         return jobLogMapper.selectList(exportReqVO);
     }
 
+    // TODO @小吉祥：每天 0 点的时候，清理超过 14 天的日志；
 }

yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/member/package-info.java → yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/package-info.java

@@ -6,4 +6,4 @@
  * 4. 地域统计
  * 5. 会员概览
  */
-package cn.iocoder.yudao.module.statistics.controller.member;
+package cn.iocoder.yudao.module.statistics.controller.admin.member;

yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/product/ProductStatisticsController.java → yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/product/ProductStatisticsController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.statistics.controller.product;
+package cn.iocoder.yudao.module.statistics.controller.admin.product;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;

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

@@ -32,6 +32,7 @@ public class TradeStatisticsController {
     @Resource
     private TradeStatisticsService tradeStatisticsService;
 
+    // TODO @疯狂：要不这个就是 /trend/summary 的特例，前端自己查询两次？
     @GetMapping("/summary")
     @Operation(summary = "获得交易统计")
     @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
@@ -39,6 +40,7 @@ public class TradeStatisticsController {
         return success(tradeStatisticsService.getTradeSummaryComparison());
     }
 
+    // TODO @疯狂：直接 comparison？主要 trend 和 comparison 二选一，一个是数据趋势，一个是数据对比哈；
     @GetMapping("/trend/summary")
     @Operation(summary = "获得交易状况统计")
     @PreAuthorize("@ss.hasPermission('statistics:trade:query')")

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

@@ -36,4 +36,5 @@ public class TradeTrendSummaryRespVO {
 
     @Schema(description = "商品退款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Integer orderRefundPrice;
+
 }

yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/app/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * TODO 芋艿：占位
+ */
+package cn.iocoder.yudao.module.statistics.controller.app;

yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.yudao.module.statistics.controller;

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

@@ -26,7 +26,8 @@ public interface TradeStatisticsService {
      *
      * @return 统计数据对照
      */
-    TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO> getTradeTrendSummaryComparison(LocalDateTime beginTime, LocalDateTime endTime);
+    TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO> getTradeTrendSummaryComparison(
+            LocalDateTime beginTime, LocalDateTime endTime);
 
     /**
      * 获得交易状况明细
@@ -34,4 +35,5 @@ public interface TradeStatisticsService {
      * @return 统计数据列表
      */
     List<TradeTrendSummaryRespVO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime);
+
 }

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

@@ -79,6 +79,7 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
      * @return 交易数据
      */
     private TradeSummaryRespBO getTradeSummaryByMonths(int months) {
+        // TODO @疯狂：可以在 LocalDateUtils 封装方法；获得月份的开始；以及结束两个方法；然后这里就可以直接调用了
         // 月份开始时间
         LocalDateTime beginOfMonth = LocalDateTime.now()
                 .plusMonths(months)

yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/bo/TradeSummaryRespBO.java

@@ -19,4 +19,5 @@ public class TradeSummaryRespBO {
      * 合计
      */
     private Integer summary;
+
 }

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

@@ -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.trade.TradeStatisticsMapper">
+
     <select id="selectByTimeBetween"
             resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO">
         SELECT
@@ -35,4 +36,5 @@
           AND deleted = FALSE
         GROUP BY date
     </select>
+
 </mapper>

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageUserMapper.java

@@ -139,7 +139,7 @@ public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
                                                                                   @Param("endTime") LocalDateTime endTime);
 
     IPage<AppBrokerageUserChildSummaryRespVO> selectSummaryPageByUserId(Page<?> page,
-                                                                        @Param("ids") List<Long> ids,
+                                                                        @Param("ids") List<Long> ids, // BrokerageUser 的 ids 数组
                                                                         @Param("bizType") Integer bizType,
                                                                         @Param("status") Integer status,
                                                                         @Param("bindUserIds") List<Long> bindUserIds,

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java

@@ -230,12 +230,15 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
                 ? Collections.emptyList()
                 : convertList(memberUserApi.getUserListByNickname(pageReqVO.getNickname()), MemberUserRespDTO::getId);
         // 1.2 生成推广员编号列表
+        // TODO @疯狂：是不是可以先 1.2 查询出来，然后查询对应的昵称，进行过滤？避免昵称过滤返回的 id 过多；
         List<Long> bindUserIds = buildBindUserIdsByLevel(userId, pageReqVO.getLevel());
+
         // 2. 分页查询
         IPage<AppBrokerageUserChildSummaryRespVO> pageResult = brokerageUserMapper.selectSummaryPageByUserId(
                 MyBatisUtils.buildPage(pageReqVO), ids, BrokerageRecordBizTypeEnum.ORDER.getType(),
                 BrokerageRecordStatusEnum.SETTLEMENT.getStatus(), bindUserIds, pageReqVO.getSortingField()
         );
+
         // 3. 拼接数据并返回
         List<Long> userIds = convertList(pageResult.getRecords(), AppBrokerageUserChildSummaryRespVO::getId);
         Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(userIds);

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -120,6 +120,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
         return getExpressTrackList(order);
     }
 
+    // TODO @puhui999：可以加个 spring 缓存，30 分钟；主要考虑及时性要求不高，但是每次调用需要钱；
     /**
      * 获得订单的物流轨迹
      *

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/signin/MemberSignInRecordDO.java

@@ -39,4 +39,6 @@ public class MemberSignInRecordDO extends BaseDO {
      */
     private Integer point;
 
+    // TODO 疯狂：签到的经验
+
 }

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java

@@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.pay.convert.order.PayOrderConvert;
 import cn.iocoder.yudao.module.pay.dal.dataobject.app.PayAppDO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderExtensionDO;
-import cn.iocoder.yudao.module.pay.framework.pay.wallet.WalletPayClient;
+import cn.iocoder.yudao.module.pay.framework.pay.core.WalletPayClient;
 import cn.iocoder.yudao.module.pay.service.app.PayAppService;
 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
 import com.google.common.collect.Maps;

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletRechargeController.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.pay.controller.admin.wallet;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
 import cn.iocoder.yudao.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
 import cn.iocoder.yudao.module.pay.service.wallet.PayWalletRechargeService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.annotation.security.PermitAll;
+import javax.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
@@ -27,12 +29,22 @@ public class PayWalletRechargeController {
     @Resource
     private PayWalletRechargeService walletRechargeService;
 
+    @PostMapping("/update-paid")
+    @Operation(summary = "更新钱包充值为已充值") // 由 pay-module 支付服务，进行回调，可见 PayNotifyJob
+    @PermitAll // 无需登录， 内部校验实现
+    @OperateLog(enable = false) // 禁用操作日志，因为没有操作人
+    public CommonResult<Boolean> updateWalletRechargerPaid(@Valid @RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
+        walletRechargeService.updateWalletRechargerPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
+                notifyReqDTO.getPayOrderId());
+        return success(true);
+    }
 
+    // TODO @jason：发起退款，要 post 操作哈；
     @GetMapping("/refund")
     @Operation(summary = "发起钱包充值退款")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     public CommonResult<Boolean> refundWalletRecharge(@RequestParam("id") Long id) {
-        walletRechargeService.refundWalletRecharge(id,getClientIP());
+        walletRechargeService.refundWalletRecharge(id, getClientIP());
         return success(true);
     }
 

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java

@@ -1,12 +1,15 @@
 package cn.iocoder.yudao.module.pay.controller.app.order;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderRespVO;
 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
 import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
 import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
 import cn.iocoder.yudao.module.pay.convert.order.PayOrderConvert;
+import cn.iocoder.yudao.module.pay.framework.pay.core.WalletPayClient;
 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
+import com.google.common.collect.Maps;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,8 +19,13 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
+import java.util.Map;
+import java.util.Objects;
+
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
 
 @Tag(name = "用户 APP - 支付订单")
 @RestController
@@ -40,6 +48,16 @@ public class AppPayOrderController {
     @PostMapping("/submit")
     @Operation(summary = "提交支付订单")
     public CommonResult<AppPayOrderSubmitRespVO> submitPayOrder(@RequestBody AppPayOrderSubmitReqVO reqVO) {
+        // 1. 钱包支付事，需要额外传 user_id 和 user_type
+        if (Objects.equals(reqVO.getChannelCode(), PayChannelEnum.WALLET.getCode())) {
+            Map<String, String> channelExtras = reqVO.getChannelExtras() == null ?
+                    Maps.newHashMapWithExpectedSize(2) : reqVO.getChannelExtras();
+            channelExtras.put(WalletPayClient.USER_ID_KEY, String.valueOf(getLoginUserId()));
+            channelExtras.put(WalletPayClient.USER_TYPE_KEY, String.valueOf(getLoginUserType()));
+            reqVO.setChannelExtras(channelExtras);
+        }
+
+        // 2. 提交支付
         PayOrderSubmitRespVO respVO = payOrderService.submitOrder(reqVO, getClientIP());
         return success(PayOrderConvert.INSTANCE.convert3(respVO));
     }

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletRechargeController.java

@@ -1,8 +1,6 @@
 package cn.iocoder.yudao.module.pay.controller.app.wallet;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
 import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateReqVO;
 import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateRespVO;
 import cn.iocoder.yudao.module.pay.convert.wallet.PayWalletRechargeConvert;
@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -44,13 +41,4 @@ public class AppPayWalletRechargeController {
         return success(PayWalletRechargeConvert.INSTANCE.convert(walletRecharge));
     }
 
-    @PostMapping("/update-paid")
-    @Operation(summary = "更新钱包充值为已充值") // 由 pay-module 支付服务，进行回调，可见 PayNotifyJob
-    @PermitAll // 无需登录，安全由 内部校验实现
-    @OperateLog(enable = false) // 禁用操作日志，因为没有操作人
-    public CommonResult<Boolean> updateWalletRechargerPaid(@Valid @RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
-        walletRechargeService.updateWalletRechargerPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
-                notifyReqDTO.getPayOrderId());
-        return success(true);
-    }
 }

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletRechargePackageController.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.pay.controller.app.wallet;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.recharge.AppPayWalletPackageRespVO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 APP - 钱包充值套餐")
+@RestController
+@RequestMapping("/pay/wallet-recharge-package")
+@Validated
+@Slf4j
+public class AppPayWalletRechargePackageController {
+
+    @GetMapping("/list")
+    @Operation(summary = "获得钱包充值套餐列表")
+    public CommonResult<List<AppPayWalletPackageRespVO>> getWalletRechargePackageList() {
+        // 只查询开启；需要按照 payPrice 排序；
+        List<AppPayWalletPackageRespVO> list = new ArrayList<>();
+        list.add(new AppPayWalletPackageRespVO().setId(1L).setName("土豆").setPayPrice(10).setBonusPrice(2));
+        list.add(new AppPayWalletPackageRespVO().setId(2L).setName("番茄").setPayPrice(20).setBonusPrice(5));
+        return success(list);
+    }
+
+}

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletPackageRespVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.pay.controller.app.wallet.vo.recharge;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "用户 APP - 用户充值套餐 Response VO")
+@Data
+public class AppPayWalletPackageRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+    @Schema(description = "套餐名", requiredMode = Schema.RequiredMode.REQUIRED, example = "小套餐")
+    private String name;
+
+    @Schema(description = "支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    private Integer payPrice;
+    @Schema(description = "赠送金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
+    private Integer bonusPrice;
+
+}

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java

@@ -3,24 +3,27 @@ package cn.iocoder.yudao.module.pay.controller.app.wallet.vo.recharge;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 
 @Schema(description = "用户 APP - 创建钱包充值 Request VO")
 @Data
 public class AppPayWalletRechargeCreateReqVO {
 
     @Schema(description = "支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
-    @NotNull(message = "支付金额不能为空")
+//    @NotNull(message = "支付金额不能为空")
     @Min(value = 1,  message = "支付金额必须大于零")
     private Integer payPrice;
 
     // TODO @jason：这个是不是后端计算出来呀？不然前端可以直接搞了。。。
     // TOTO 那是不是搞一个充值模板
     @Schema(description = "钱包赠送金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
-    @NotNull(message = "钱包赠送金额不能为空")
-    @DecimalMin(value = "0",  message = "钱包赠送金额必须大于等于零")
-    private Integer bonusPrice;
+//    @NotNull(message = "钱包赠送金额不能为空")
+//    @DecimalMin(value = "0",  message = "钱包赠送金额必须大于等于零")
+    private Integer bonusPrice = 0;
+
+    @Schema(description = "充值套餐编号", example = "1024")
+    private Long packageId;
+
+    // TODO @jason：可以改成 payPrice 和 packageId 两个至少一个不为空；
 
 }

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/wallet/AppPayWalletRespVO.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.pay.controller.app.wallet.vo.wallet;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "用户 APP - 获取用户钱包 Response VO")
+@Schema(description = "用户 APP - 用户钱包 Response VO")
 @Data
 public class AppPayWalletRespVO {
 

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/wallet/PayWalletRechargeDO.java

@@ -47,6 +47,7 @@ public class PayWalletRechargeDO extends BaseDO {
      * 钱包赠送金额
      */
     private Integer bonusPrice;
+    // TODO @jason：如果有赠送金额，需要关联下 PayWalletPackageDO 的 id 字段
 
     /**
      * 是否已支付

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/wallet/PayWalletRechargePackageDO.java

@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.pay.dal.dataobject.wallet;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 会员钱包充值套餐 DO
+ *
+ * 通过套餐充值时，可以赠送一定金额；
+ *
+ * @author 芋道源码
+ */
+@TableName(value ="pay_wallet_recharge_package")
+@KeySequence("pay_wallet_recharge_package_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+public class PayWalletRechargePackageDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 套餐名
+     */
+    private String name;
+
+    /**
+     * 支付金额
+     */
+    private Integer payPrice;
+    /**
+     * 赠送金额
+     */
+    private Integer bonusPrice;
+
+    /**
+     * 状态
+     *
+     * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
+     */
+    private Integer status;
+
+}

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/wallet/WalletPayClient.java → yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/WalletPayClient.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.pay.framework.pay.wallet;
+package cn.iocoder.yudao.module.pay.framework.pay.core;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 占位，无实际作用
- */
-package cn.iocoder.yudao.module.pay.framework.pay.core;

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.pay.controller.admin.channel.vo.PayChannelUpdateR
 import cn.iocoder.yudao.module.pay.convert.channel.PayChannelConvert;
 import cn.iocoder.yudao.module.pay.dal.dataobject.channel.PayChannelDO;
 import cn.iocoder.yudao.module.pay.dal.mysql.channel.PayChannelMapper;
+import cn.iocoder.yudao.module.pay.framework.pay.core.WalletPayClient;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import lombok.Getter;
@@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.time.Duration;
@@ -68,6 +70,14 @@ public class PayChannelServiceImpl implements PayChannelService {
     @Resource
     private Validator validator;
 
+    /**
+     * 初始化，为了注册钱包
+     */
+    @PostConstruct
+    public void init() {
+        payClientFactory.registerPayClientClass(PayChannelEnum.WALLET, WalletPayClient.class);
+    }
+
     @Override
     public Long createChannel(PayChannelCreateReqVO reqVO) {
         // 断言是否有重复的

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java

@@ -40,6 +40,7 @@ import static cn.iocoder.yudao.module.pay.enums.refund.PayRefundStatusEnum.*;
 @Service
 @Slf4j
 public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
+    
     /**
      * TODO 放到 配置文件中
      */

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/util/PaySeqUtils.java

@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.module.pay.util;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-
-import java.time.LocalDateTime;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * 支付相关编号的生产
- */
-// TODO @jason：需要改造，基于 db；
-public class PaySeqUtils {
-
-    private static final AtomicLong REFUND_REQ_NO_SEQ = new AtomicLong(0L);
-
-    private static final AtomicLong MER_REFUND_NO_SEQ = new AtomicLong(0L);
-
-    private static final AtomicLong MER_ORDER_NO_SEQ = new AtomicLong(0L);
-
-    // TODO 芋艿：需要看看
-    /**
-     * 生成商户退款单号，用于测试，应该由商户系统生成
-     * @return 商户退款单
-     */
-    public static String genMerchantRefundNo() {
-        return String.format("%s%s%04d", "MR",
-                DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_MS_PATTERN),
-                (int) MER_REFUND_NO_SEQ.getAndIncrement() % 10000);
-    }
-
-    // TODO 芋艿：需要看看
-
-    /**
-     * 生成退款请求号
-     * @return 退款请求号
-     */
-    public static String genRefundReqNo() {
-        return String.format("%s%s%04d", "RR",
-                DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_MS_PATTERN),
-                (int) REFUND_REQ_NO_SEQ.getAndIncrement() % 10000);
-    }
-
-    /**
-     * 生成商户订单编号号 用于测试，应该由商户系统生成
-     * @return 商户订单编号
-     */
-    public static String genMerchantOrderNo() {
-        return String.format("%s%s%04d", "MO",
-                DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_MS_PATTERN),
-                (int) MER_ORDER_NO_SEQ.getAndIncrement() % 10000);
-    }
-
-}