This commit is contained in:
2026-10-24 13:31:43 +08:00
parent ed94879b36
commit 3fef36a721
114 changed files with 5321 additions and 1463 deletions
@@ -4,9 +4,6 @@ import cn.hutool.core.util.IdUtil;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.common.system.service.UserService;
import com.gxwebsoft.shop.entity.UserBalanceLog;
import com.gxwebsoft.shop.service.RechargeOrderService;
import com.gxwebsoft.shop.entity.RechargeOrder;
import com.gxwebsoft.shop.param.RechargeOrderParam;
import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.core.web.BatchParam;
@@ -8,14 +8,18 @@ import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN;
/**
* 用户余额变动明细表控制器
*
@@ -28,6 +32,8 @@ import java.util.List;
public class UserBalanceLogController extends BaseController {
@Resource
private UserBalanceLogService userBalanceLogService;
@Resource
private UserService userService;
@ApiOperation("分页查询用户余额变动明细表")
@GetMapping("/page")
@@ -54,10 +60,33 @@ public class UserBalanceLogController extends BaseController {
@ApiOperation("添加用户余额变动明细表")
@PostMapping()
public ApiResult<?> save(@RequestBody UserBalanceLog userBalanceLog) {
// 记录当前登录用户id
if (userBalanceLog.getUserId() == null) {
return fail("用户ID不能为空");
}
if (userBalanceLog.getMoney() == null || userBalanceLog.getMoney().compareTo(BigDecimal.ZERO) <= 0) {
return fail("充值金额必须大于0");
}
User user = userService.addBalanceInner(userBalanceLog.getUserId(), userBalanceLog.getMoney());
if (user == null) {
return fail("用户不存在");
}
User loginUser = getLoginUser();
if (loginUser != null) {
userBalanceLog.setUserId(loginUser.getUserId());
if (userBalanceLog.getScene() == null) {
userBalanceLog.setScene(BALANCE_ADMIN);
}
userBalanceLog.setBalance(user.getBalance());
if (loginUser != null && userBalanceLog.getAdminId() == null) {
userBalanceLog.setAdminId(loginUser.getUserId());
}
if ((userBalanceLog.getComments() == null || userBalanceLog.getComments().trim().isEmpty())
&& userBalanceLog.getRemark() != null) {
userBalanceLog.setComments(userBalanceLog.getRemark());
}
if (userBalanceLog.getStatus() == null) {
userBalanceLog.setStatus(0);
}
if (userBalanceLog.getDeleted() == null) {
userBalanceLog.setDeleted(0);
}
if (userBalanceLogService.save(userBalanceLog)) {
return success("添加成功");
@@ -2,8 +2,6 @@ package com.gxwebsoft.shop.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gxwebsoft.shop.entity.RechargeOrder;
import com.gxwebsoft.shop.param.RechargeOrderParam;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -2,8 +2,6 @@ package com.gxwebsoft.shop.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.shop.entity.RechargeOrder;
import com.gxwebsoft.shop.param.RechargeOrderParam;
import java.util.List;
@@ -1,10 +1,6 @@
package com.gxwebsoft.shop.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.shop.mapper.RechargeOrderMapper;
import com.gxwebsoft.shop.service.RechargeOrderService;
import com.gxwebsoft.shop.entity.RechargeOrder;
import com.gxwebsoft.shop.param.RechargeOrderParam;
import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.PageResult;
import org.springframework.stereotype.Service;