From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 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..bc710d2 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.*;
/**
@@ -59,22 +57,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) {
--
Gitblit v1.7.1