From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 0f77c5a..b232622 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
@@ -4,6 +4,7 @@
import com.dsh.other.entity.StoredValueConfig;
import com.dsh.other.service.StoredValueConfigService;
import com.dsh.other.util.ResultUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,20 +34,22 @@
private StoredValueConfigService svconfigService;
@ResponseBody
-
@PostMapping("/base/stored/getRechargeArrange")
public List<Map<String,Object>> getRechargeConfig(){
List<Map<String,Object>> responses = new ArrayList<>();
StoredValueConfig storedValueConfig = svconfigService.list().get(0);
try {
ObjectMapper objectMapper = new ObjectMapper();
- JsonNode rulesNode = objectMapper.readTree(storedValueConfig.getContent()).path("rules");
+ JsonNode rulesNode = objectMapper.readTree(storedValueConfig.getContent()).get("rules");
if (rulesNode.isArray()) {
+ int i = 0;
for (JsonNode ruleNode : rulesNode) {
+ i = i + 1;
Map<String,Object> de = new HashMap<>();
- String money = ruleNode.get("money").asText();
- String usersCoins = ruleNode.get("usersCoins").asText();
- String MemberCoins = ruleNode.get("MemberCoins").asText();
+ 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);
@@ -68,6 +71,7 @@
public ResultUtil<String> rechargeCenterConfig(){
try {
StoredValueConfig storedValueConfig = svconfigService.list().get(0);
+ System.out.println(svconfigService.list());
return ResultUtil.success(storedValueConfig.getDescription());
}catch (Exception e){
return ResultUtil.runErr();
--
Gitblit v1.7.1