From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
index 6f2fe47..6d4da95 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
@@ -57,9 +57,19 @@
 
     @Override
     public void addDataDic(String type, String code, Object value, String description) {
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+        addDataDic(type, code, value, description, true);
+    }
 
-        String data = JSONObject.toJSONString(value);
+    @Override
+    public void addDataDic(String type, String code, Object value, String description, boolean isJson) {
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+        String data = null;
+        if (isJson) {
+            data = JSONObject.toJSONString(value);
+        } else {
+            data = (String) value;
+        }
+
         if (dic != null) {
             dic.setValue(data);
             dataDictionaryCustomMapper.updateById(dic);
@@ -73,4 +83,13 @@
         dic.setDescription(description);
         dataDictionaryCustomMapper.insert(dic);
     }
+
+    @Override
+    public String getDicByTypeAndCode(String type, String code) {
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+        if (dic != null) {
+            return dic.getValue();
+        }
+        return null;
+    }
 }

--
Gitblit v1.9.1