From 9cf47e10044ecb29669dec48d8b649b4fb46898f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 04 Jun 2023 00:51:54 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 2bd2078..d824cdd 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -6,6 +6,7 @@
 import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
 import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.mall.mapper.MallSystemSettingMapper;
 import cc.mrbird.febs.mall.service.ICommonService;
 import cc.mrbird.febs.mall.service.IMemberProfitService;
 import cc.mrbird.febs.mall.service.ISystemService;
@@ -14,12 +15,11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Map;
 
 @Slf4j
@@ -40,6 +40,7 @@
     private final AgentProducer agentProducer;
 
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+    private final MallSystemSettingMapper mallSystemSettingMapper;
 
     @PostMapping(value = "/bonusSystemSetting")
     public FebsResponse bonusSystemSetting(@RequestBody Map<String, Object> map) {
@@ -132,6 +133,11 @@
                 hlmVoucherSetDto.getAchieveReleasePercent());
 
         commonService.updateDataDic(
+                GreenScoreEnum.ACHIEVE_RELEASE.getType(),
+                GreenScoreEnum.ACHIEVE_RELEASE.getCode(),
+                hlmVoucherSetDto.getAchieveRelease());
+
+        commonService.updateDataDic(
                 GreenScoreEnum.ACHIEVE_MAX.getType(),
                 GreenScoreEnum.ACHIEVE_MAX.getCode(),
                 hlmVoucherSetDto.getAchieveMax());
@@ -195,4 +201,9 @@
         agentProducer.sendForceVoucherSaleMsg(scorePriceDic.getValue());
         return new FebsResponse().success();
     }
+
+    @GetMapping(value = "/bonusSetting")
+    public FebsResponse bonusSetting() {
+        return new FebsResponse().success().data(Collections.singletonList(mallSystemSettingMapper.selectById(1L)));
+    }
 }

--
Gitblit v1.9.1