From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +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 | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 bc710d2..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
@@ -30,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());
@@ -39,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();
@@ -61,25 +62,25 @@
Date start = format.parse(startTime);
Date end = format.parse(endTime);
Date now = new Date();
- if (now.after(start)&&now.before(end)){
+ 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<>();
+ 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);
+ de.put("chargeId", i);
+ de.put("money", money);
+ de.put("usersCoins", usersCoins);
+ de.put("MemberCoins", MemberCoins);
responses.add(de);
}
}
- }else {
+ } else {
if (rulesNode.isArray()) {
int i = 0;
for (JsonNode ruleNode : rulesNode) {
@@ -108,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