From 4e34319c9d3f57bd20e12e45e8ecbae8e0435591 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 04 Jun 2023 00:28:04 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/SystemServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/SystemServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/SystemServiceImpl.java
index c702346..dbef327 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/SystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/SystemServiceImpl.java
@@ -1,15 +1,25 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.mall.dto.CashOutSettingDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
+import cc.mrbird.febs.mall.entity.MallBonusRecord;
+import cc.mrbird.febs.mall.entity.MallSystemSetting;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.mall.mapper.MallBonusRecordMapper;
+import cc.mrbird.febs.mall.mapper.MallSystemSettingMapper;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.service.ISystemService;
+import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -25,12 +35,41 @@
private final DataDictionaryCustomMapper dictionaryCustomMapper;
private final ICommonService commonService;
+ private final MallSystemSettingMapper mallSystemSettingMapper;
+ private final MallBonusRecordMapper mallBonusRecordMapper;
@Override
+ @Transactional(rollbackFor = Exception.class)
public void bonusSystemSetting(Map<String, Object> map) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getValue() instanceof String) {
dictionaryCustomMapper.updateDicValueByTypeAndCode(null, entry.getKey(), (String) entry.getValue());
+ } else if (entry.getValue() instanceof LinkedHashMap) {
+ LinkedHashMap<String, Object> bonusSettingMap = (LinkedHashMap<String, Object>) entry.getValue();
+ LambdaQueryWrapper<MallSystemSetting> update = new LambdaQueryWrapper<>();
+ update.eq(MallSystemSetting::getId, bonusSettingMap.get("id"))
+ .eq(MallSystemSetting::getRevision, bonusSettingMap.get("revision"));
+
+ MallSystemSetting old = mallSystemSettingMapper.selectById(1L);
+ MallSystemSetting setting = new MallSystemSetting();
+ setting.setRevision((Integer) bonusSettingMap.get("revision") + 1);
+ setting.setId(Long.parseLong(bonusSettingMap.get("id").toString()));
+ setting.setAllBonus(new BigDecimal(bonusSettingMap.get("allBonus").toString()));
+ setting.setAgentBonus(new BigDecimal(bonusSettingMap.get("agentBonus").toString()));
+ setting.setPartnerBonus(new BigDecimal(bonusSettingMap.get("partnerBonus").toString()));
+ int i = mallSystemSettingMapper.update(setting, update);
+ if (i == 0) {
+ throw new FebsException("请刷新页面");
+ }
+
+ if (old.getAllBonus().compareTo(setting.getAllBonus()) != 0 || old.getAgentBonus().compareTo(setting.getAgentBonus()) != 0 || old.getPartnerBonus().compareTo(setting.getPartnerBonus()) != 0) {
+ MallBonusRecord record = new MallBonusRecord();
+ record.setAmount(BigDecimal.ZERO);
+ record.setType(999);
+ record.setComment(JSONObject.toJSONString(old) + "-" + JSONObject.toJSONString(setting));
+ record.setCreateTime(new Date());
+ mallBonusRecordMapper.insert(record);
+ }
} else {
List<LinkedHashMap<String, Object>> value = (List<LinkedHashMap<String, Object>>) entry.getValue();
--
Gitblit v1.9.1