From 5bd109cbeb9545bab28a0b2bd267e02bf3752f0e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 26 Sep 2023 10:01:54 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
index 9ca3b6f..f6444ee 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -1,9 +1,11 @@
package cc.mrbird.febs.mall.controller;
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.mall.dto.AdminAgentAmountDto;
import cc.mrbird.febs.mall.dto.AdminAgentDetailDto;
+import cc.mrbird.febs.mall.dto.AdminIndexVideoDto;
import cc.mrbird.febs.mall.dto.CashOutSettingDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
@@ -21,6 +23,8 @@
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -75,14 +79,28 @@
return new FebsResponse().fail().message("请刷新页面重试");
}
+ DataDictionaryCustom chargeAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CHARGE_AMOUNT.getType(),
+ DataDictionaryEnum.CHARGE_AMOUNT.getCode());
+ if(ObjectUtil.isEmpty(chargeAmountDic)){
+ return new FebsResponse().fail().message("请刷新页面重试");
+ }
+
String giveState = adminAgentAmountDto.getGiveState();
if(1 == Integer.parseInt(giveState)){
if(ObjectUtil.isEmpty(adminAgentAmountDto.getActivityBulletin())){
return new FebsResponse().fail().message("活动公告不能为空");
}
- if(ObjectUtil.isEmpty(adminAgentAmountDto.getActivityBulletin())
- || BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getActivityBulletin())) > 0){
+ if(ObjectUtil.isEmpty(adminAgentAmountDto.getGiveAmount())){
return new FebsResponse().fail().message("请输入正确的赠送金额");
+ }
+ if(BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getGiveAmount())) > 0){
+ return new FebsResponse().fail().message("请输入正确的赠送金额");
+ }
+ if(ObjectUtil.isEmpty(adminAgentAmountDto.getChargeAmount())){
+ return new FebsResponse().fail().message("请输入正确的充值金额");
+ }
+ if(BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getChargeAmount())) > 0){
+ return new FebsResponse().fail().message("请输入正确的充值金额");
}
}
@@ -98,7 +116,10 @@
giveAmountDic.setValue(adminAgentAmountDto.getGiveAmount());
dataDictionaryCustomMapper.updateById(giveAmountDic);
- return new FebsResponse().success();
+ chargeAmountDic.setValue(adminAgentAmountDto.getChargeAmount());
+ dataDictionaryCustomMapper.updateById(chargeAmountDic);
+
+ return new FebsResponse().success().message("操作成功");
}
@PostMapping(value = "/agentDetail")
@@ -114,4 +135,43 @@
dataDictionaryCustomMapper.updateById(dic);
return new FebsResponse().success();
}
+
+ @PostMapping(value = "/indexVideoSet")
+ public FebsResponse indexVideoSet(AdminIndexVideoDto adminIndexVideoDto) {
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.VIDEO_URL_INDEX.getType(),
+ DataDictionaryEnum.VIDEO_URL_INDEX.getCode()
+ );
+ if(ObjectUtil.isEmpty(dic)){
+ return new FebsResponse().fail().message("请刷新页面重试");
+ }
+ dic.setValue(adminIndexVideoDto.getVideoUrl());
+ dataDictionaryCustomMapper.updateById(dic);
+ return new FebsResponse().success();
+ }
+
+// public static void main(String[] args) {
+// List<Integer> lines = Arrays.asList(new Integer[]{1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0});
+// //数字连续出现的计数
+// Integer symbol = 0;
+// //数字连续出现的次数限制
+// Integer times = 3;
+// //出现的数字
+// Integer symbolNum = 1;
+// //满足规则的次数
+// Integer timesOneSign = 0;
+// for(int i=0;i<lines.size();i++){
+// if(symbolNum == lines.get(i)){
+// symbol = symbol + 1;
+// if(symbol >= times){
+// timesOneSign = timesOneSign + 1;
+// symbol = 0;
+// }
+// }else{
+// symbol = 0;
+// }
+// }
+//
+// System.out.println(timesOneSign);
+// }
}
--
Gitblit v1.9.1