From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java | 69 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
index e4c287a..6d46ebf 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
@@ -13,10 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
@@ -32,7 +30,7 @@
private StoredValueConfigService svconfigService;
@RequestMapping("/base/storeValueConfig/addStoreValueConfig")
- public Object addStoreValueConfig(@RequestBody StoredValueConfig storedValueConfig){
+ public Object addStoreValueConfig(@RequestBody StoredValueConfig storedValueConfig) {
StoredValueConfig one = svconfigService.getOne(new QueryWrapper<>());
one.setContent(storedValueConfig.getContent());
one.setDescription(storedValueConfig.getDescription());
@@ -41,13 +39,14 @@
}
@RequestMapping("/base/storeValueConfig/getStoreValueConfig")
- public StoredValueConfig getStoreValueConfig(){
+ public StoredValueConfig getStoreValueConfig() {
return svconfigService.getOne(new QueryWrapper<>());
}
+
@ResponseBody
@PostMapping("/base/stored/getRechargeArrange")
- public List<Map<String,Object>> getRechargeConfig(){
- List<Map<String,Object>> responses = new ArrayList<>();
+ public List<Map<String, Object>> getRechargeConfig() {
+ List<Map<String, Object>> responses = new ArrayList<>();
StoredValueConfig storedValueConfig = svconfigService.list().get(0);
try {
ObjectMapper objectMapper = new ObjectMapper();
@@ -59,22 +58,43 @@
String startTime = jsonNode.get("startTime").asText();
String endTime = jsonNode.get("endTime").asText();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date start = format.parse(startTime);
+ Date end = format.parse(endTime);
+ Date now = new Date();
+ if (now.after(start) && now.before(end)) {
+ if (rulesNode1.isArray()) {
+ int i = 0;
+ for (JsonNode ruleNode : rulesNode1) {
+ i = i + 1;
+ Map<String, Object> de = new HashMap<>();
+ double money = ruleNode.get("money").asDouble();
+ Integer usersCoins = ruleNode.get("usersCoins").asInt();
+ Integer MemberCoins = ruleNode.get("MemberCoins").asInt();
+ de.put("chargeId", i);
+ de.put("money", money);
+ de.put("usersCoins", usersCoins);
+ de.put("MemberCoins", MemberCoins);
+ responses.add(de);
+ }
+ }
-
- if (rulesNode.isArray()) {
- int i = 0;
- for (JsonNode ruleNode : rulesNode) {
- i = i + 1;
- Map<String,Object> de = new HashMap<>();
- double money = ruleNode.get("money").asDouble();
- Integer usersCoins = ruleNode.get("usersCoins").asInt();
- Integer MemberCoins = ruleNode.get("MemberCoins").asInt();
- de.put("chargeId",i);
- de.put("money",money);
- de.put("usersCoins",usersCoins);
- de.put("MemberCoins",MemberCoins);
- responses.add(de);
+ } else {
+ if (rulesNode.isArray()) {
+ int i = 0;
+ for (JsonNode ruleNode : rulesNode) {
+ i = i + 1;
+ Map<String, Object> de = new HashMap<>();
+ double money = ruleNode.get("money").asDouble();
+ Integer usersCoins = ruleNode.get("usersCoins").asInt();
+ Integer MemberCoins = ruleNode.get("MemberCoins").asInt();
+ de.put("chargeId", i);
+ de.put("money", money);
+ de.put("usersCoins", usersCoins);
+ de.put("MemberCoins", MemberCoins);
+ responses.add(de);
+ }
}
}
} catch (Exception e) {
@@ -89,16 +109,15 @@
@ApiOperation(value = "充值中心-储值说明", tags = {"APP-使用福利"})
@ApiImplicitParams({
})
- public ResultUtil<String> rechargeCenterConfig(){
+ public ResultUtil<String> rechargeCenterConfig() {
try {
StoredValueConfig storedValueConfig = svconfigService.list().get(0);
System.out.println(svconfigService.list());
return ResultUtil.success(storedValueConfig.getDescription());
- }catch (Exception e){
+ } catch (Exception e) {
return ResultUtil.runErr();
}
}
-
}
--
Gitblit v1.7.1