|
@@ -27,6 +27,7 @@ import tk.mybatis.mapper.entity.Example.Criteria;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -84,19 +85,19 @@ public class RechargeRecordApiController {
|
|
|
|
|
|
@GetMapping("/add")
|
|
|
@ApiOperation(value = "创建充值订单", httpMethod = "GET")
|
|
|
- public Result add(@RequestParam Integer goodsId, @RequestParam Long methodId, HttpServletRequest request) {
|
|
|
+ public Result add(@RequestParam BigDecimal amount, @RequestParam Long methodId, HttpServletRequest request) {
|
|
|
Long userId = authService.getTokenUserId(request);
|
|
|
- if (goodsId == null) {
|
|
|
- return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
|
|
|
- }
|
|
|
+ // if (goodsId == null) {
|
|
|
+ // return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
|
|
|
+ // }
|
|
|
try {
|
|
|
- Goods goods = goodsService.findById(goodsId);
|
|
|
- if (goods == null) {
|
|
|
- return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
|
|
|
- }
|
|
|
- if (goods.getStatus() != 1) {
|
|
|
- return ResultGenerator.genFailResult(ResultCode.STATUS_IS_NULL);
|
|
|
- }
|
|
|
+ // Goods goods = goodsService.findById(goodsId);
|
|
|
+ // if (goods == null) {
|
|
|
+ // return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
|
|
|
+ // }
|
|
|
+ // if (goods.getStatus() != 1) {
|
|
|
+ // return ResultGenerator.genFailResult(ResultCode.STATUS_IS_NULL);
|
|
|
+ // }
|
|
|
User user = userService.findById(userId);
|
|
|
if (user == null) {
|
|
|
return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
|
|
@@ -106,8 +107,8 @@ public class RechargeRecordApiController {
|
|
|
// long id = IdUtil.getSnowflake(1, 1).nextId();
|
|
|
String orderNo = sequenceService.genSerialNumber("recharge_rule", null);
|
|
|
RechargeRecord rechargeRecord = RechargeRecord.builder()
|
|
|
- .discount(goods.getDiscount())
|
|
|
- .amount(goods.getAmount())
|
|
|
+ .discount(BigDecimal.ZERO)
|
|
|
+ .amount(amount)
|
|
|
.currency("BDT").userId(userId)
|
|
|
.userName(user.getName()).userPhone(user.getPhoneNo())
|
|
|
.bank(user.getBank())
|
|
@@ -115,7 +116,8 @@ public class RechargeRecordApiController {
|
|
|
.channelId(paymentChannel == null ? null : paymentChannel.getId())
|
|
|
.bankAccount(user.getBankAccount())
|
|
|
.bankAccountName(user.getBankAccountName())
|
|
|
- .orderNo(orderNo).goodsId(goodsId)
|
|
|
+ .orderNo(orderNo)
|
|
|
+ .goodsId(-1)
|
|
|
.createUser(user.getName())
|
|
|
.status(1).createTime(DateUtil.date())
|
|
|
.build();
|