充值相关功能基础代码提交

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/entity/BizCouponRecord.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -28,7 +30,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("biz_coupon_record")
-public class BizCouponRecord {
+public class BizCouponRecord extends CommonEntity {
 
     /** 优惠券记录表id */
     @TableId
@@ -75,29 +77,4 @@ public class BizCouponRecord {
     @Schema(description = "核销门店")
     private String orgId;
 
-    /** 删除标志:NOT_DELETE 正常,DELETED 已删除 */
-    @Schema(description = "删除标志:NOT_DELETE 正常,DELETED 已删除")
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建人 */
-    @Schema(description = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 修改时间 */
-    @Schema(description = "修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    /** 修改人 */
-    @Schema(description = "修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rebaterecord/entity/BizRebateRecord.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -28,7 +30,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("biz_rebate_record")
-public class BizRebateRecord {
+public class BizRebateRecord extends CommonEntity {
 
     /** 代金券记录id */
     @TableId
@@ -51,29 +53,5 @@ public class BizRebateRecord {
     @Schema(description = "代金券状态： 1. 待生效 2.已生效")
     private String rebateStatus;
 
-    /** 删除标志:NOT_DELETE 正常,DELETED 已删除 */
-    @Schema(description = "删除标志:NOT_DELETE 正常,DELETED 已删除")
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建人 */
-    @Schema(description = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 修改时间 */
-    @Schema(description = "修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
 
-    /** 修改人 */
-    @Schema(description = "修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/controller/BizRechargeRecordController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
+import vip.xiaonuo.common.annotation.CommonNoRepeat;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.biz.modular.rechargerecord.entity.BizRechargeRecord;
 import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordAddParam;
@@ -70,27 +71,27 @@ public class BizRechargeRecordController {
      */
     @Operation(summary = "添加充值记录表")
     @CommonLog("添加充值记录表")
-    @SaCheckPermission("/biz/rechargerecord/add")
     @PostMapping("/biz/rechargerecord/add")
+    @CommonNoRepeat
     public CommonResult<String> add(@RequestBody @Valid BizRechargeRecordAddParam bizRechargeRecordAddParam) {
         bizRechargeRecordService.add(bizRechargeRecordAddParam);
         return CommonResult.ok();
     }
 
-    /**
-     * 编辑充值记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:41
-     */
-    @Operation(summary = "编辑充值记录表")
-    @CommonLog("编辑充值记录表")
-    @SaCheckPermission("/biz/rechargerecord/edit")
-    @PostMapping("/biz/rechargerecord/edit")
-    public CommonResult<String> edit(@RequestBody @Valid BizRechargeRecordEditParam bizRechargeRecordEditParam) {
-        bizRechargeRecordService.edit(bizRechargeRecordEditParam);
-        return CommonResult.ok();
-    }
+//    /**
+//     * 编辑充值记录表
+//     *
+//     * @author wulei
+//     * @date  2025/02/06 17:41
+//     */
+//    @Operation(summary = "编辑充值记录表")
+//    @CommonLog("编辑充值记录表")
+//    @SaCheckPermission("/biz/rechargerecord/edit")
+//    @PostMapping("/biz/rechargerecord/edit")
+//    public CommonResult<String> edit(@RequestBody @Valid BizRechargeRecordEditParam bizRechargeRecordEditParam) {
+//        bizRechargeRecordService.edit(bizRechargeRecordEditParam);
+//        return CommonResult.ok();
+//    }
 
     /**
      * 删除充值记录表
@@ -100,7 +101,6 @@ public class BizRechargeRecordController {
      */
     @Operation(summary = "删除充值记录表")
     @CommonLog("删除充值记录表")
-    @SaCheckPermission("/biz/rechargerecord/delete")
     @PostMapping("/biz/rechargerecord/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizRechargeRecordIdParam> bizRechargeRecordIdParamList) {
@@ -115,7 +115,6 @@ public class BizRechargeRecordController {
      * @date  2025/02/06 17:41
      */
     @Operation(summary = "获取充值记录表详情")
-    @SaCheckPermission("/biz/rechargerecord/detail")
     @GetMapping("/biz/rechargerecord/detail")
     public CommonResult<BizRechargeRecord> detail(@Valid BizRechargeRecordIdParam bizRechargeRecordIdParam) {
         return CommonResult.data(bizRechargeRecordService.detail(bizRechargeRecordIdParam));

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/entity/BizRechargeRecord.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -28,7 +30,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("biz_recharge_record")
-public class BizRechargeRecord {
+public class BizRechargeRecord extends CommonEntity {
 
     /** 充值记录表id */
     @TableId
@@ -99,29 +101,5 @@ public class BizRechargeRecord {
     @Schema(description = "支付时间")
     private Date payTime;
 
-    /** 删除标志:NOT_DELETE 正常,DELETED 已删除 */
-    @Schema(description = "删除标志:NOT_DELETE 正常,DELETED 已删除")
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建人 */
-    @Schema(description = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 修改时间 */
-    @Schema(description = "修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    /** 修改人 */
-    @Schema(description = "修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/param/BizRechargeRecordAddParam.java

@@ -43,56 +43,4 @@ public class BizRechargeRecordAddParam {
     @Schema(description = "充值金额")
     private BigDecimal rechargeAmount;
 
-    /** 充值时间 */
-    @Schema(description = "充值时间")
-    private Date rechargeTime;
-
-    /** 原账户余额 */
-    @Schema(description = "原账户余额")
-    private BigDecimal oldAccountBalance;
-
-    /** 原代金券金额 */
-    @Schema(description = "原代金券金额")
-    private BigDecimal oldVoucherBalance;
-
-    /** 新账户余额 */
-    @Schema(description = "新账户余额")
-    private BigDecimal newAccountBalance;
-
-    /** 新代金券金额 */
-    @Schema(description = "新代金券金额")
-    private BigDecimal newVoucherBalance;
-
-    /** 推荐人的返点比例 */
-    @Schema(description = "推荐人的返点比例")
-    private BigDecimal rebateRatio;
-
-    /** 推荐人具体返点金额 */
-    @Schema(description = "推荐人具体返点金额")
-    private BigDecimal rebateAmount;
-
-    /** 优惠券（蛋糕券）数量 */
-    @Schema(description = "优惠券（蛋糕券）数量")
-    private Integer couponNum;
-
-    /** 优惠券金额 */
-    @Schema(description = "优惠券金额")
-    private BigDecimal couponAmount;
-
-    /** 系统订单号 */
-    @Schema(description = "系统订单号")
-    private String orderNo;
-
-    /** 微信订单编号 */
-    @Schema(description = "微信订单编号")
-    private String wxOrderNo;
-
-    /** 是否支付 0.未支付 1.已支付 */
-    @Schema(description = "是否支付 0.未支付 1.已支付")
-    private Boolean isPay;
-
-    /** 支付时间 */
-    @Schema(description = "支付时间")
-    private Date payTime;
-
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/service/BizRechargeRecordService.java

@@ -46,13 +46,13 @@ public interface BizRechargeRecordService extends IService<BizRechargeRecord> {
      */
     void add(BizRechargeRecordAddParam bizRechargeRecordAddParam);
 
-    /**
-     * 编辑充值记录表
-     *
-     * @author wulei
-     * @date  2025/02/06 17:41
-     */
-    void edit(BizRechargeRecordEditParam bizRechargeRecordEditParam);
+//    /**
+//     * 编辑充值记录表
+//     *
+//     * @author wulei
+//     * @date  2025/02/06 17:41
+//     */
+//    void edit(BizRechargeRecordEditParam bizRechargeRecordEditParam);
 
     /**
      * 删除充值记录表

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/rechargerecord/service/impl/BizRechargeRecordServiceImpl.java

@@ -19,6 +19,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
@@ -31,6 +32,8 @@ import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordEditParam;
 import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordIdParam;
 import vip.xiaonuo.biz.modular.rechargerecord.param.BizRechargeRecordPageParam;
 import vip.xiaonuo.biz.modular.rechargerecord.service.BizRechargeRecordService;
+import vip.xiaonuo.common.util.CommonWxUtil;
+import vip.xiaonuo.common.wx.WxPayConfig;
 
 import java.util.List;
 
@@ -43,6 +46,12 @@ import java.util.List;
 @Service
 public class BizRechargeRecordServiceImpl extends ServiceImpl<BizRechargeRecordMapper, BizRechargeRecord> implements BizRechargeRecordService {
 
+    @Resource
+    private CommonWxUtil commonWxUtil;
+    @Resource
+    private WxPayConfig wxPayConfig;
+
+
     @Override
     public Page<BizRechargeRecord> page(BizRechargeRecordPageParam bizRechargeRecordPageParam) {
         QueryWrapper<BizRechargeRecord> queryWrapper = new QueryWrapper<BizRechargeRecord>().checkSqlInjection();
@@ -69,13 +78,13 @@ public class BizRechargeRecordServiceImpl extends ServiceImpl<BizRechargeRecordM
         this.save(bizRechargeRecord);
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(BizRechargeRecordEditParam bizRechargeRecordEditParam) {
-        BizRechargeRecord bizRechargeRecord = this.queryEntity(bizRechargeRecordEditParam.getId());
-        BeanUtil.copyProperties(bizRechargeRecordEditParam, bizRechargeRecord);
-        this.updateById(bizRechargeRecord);
-    }
+//    @Transactional(rollbackFor = Exception.class)
+//    @Override
+//    public void edit(BizRechargeRecordEditParam bizRechargeRecordEditParam) {
+//        BizRechargeRecord bizRechargeRecord = this.queryEntity(bizRechargeRecordEditParam.getId());
+//        BeanUtil.copyProperties(bizRechargeRecordEditParam, bizRechargeRecord);
+//        this.updateById(bizRechargeRecord);
+//    }
 
     @Transactional(rollbackFor = Exception.class)
     @Override

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/recommendrecord/entity/BizRecommendRecord.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.common.pojo.CommonEntity;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -28,7 +30,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("biz_recommend_record")
-public class BizRecommendRecord {
+public class BizRecommendRecord extends CommonEntity {
 
     /** 推荐记录id */
     @TableId
@@ -43,29 +45,5 @@ public class BizRecommendRecord {
     @Schema(description = "被推荐人用户id")
     private String acceptUserId;
 
-    /** 删除标志:NOT_DELETE 正常,DELETED 已删除 */
-    @Schema(description = "删除标志:NOT_DELETE 正常,DELETED 已删除")
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private String deleteFlag;
-
-    /** 创建人 */
-    @Schema(description = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    /** 创建时间 */
-    @Schema(description = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /** 修改时间 */
-    @Schema(description = "修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
 
-    /** 修改人 */
-    @Schema(description = "修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java

@@ -62,6 +62,8 @@ import vip.xiaonuo.biz.modular.org.entity.BizOrg;
 import vip.xiaonuo.biz.modular.org.service.BizOrgService;
 import vip.xiaonuo.biz.modular.position.entity.BizPosition;
 import vip.xiaonuo.biz.modular.position.service.BizPositionService;
+import vip.xiaonuo.biz.modular.recommendrecord.entity.BizRecommendRecord;
+import vip.xiaonuo.biz.modular.recommendrecord.mapper.BizRecommendRecordMapper;
 import vip.xiaonuo.biz.modular.user.entity.BizUser;
 import vip.xiaonuo.biz.modular.user.enums.BizRoleCategoryEnum;
 import vip.xiaonuo.biz.modular.user.enums.BizUserStatusEnum;
@@ -130,6 +132,9 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
     private DevSmsApi devSmsApi;
     @Value("${aliyun.templateCode}")
     private String templateCode;
+    @Resource
+    private BizRecommendRecordMapper bizRecommendRecordMapper;
+
 
     @Override
     public Page<BizUser> page(BizUserPageParam bizUserPageParam) {
@@ -807,13 +812,15 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
             roleId = "1886674709466906625";
         }
         // 校验推荐人
+        String referralUserId = null;
         if (ObjectUtil.isNotEmpty(wxUserRegisterParam.getReferralCode())) {
             BizUser referralUser = baseMapper.selectOne(new LambdaQueryWrapper<BizUser>()
                     .eq(BizUser::getUserReferralCode, wxUserRegisterParam.getReferralCode())
                     .last("limit 1"));
             if (ObjectUtil.isNull(referralUser)) {
-                throw new CommonException("推荐人不存在");
+                throw new CommonException("未查询到该编码的推荐人");
             }
+            referralUserId = referralUser.getId();
         }
         // 校验openId或者手机号是否存在
         if (ObjectUtil.isNotNull(baseMapper.selectOne(new LambdaQueryWrapper<BizUser>()
@@ -835,6 +842,13 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
         bizUser.setName(wxUserRegisterParam.getName());
         this.save(bizUser);
         sysRoleApi.grantUserRole(bizUser.getId(), roleId);
+        //保存推荐人关系
+        if (ObjectUtil.isNotEmpty(wxUserRegisterParam.getReferralCode())) {
+            BizRecommendRecord bizRecommendRecord = new BizRecommendRecord();
+            bizRecommendRecord.setRecommendUserId(referralUserId);
+            bizRecommendRecord.setAcceptUserId(bizUser.getId());
+            bizRecommendRecordMapper.insert(bizRecommendRecord);
+        }
         //校验通过删除缓存
         commonCacheOperator.remove(wxUserRegisterParam.getPhone());
     }