Merge remote-tracking branch 'origin/feature/mall_product' into brokerate

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java

@@ -39,7 +39,7 @@ public interface ErrorCodeConstants {
     ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1004009001, "签到天数规则已存在");
 
     //========== 签到配置 1004010000 ==========
-
+    ErrorCode SIGN_IN_RECORD_TODAY_EXISTS = new ErrorCode(1004010000,"今日已签到，请勿重复签到");
 
     //========== 用户等级 1004011000 ==========
     ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1004011000, "用户等级不存在");

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInController.java

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.member.controller.app.signin;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
+import cn.iocoder.yudao.module.member.service.signin.MemberSignInRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+// TODO @xiaqing：sign-in
+@Tag(name = "签到APP - 签到")
+@RestController
+@RequestMapping("/member/signin")
+public class AppMemberSignInController {
+
+    @Resource
+    private MemberSignInRecordService signInRecordService;
+
+    // TODO @xiaqing：泛型：
+    // TODO @xiaqing：合并到 AppMemberSignInRecordController 的 getSignInRecordSummary 里哈。
+    @Operation(summary = "个人签到信息")
+    @GetMapping("/get-summary")
+    public CommonResult getUserSummary(){
+        return success(signInRecordService.getSignInRecordSummary(getLoginUserId()));
+    }
+
+    // TODO @xiaqing：泛型：
+    // TODO @xiaqing：合并到 AppMemberSignInRecordController 的 createSignInRecord 里哈。
+    @Operation(summary = "会员签到")
+    @PostMapping("/create")
+    public CommonResult create(){
+        MemberSignInRecordDO recordDO = signInRecordService.createSignRecord(getLoginUserId());
+        return success(MemberSignInRecordConvert.INSTANCE.coverRecordToAppRecordVo(recordDO));
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/AppMemberSignInRecordRespVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.member.controller.app.signin.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "用户签到积分 Response VO")
+@Data
+public class AppMemberSignInRecordRespVO {
+
+    @Schema(description = "第几天签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer day;
+
+    @Schema(description = "签到的分数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    private Integer point;
+
+    @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/AppMemberSignInSummaryRespVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.member.controller.app.signin.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "用户签到统计信息 Response VO")
+@Data
+public class AppMemberSignInSummaryRespVO {
+
+    @Schema(description = "持续签到天数", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
+    private Integer continuousDay;
+
+    @Schema(description = "总签到天数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    private Integer totalDay;
+
+    @Schema(description = "当天是否签到", requiredMode = Schema.RequiredMode.REQUIRED,example = "true")
+    private Boolean todaySignIn ;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java

@@ -36,4 +36,6 @@ public interface MemberSignInRecordConvert {
 
     PageResult<AppMemberSignInRecordRespVO> convertPage02(PageResult<MemberSignInRecordDO> pageResult);
 
+    AppMemberSignInRecordRespVO coverRecordToAppRecordVo(MemberSignInRecordDO memberSignInRecordDO);
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInConfigMapper.java

@@ -18,7 +18,7 @@ public interface MemberSignInConfigMapper extends BaseMapperX<MemberSignInConfig
         return selectOne(MemberSignInConfigDO::getDay, day);
     }
 
-    default List<MemberSignInConfigDO> selectListByStatus(Integer status) {
+    default List <MemberSignInConfigDO> selectListByStatus(Integer status) {
         return selectList(MemberSignInConfigDO::getStatus, status);
     }
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSi
 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -33,4 +34,12 @@ public interface MemberSignInRecordMapper extends BaseMapperX<MemberSignInRecord
                 .orderByDesc(MemberSignInRecordDO::getId));
     }
 
+
+    //获取用户的签到记录列表信息,根据签到时间倒序
+    default List<MemberSignInRecordDO> selectListByUserId(Long userId){
+        return selectList(new LambdaQueryWrapperX <MemberSignInRecordDO>()
+                .eq(MemberSignInRecordDO::getUserId, userId)
+                .orderByDesc(MemberSignInRecordDO::getCreateTime));
+    }
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.service.signin;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
+import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInSummaryRespVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
 
 /**
@@ -29,4 +30,21 @@ public interface MemberSignInRecordService {
      */
     PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam);
 
+    /**
+     * 创建签到记录
+     *
+     * @param userId 用户编号
+     * @return 签到记录
+     */
+    MemberSignInRecordDO createSignRecord(Long userId);
+
+    /**
+     * 根据用户编号，获得个人签到统计信息
+     *
+     * @param userId 用户编号
+     * @return 个人签到统计信息
+     */
+    AppMemberSignInSummaryRespVO getSignInRecordSummary(Long userId);
+
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java

@@ -1,21 +1,30 @@
 package cn.iocoder.yudao.module.member.service.signin;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
+import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInSummaryRespVO;
+import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
+import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInConfigMapper;
 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
+import cn.iocoder.yudao.module.member.enums.ErrorCodeConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Set;
 
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 
 /**
@@ -28,17 +37,66 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
 public class MemberSignInRecordServiceImpl implements MemberSignInRecordService {
 
     @Resource
-    private MemberSignInRecordMapper memberSignInRecordMapper;
+    private MemberSignInRecordMapper signInRecordMapper;
+    @Resource
+    private MemberSignInConfigMapper signInConfigMapper;
 
     @Resource
     private MemberUserApi memberUserApi;
 
     @Override
-    public PageResult<MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO) {
-        // 根据用户昵称查询出用户 ids
-        Set<Long> userIds = null;
+    public AppMemberSignInSummaryRespVO getSignInRecordSummary(Long userId) {
+        AppMemberSignInSummaryRespVO vo  = new AppMemberSignInSummaryRespVO();
+        vo.setTotalDay(0);
+        vo.setContinuousDay(0);
+        vo.setTodaySignIn(false);
+        //获取用户签到的记录，按照天数倒序获取
+        List <MemberSignInRecordDO> signInRecordDOList = signInRecordMapper.selectListByUserId(userId);
+        // TODO @xiaqing：if 空的时候，直接 return；这样括号少，逻辑更简洁；
+        if(!CollectionUtils.isEmpty(signInRecordDOList)){
+            //设置总签到天数
+            vo.setTotalDay(signInRecordDOList.size()); // TODO @xiaqing：是不是不用读取 signInRecordDOList 所有的，而是 count下，然后另外再读取一条最后一条；
+            //判断当天是否有签到复用校验方法
+            // TODO @xiaqing：不要用异常实现逻辑；还是判断哈；
+            try {
+                validSignDay(signInRecordDOList.get(0));
+                vo.setTodaySignIn(false);
+            }catch (Exception e){
+                vo.setTodaySignIn(true);
+            }
+            //如果当天签到了则说明连续签到天数有意义，否则直接用默认值0
+            if(vo.getTodaySignIn()){
+                //下方计算连续签到从2天开始，此处直接设置一天连续签到
+                vo.setContinuousDay(1);
+                //判断连续签到天数
+                // TODO @xiaqing：这里逻辑，想想怎么在简化下，可读性可以在提升下哈；
+                for (int i = 1; i < signInRecordDOList.size(); i++) {
+                    //前一天减1等于当前天数则说明连续，继续循环
+                    LocalDate cur = signInRecordDOList.get(i).getCreateTime().toLocalDate();
+                    LocalDate pre = signInRecordDOList.get(i-1).getCreateTime().toLocalDate();
+                    if(1==daysBetween(cur,pre)){
+                        vo.setContinuousDay(i+1);
+                    }else{
+                        break;
+                    }
+                }
+            }
+
+
+        }
+        return vo;
+    }
+
+    private long daysBetween(LocalDate date1,LocalDate date2){
+        return ChronoUnit.DAYS.between(date1, date2);
+    }
+
+    @Override
+    public PageResult <MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO) {
+        // 根据用户昵称查询出用户ids
+        Set <Long> userIds = null;
         if (StringUtils.isNotBlank(pageReqVO.getNickname())) {
-            List<MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
+            List <MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
             // 如果查询用户结果为空直接返回无需继续查询
             if (CollectionUtils.isEmpty(users)) {
                 return PageResult.empty();
@@ -46,12 +104,72 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
             userIds = convertSet(users, MemberUserRespDTO::getId);
         }
         // 分页查询
-        return memberSignInRecordMapper.selectPage(pageReqVO, userIds);
+        return signInRecordMapper.selectPage(pageReqVO, userIds);
     }
 
     @Override
     public PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam) {
-        return memberSignInRecordMapper.selectPage(userId, pageParam);
+        return signInRecordMapper.selectPage(userId, pageParam);
+    }
+
+    @Override
+    public MemberSignInRecordDO createSignRecord(Long userId) {
+        // 获取当前用户签到的最大天数
+        // TODO @xiaqing：db 操作，dou封装到 mapper 中；
+        // TODO @xiaqing：maxSignDay，是不是变量叫 lastRecord 会更容易理解哈；
+        MemberSignInRecordDO maxSignDay = signInRecordMapper.selectOne(new LambdaQueryWrapperX <MemberSignInRecordDO>()
+                .eq(MemberSignInRecordDO::getUserId, userId)
+                .orderByDesc(MemberSignInRecordDO::getDay)
+                .last("limit 1"));
+        // 判断是否重复签到
+        validSignDay(maxSignDay);
+
+        // TODO @xiaqing：可以使用 // 进行注释
+        /**1.查询出当前签到的天数**/
+        MemberSignInRecordDO sign = new MemberSignInRecordDO().setUserId(userId); // TODO @xiaqing：应该使用 record 变量，会更合适
+        sign.setDay(1); // 设置签到初始化天数
+        sign.setPoint(0);  // 设置签到分数默认为 0
+        // 如果不为空则修改当前签到对应的天数
+        // TODO @xiaqing：应该是要判断连续哈，就是昨天；
+        if (maxSignDay != null) {
+            sign.setDay(maxSignDay.getDay() + 1);
+        }
+        /**2.获取签到对应的分数**/
+        // 获取所有的签到规则，按照天数排序，只获取启用的 TODO @xiaqing：不要使用 signInConfigMapper 直接查询，而是要通过 SigninConfigService；
+        List <MemberSignInConfigDO> configDOList = signInConfigMapper.selectList(new LambdaQueryWrapperX <MemberSignInConfigDO>()
+                .eq(MemberSignInConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
+                .orderByAsc(MemberSignInConfigDO::getDay));
+        // 如果签到的天数大于最大启用的规则天数，直接给最大签到的分数
+        // TODO @xiaqing：超过最大配置的天数，应该直接重置到第一天哈；
+        MemberSignInConfigDO lastConfig = configDOList.get(configDOList.size() - 1);
+        if (sign.getDay() > lastConfig.getDay()) {
+            sign.setPoint(lastConfig.getPoint());
+        } else {
+            configDOList.forEach(el -> {
+                // 循环匹配对应天数，设置对应分数
+                // TODO @xiaqing：使用 equals；另外，这种不应该去遍历比较，从可读性来说，应该  CollUtil.findOne()
+                if (el.getDay() == sign.getDay()) {
+                    sign.setPoint(el.getPoint());
+                }
+
+            });
+        }
+
+        // 3. 插入当前签到获取的分数
+        signInRecordMapper.insert(sign);
+        return sign;
+    }
+
+    // TODO @xiaqing：校验使用 validate 动词哈；可以改成 validateSigned
+    private void validSignDay(MemberSignInRecordDO signInRecordDO) {
+        // TODO @xiaqing：代码格式：if () {} 要有括号哈
+        if (signInRecordDO == null)
+            return;
+        // TODO @xiaqing：可以直接使用  DateUtils.isToday()
+        LocalDate today = LocalDate.now();
+        if (today.equals(signInRecordDO.getCreateTime().toLocalDate())) {
+            throw exception(ErrorCodeConstants.SIGN_IN_RECORD_TODAY_EXISTS);
+        }
     }
 
 }

yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java

@@ -46,6 +46,9 @@ public interface ErrorCodeConstants {
     ErrorCode WALLET_TRANSACTION_NOT_FOUND = new ErrorCode(1007007002, "未找到对应的钱包交易");
     ErrorCode WALLET_REFUND_AMOUNT_ERROR = new ErrorCode(1007007003, "钱包退款金额不对");
     ErrorCode WALLET_REFUND_EXIST = new ErrorCode(1007007004, "已经存在钱包退款");
+
+    // TODO @jason：把钱包充值，单独搞个错误码段哈；
+
     ErrorCode WALLET_RECHARGE_NOT_FOUND = new ErrorCode(1007007005, "钱包充值记录不存在");
     ErrorCode WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1007007006, "钱包充值更新支付状态失败，钱包充值记录不是【未支付】状态");
     ErrorCode WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR = new ErrorCode(1007007007, "钱包充值更新支付状态失败，支付单编号不匹配");

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

@@ -33,13 +33,14 @@ import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLogi
 public class AppPayWalletRechargeController {
 
     @Resource
-    private PayWalletRechargeService payWalletRechargeService;
+    private PayWalletRechargeService walletRechargeService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建钱包充值记录")
-    public CommonResult<AppPayWalletRechargeCreateRespVO> createWalletRecharge(@Valid @RequestBody AppPayWalletRechargeCreateReqVO reqVO) {
-        PayWalletRechargeDO walletRecharge = payWalletRechargeService.createWalletRecharge(getLoginUserId(),
-                getLoginUserType(), reqVO);
+    @Operation(summary = "创建钱包充值记录（发起充值）")
+    public CommonResult<AppPayWalletRechargeCreateRespVO> createWalletRecharge(
+            @Valid @RequestBody AppPayWalletRechargeCreateReqVO reqVO) {
+        PayWalletRechargeDO walletRecharge = walletRechargeService.createWalletRecharge(
+                getLoginUserId(), getLoginUserType(), reqVO);
         return success(PayWalletRechargeConvert.INSTANCE.convert(walletRecharge));
     }
 
@@ -47,9 +48,12 @@ public class AppPayWalletRechargeController {
     @Operation(summary = "更新钱包充值为已充值") // 由 pay-module 支付服务，进行回调，可见 PayNotifyJob
     @PermitAll // 无需登录，安全由 内部校验实现
     @OperateLog(enable = false) // 禁用操作日志，因为没有操作人
-    public CommonResult<Boolean> updateWalletRechargerPaid(@RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
-        payWalletRechargeService.updateWalletRechargerPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
+    public CommonResult<Boolean> updateWalletRechargerPaid(@Valid @RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
+        walletRechargeService.updateWalletRechargerPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
                 notifyReqDTO.getPayOrderId());
         return success(true);
     }
+
+    // TODO @jason：管理后台，是不是可以搞个发起退款；
+
 }

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

@@ -12,11 +12,14 @@ public class AppPayWalletRechargeCreateReqVO {
 
     @Schema(description = "支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
     @NotNull(message = "支付金额不能为空")
+    // TODO @jason999：是不是 @Min 哈？
     @DecimalMin(value = "0", inclusive = false, message = "支付金额必须大于零")
     private Integer payPrice;
 
+    // TODO @jason：这个是不是后端计算出来呀？不然前端可以直接搞了。。。
     @Schema(description = "钱包赠送金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
     @NotNull(message = "钱包赠送金额不能为空")
     @DecimalMin(value = "0",  message = "钱包赠送金额必须大于等于零")
     private Integer walletBonus;
+
 }

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

@@ -12,4 +12,5 @@ public class AppPayWalletRechargeCreateRespVO {
 
     @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Long payOrderId;
+
 }

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletRechargeConvert.java

@@ -16,6 +16,7 @@ public interface PayWalletRechargeConvert {
 
     PayWalletRechargeDO convert(AppPayWalletRechargeCreateReqVO vo);
 
+    // TODO @jason：好像 price 相加，可以写个表达式的，通过 @Mapping
     default PayWalletRechargeDO convert(Long walletId, AppPayWalletRechargeCreateReqVO vo) {
         PayWalletRechargeDO walletRecharge = convert(vo);
         return walletRecharge.setWalletId(walletId)

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletTransactionConvert.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.pay.convert.wallet;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionRespVO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
@@ -14,6 +14,6 @@ public interface PayWalletTransactionConvert {
 
     PageResult<AppPayWalletTransactionRespVO> convertPage(PageResult<PayWalletTransactionDO> page);
 
-    PayWalletTransactionDO convert(CreateWalletTransactionBO bean);
+    PayWalletTransactionDO convert(WalletTransactionCreateReqBO bean);
 
 }

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

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.pay.dal.dataobject.wallet;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO;
+import cn.iocoder.yudao.module.pay.dal.dataobject.refund.PayRefundDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,40 +25,49 @@ public class PayWalletRechargeDO extends BaseDO {
     private Long id;
 
     /**
-     * 会员钱包 id
+     * 钱包编号
+     *
+     * 关联 {@link PayWalletDO#getId()}
      */
     private Long walletId;
 
+    // TODO @jason：要不改成 totalPrice？
     /**
-     * 用户实际到账余额，例如充 100 送 20，则该值是 120
+     * 用户实际到账余额
+     *
+     * 例如充 100 送 20，则该值是 120
      */
     private Integer price;
-
     /**
      * 实际支付金额
      */
     private Integer payPrice;
-
+    // TODO @jason：bonusPrice 哈，更统一一点；
     /**
      * 钱包赠送金额
      */
     private Integer walletBonus;
 
     /**
-     * 是否已支付：[0:未支付 1:已经支付过]
+     * 是否已支付
+     *
+     * true - 已支付
+     * false - 未支付
      */
     private Boolean payStatus;
 
     /**
      * 支付订单编号
+     *
+     * 关联 {@link PayOrderDO#getId()}
      */
     private Long payOrderId;
-
     /**
      * 支付成功的支付渠道
+     *
+     * 冗余 {@link PayOrderDO#getChannelCode()}
      */
     private String payChannelCode;
-
     /**
      * 订单支付时间
      */
@@ -64,26 +75,27 @@ public class PayWalletRechargeDO extends BaseDO {
 
     /**
      * 支付退款单编号
+     *
+     * 关联 {@link PayRefundDO#getId()}
      */
     private Long payRefundId;
-
+    // TODO @jason：要不改成 refundTotalPrice？
     /**
      * 退款金额，包含赠送金额
      */
     private Integer refundPrice;
-
     /**
      * 退款支付金额
      */
     private Integer refundPayPrice;
-
+    // TODO @jason：要不改成 refundBonusPrice？
     /**
      * 退款钱包赠送金额
      */
     private Integer refundWalletBonus;
-
     /**
      * 退款时间
      */
     private LocalDateTime refundTime;
-}
+
+}

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletMapper.java

@@ -14,6 +14,8 @@ public interface PayWalletMapper extends BaseMapperX<PayWalletDO> {
                 PayWalletDO::getUserType, userType);
     }
 
+    // TODO @jason：下面几个更新方法，把 id 放前面哈。一般来说，重要参数放前面；
+
     /**
      * 当消费退款时候， 更新钱包
      *
@@ -55,6 +57,7 @@ public interface PayWalletMapper extends BaseMapperX<PayWalletDO> {
                 .eq(PayWalletDO::getId, id);
         return update(null, lambdaUpdateWrapper);
     }
+    
 }
 
 

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletRechargeMapper.java

@@ -2,17 +2,17 @@ package cn.iocoder.yudao.module.pay.dal.mysql.wallet;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.pay.dal.dataobject.demo.PayDemoOrderDO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface PayWalletRechargeMapper extends BaseMapperX<PayWalletRechargeDO> {
 
-    default  int updateByIdAndPaid(Long id, boolean wherePayed, PayWalletRechargeDO updateObj){
+    default  int updateByIdAndPaid(Long id, boolean wherePayStatus, PayWalletRechargeDO updateObj){
         return update(updateObj, new LambdaQueryWrapperX<PayWalletRechargeDO>()
-                .eq(PayWalletRechargeDO::getId, id).eq(PayWalletRechargeDO::getPayStatus, wherePayed));
+                .eq(PayWalletRechargeDO::getId, id).eq(PayWalletRechargeDO::getPayStatus, wherePayStatus));
     }
+
 }
 
 

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

@@ -11,19 +11,22 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
 public interface PayWalletRechargeService {
 
     /**
-     * 创建钱包充值记录
+     * 创建钱包充值记录（发起充值）
+     *
      * @param userId 用户 id
      * @param userType 用户类型
-     * @param vo 钱包充值请求 vo
+     * @param createReqVO 钱包充值请求 VO
      * @return 钱包充值记录
      */
-    PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType, AppPayWalletRechargeCreateReqVO vo);
-
+    PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType,
+                                             AppPayWalletRechargeCreateReqVO createReqVO);
 
     /**
      * 更新钱包充值成功
-     * @param walletRechargeId 钱包充值 id
+     *
+     * @param id 钱包充值记录 id
      * @param payOrderId 支付订单 id
      */
-    void updateWalletRechargerPaid(Long walletRechargeId, Long payOrderId);
+    void updateWalletRechargerPaid(Long id, Long payOrderId);
+
 }

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

@@ -42,57 +42,61 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
 
     @Resource
     private PayWalletRechargeMapper walletRechargeMapper;
+
     @Resource
     private PayWalletService payWalletService;
     @Resource
     private PayOrderService payOrderService;
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType, AppPayWalletRechargeCreateReqVO vo) {
-        // 1. 获取钱包
+    public PayWalletRechargeDO createWalletRecharge(Long userId, Integer userType,
+                                                    AppPayWalletRechargeCreateReqVO createReqVO) {
+        // 1. 新增钱包充值记录
         PayWalletDO wallet = payWalletService.getOrCreateWallet(userId, userType);
-        // 2. 新增钱包充值记录
-        PayWalletRechargeDO walletRecharge = PayWalletRechargeConvert.INSTANCE.convert(wallet.getId(), vo);
+        PayWalletRechargeDO walletRecharge = PayWalletRechargeConvert.INSTANCE.convert(wallet.getId(), createReqVO);
         walletRechargeMapper.insert(walletRecharge);
-        // 3.创建支付单
+
+        // 2.1 创建支付单
         Long payOrderId = payOrderService.createOrder(new PayOrderCreateReqDTO()
                 .setAppId(WALLET_PAY_APP_ID).setUserIp(getClientIP())
                 .setMerchantOrderId(walletRecharge.getId().toString()) // 业务的订单编号
                 .setSubject(WALLET_RECHARGE_ORDER_SUBJECT).setBody("").setPrice(walletRecharge.getPayPrice())
                 .setExpireTime(addTime(Duration.ofHours(2L))));
-        // 4.更新钱包充值记录中支付订单
+        // 2.2 更新钱包充值记录中支付订单
         walletRechargeMapper.updateById(new PayWalletRechargeDO().setPayOrderId(payOrderId)
                 .setId(walletRecharge.getId()));
+        // TODO @jason：是不是你直接返回就好啦；然后 payOrderId 设置下；
         return walletRechargeMapper.selectById(walletRecharge.getId());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateWalletRechargerPaid(Long walletRechargeId, Long payOrderId) {
-        // 1. 获取钱包充值记录
-        PayWalletRechargeDO walletRecharge = walletRechargeMapper.selectById(walletRechargeId);
+    public void updateWalletRechargerPaid(Long id, Long payOrderId) {
+        // 1.1 获取钱包充值记录
+        PayWalletRechargeDO walletRecharge = walletRechargeMapper.selectById(id);
         if (walletRecharge == null) {
-            log.error("[updateWalletRechargerPaid]，钱包充值记录不存在，钱包充值 Id:{} ", walletRechargeId);
+            log.error("[updateWalletRechargerPaid][钱包充值记录不存在，钱包充值记录 id({})]", id);
             throw exception(WALLET_RECHARGE_NOT_FOUND);
         }
-        // 2. 校验钱包充值是否可以支付
+        // 1.2 校验钱包充值是否可以支付
         PayOrderDO payOrderDO = validateWalletRechargerCanPaid(walletRecharge, payOrderId);
-        // 3. 更新钱包充值的支付状态
-        int updateCount = walletRechargeMapper.updateByIdAndPaid(walletRechargeId,false, new PayWalletRechargeDO().setId(walletRechargeId)
-                .setPayStatus(true).setPayTime(LocalDateTime.now())
+
+        // 2. 更新钱包充值的支付状态
+        int updateCount = walletRechargeMapper.updateByIdAndPaid(id,false,
+                new PayWalletRechargeDO().setId(id).setPayStatus(true).setPayTime(LocalDateTime.now())
                 .setPayChannelCode(payOrderDO.getChannelCode()));
         if (updateCount == 0) {
             throw exception(WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID);
         }
-        // 4. 更新钱包余额
-        payWalletService.addWalletBalance(walletRecharge.getWalletId(), String.valueOf(walletRechargeId),
+
+        // 3. 更新钱包余额
+        // TODO @jason：这样的话，未来提现会不会把充值的，也提现走哈。类似先充 100，送 110；然后提现 110；
+        payWalletService.addWalletBalance(walletRecharge.getWalletId(), String.valueOf(id),
                 PayWalletBizTypeEnum.RECHARGE, walletRecharge.getPrice());
     }
 
     private PayOrderDO validateWalletRechargerCanPaid(PayWalletRechargeDO walletRecharge, Long payOrderId) {
-
         // 1.1 校验充值记录的支付状态
         if (walletRecharge.getPayStatus()) {
             log.error("[validateWalletRechargerCanPaid][钱包({}) 不处于未支付状态!  钱包数据是：{}]",
@@ -105,6 +109,7 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
                     walletRecharge.getId(), payOrderId, toJsonString(walletRecharge));
             throw exception(WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR);
         }
+
         // 2.1 校验支付单是否存在
         PayOrderDO payOrder = payOrderService.getOrder(payOrderId);
         if (payOrder == null) {
@@ -132,4 +137,5 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
         }
         return payOrder;
     }
+
 }

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

@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletMapper;
 import cn.iocoder.yudao.module.pay.enums.member.PayWalletBizTypeEnum;
 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
 import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -84,6 +84,7 @@ public class PayWalletServiceImpl implements  PayWalletService {
         Long walletId = validateWalletCanRefund(payRefund.getId(), payRefund.getChannelOrderNo(),  refundPrice);
         PayWalletDO wallet = walletMapper.selectById(walletId);
         Assert.notNull(wallet, "钱包 {} 不存在", walletId);
+
         // 2. 增加余额
         return addWalletBalance(walletId, String.valueOf(payRefund.getId()), PAYMENT_REFUND, refundPrice);
     }
@@ -137,42 +138,39 @@ public class PayWalletServiceImpl implements  PayWalletService {
         }
         // 2.2 生成钱包流水
         Integer afterBalance = payWallet.getBalance() - price;
-        CreateWalletTransactionBO bo = new CreateWalletTransactionBO().setWalletId(payWallet.getId())
+        WalletTransactionCreateReqBO bo = new WalletTransactionCreateReqBO().setWalletId(payWallet.getId())
                 .setPrice(-price).setBalance(afterBalance).setBizId(String.valueOf(bizId))
                 .setBizType(bizType.getType()).setTitle(bizType.getDescription());
         return walletTransactionService.createWalletTransaction(bo);
     }
 
     @Override
-    public PayWalletTransactionDO addWalletBalance(Long walletId,
-                                                   String bizId, PayWalletBizTypeEnum bizType, Integer price) {
-        // 1. 获取钱包
+    public PayWalletTransactionDO addWalletBalance(Long walletId, String bizId,
+                                                   PayWalletBizTypeEnum bizType, Integer price) {
+        // 1.1 获取钱包
         PayWalletDO payWallet = getWallet(walletId);
-
         if (payWallet == null) {
             log.error("[addWalletBalance]，用户钱包({})不存在.", walletId);
             throw exception(WALLET_NOT_FOUND);
         }
-
+        // 1.2 更新钱包金额
         switch (bizType) {
-            case PAYMENT_REFUND: {
-                // 退款更新
+            case PAYMENT_REFUND: { // 退款更新
                 walletMapper.updateWhenConsumptionRefund(price, payWallet.getId());
                 break;
             }
-            case RECHARGE: {
-                // 充值更新
+            case RECHARGE: { // 充值更新
                 walletMapper.updateWhenRecharge(price, payWallet.getId());
                 break;
             }
-            // TODO 其它类型
+            // TODO 其它类型；这里可以先跑异常；避免有业务搞错；
         }
 
         // 2. 生成钱包流水
-        CreateWalletTransactionBO bo = new CreateWalletTransactionBO().setWalletId(payWallet.getId())
-                .setPrice(price).setBalance(payWallet.getBalance()+price).setBizId(bizId)
-                .setBizType(bizType.getType()).setTitle(bizType.getDescription());
-        return walletTransactionService.createWalletTransaction(bo);
+        WalletTransactionCreateReqBO transactionCreateReqBO = new WalletTransactionCreateReqBO()
+                .setWalletId(payWallet.getId()).setPrice(price).setBalance(payWallet.getBalance() + price)
+                .setBizId(bizId).setBizType(bizType.getType()).setTitle(bizType.getDescription());
+        return walletTransactionService.createWalletTransaction(transactionCreateReqBO);
     }
 
 }

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

@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionPageReqVO;
 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
 import cn.iocoder.yudao.module.pay.enums.member.PayWalletBizTypeEnum;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 
 import javax.validation.Valid;
 
@@ -31,7 +31,7 @@ public interface PayWalletTransactionService {
      * @param bo 创建钱包流水 bo
      * @return 新建的钱包 do
      */
-    PayWalletTransactionDO createWalletTransaction(@Valid CreateWalletTransactionBO bo);
+    PayWalletTransactionDO createWalletTransaction(@Valid WalletTransactionCreateReqBO bo);
 
     /**
      * 根据 no，获取钱包余流水
@@ -48,5 +48,5 @@ public interface PayWalletTransactionService {
      * @return 钱包流水
      */
     PayWalletTransactionDO getWalletTransaction(String bizId, PayWalletBizTypeEnum type);
-    
+
 }

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

@@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
 import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletTransactionMapper;
 import cn.iocoder.yudao.module.pay.dal.redis.no.PayNoRedisDAO;
 import cn.iocoder.yudao.module.pay.enums.member.PayWalletBizTypeEnum;
-import cn.iocoder.yudao.module.pay.service.wallet.bo.CreateWalletTransactionBO;
+import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -43,7 +43,7 @@ public class PayWalletTransactionServiceImpl implements PayWalletTransactionServ
     }
 
     @Override
-    public PayWalletTransactionDO createWalletTransaction(CreateWalletTransactionBO bo) {
+    public PayWalletTransactionDO createWalletTransaction(WalletTransactionCreateReqBO bo) {
         PayWalletTransactionDO transaction = PayWalletTransactionConvert.INSTANCE.convert(bo)
                 .setNo(noRedisDAO.generate(WALLET_NO_PREFIX));
         payWalletTransactionMapper.insert(transaction);

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/bo/CreateWalletTransactionBO.java → yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/bo/WalletTransactionCreateReqBO.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @author jason
  */
 @Data
-public class CreateWalletTransactionBO {
+public class WalletTransactionCreateReqBO {
 
     // TODO @jason：bo 的话，最好加个参数校验哈；
 

yudao-server/src/main/resources/application-local.yaml

@@ -44,31 +44,31 @@ spring:
       primary: master
       datasource:
         master:
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          name: mall
+          url: jdbc:mysql://10.211.55.5:3308/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
           username: root
-          password: 123456
+          password: 1qaz!QAZ
         #          username: sa
         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
         slave: # 模拟从库，可根据自己需要修改
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          name: mall
+          url: jdbc:mysql://10.211.55.5:3308/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
           username: root
-          password: 123456
+          password: 1qaz!QAZ
   #          username: sa
   #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
-    host: 127.0.0.1 # 地址
+    host: 10.211.55.5 # 地址
     port: 6379 # 端口
     database: 0 # 数据库索引
 #    password: dev # 密码，建议生产环境开启