From a6cf27e733515a20fc14840f5c63b6c6139b1e33 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 11:16:27 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 5 +++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 7 +++++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/RechargeSetVO.java | 13 +++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 17 ++++++++++++++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java | 11 +++++++++--
5 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index 7d2aa24..e35bdb6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -156,7 +156,7 @@
String content = data.getContent();
if (!content.equals("-1")){
if (amount.compareTo(new BigDecimal(content)) > 0){
- return R.fail("充值金额不能小于" + content + "元");
+ return R.fail("充值金额不能大于" + content + "元");
}
}
}
@@ -184,6 +184,21 @@
/**
+ * 获取充值上限金额
+ */
+ @GetMapping("rechargeLimit")
+ public R<BigDecimal> rechargeLimit(){
+ R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(7);
+ BaseSetting data = baseSetting.getData();
+ if (data != null){
+ String content = data.getContent();
+ return R.ok(new BigDecimal(content));
+ }
+ return R.ok(new BigDecimal("-1"));
+ }
+
+
+ /**
* 充值支付回调
* @param callback
* @param response
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 0d05823..8742ed0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -30,6 +30,10 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -38,8 +42,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotBlank;
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@@ -535,5 +541,6 @@
ExcelUtil<OrderPageListVo> util = new ExcelUtil<OrderPageListVo>(OrderPageListVo.class);
util.exportExcel(response, list, "订单数据");
}
+
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
index fdacd73..4f08eee 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
@@ -19,6 +19,9 @@
@ApiModelProperty("订单编号")
@Excel(name = "订单编号")
private String code;
+ @ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
+ @Excel(name = "订单状态", readConverterExp = "1=待发货,2=待收货,3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
+ private Integer status;
@ApiModelProperty("下单时间")
@Excel(name = "下单时间")
private String createTime;
@@ -40,8 +43,6 @@
private BigDecimal orderMoney;
@ApiModelProperty("订单积分")
private BigDecimal point;
- @ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
- private Integer status;
@ApiModelProperty("配送方式（1=自提，2=快递）")
private Integer distributionMode;
@ApiModelProperty("获得分佣")
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
index b48222f..ca5ead3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
@@ -11,10 +11,12 @@
import com.ruoyi.other.dto.RechargeDto;
import com.ruoyi.other.service.BaseSettingService;
import com.ruoyi.other.service.RechargeSetService;
+import com.ruoyi.other.vo.RechargeSetVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -35,8 +37,13 @@
@GetMapping("/list")
@ApiOperation(value = "充值设置查询", tags = {"后台"})
- public R<List<RechargeSet>> list() {
- return R.ok(rechargeSetService.list());
+ public R<RechargeSetVO> list() {
+ BaseSetting baseSetting = baseSettingService.getById(7);
+ List<RechargeSet> list = rechargeSetService.list();
+ RechargeSetVO rechargeSetVO = new RechargeSetVO();
+ rechargeSetVO.setLimit(new BigDecimal(baseSetting.getContent()));
+ rechargeSetVO.setRechargeSetList(list);
+ return R.ok(rechargeSetVO);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/RechargeSetVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/RechargeSetVO.java
new file mode 100644
index 0000000..ca97f1f
--- /dev/null
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/RechargeSetVO.java
@@ -0,0 +1,13 @@
+package com.ruoyi.other.vo;
+
+import com.ruoyi.other.api.domain.RechargeSet;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class RechargeSetVO {
+ private BigDecimal limit;
+ private List<RechargeSet> rechargeSetList;
+}
--
Gitblit v1.7.1