From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:18 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java | 84 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 22 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 2276dd6..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
@@ -1,23 +1,20 @@
package com.dsh.other.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+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,8 +29,20 @@
@Autowired
private StoredValueConfigService svconfigService;
- @ResponseBody
+ @RequestMapping("/base/storeValueConfig/addStoreValueConfig")
+ public Object addStoreValueConfig(@RequestBody StoredValueConfig storedValueConfig){
+ StoredValueConfig one = svconfigService.getOne(new QueryWrapper<>());
+ one.setContent(storedValueConfig.getContent());
+ one.setDescription(storedValueConfig.getDescription());
+ return svconfigService.updateById(one);
+ }
+
+ @RequestMapping("/base/storeValueConfig/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<>();
@@ -41,19 +50,50 @@
try {
ObjectMapper objectMapper = new ObjectMapper();
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();
- de.put("chargeId",i);
- de.put("money",money);
- de.put("usersCoins",usersCoins);
- de.put("MemberCoins",MemberCoins);
- responses.add(de);
+
+ JsonNode rulesNode1 = objectMapper.readTree(storedValueConfig.getContent()).get("time_rules");
+
+ JsonNode jsonNode = rulesNode1.get(0);
+ 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);
+ }
+ }
+
+
+ }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