From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:06:14 +0800
Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询，加入了积分金额和积分价格的计算
---
src/main/java/cc/mrbird/febs/mall/controller/memberLevel/ViewHappyMemberLevelController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/ViewHappyMemberLevelController.java b/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/ViewHappyMemberLevelController.java
index 37f6e3e..9f5cd3e 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/ViewHappyMemberLevelController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/ViewHappyMemberLevelController.java
@@ -4,12 +4,10 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.mall.entity.HappyActivity;
-import cc.mrbird.febs.mall.entity.HappyActivityCategory;
-import cc.mrbird.febs.mall.entity.HappyActivityOption;
-import cc.mrbird.febs.mall.entity.HappyMemberLevel;
+import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.HappyActivityCategoryMapper;
import cc.mrbird.febs.mall.mapper.HappyActivityOptionMapper;
+import cc.mrbird.febs.mall.mapper.HappySaleLevelMapper;
import cc.mrbird.febs.mall.service.AdminMemberLevelService;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
import cn.hutool.core.util.StrUtil;
@@ -27,6 +25,7 @@
public class ViewHappyMemberLevelController extends BaseController {
private final AdminMemberLevelService adminMemberLevelService;
+ private final HappySaleLevelMapper happySaleLevelMapper;
/**
* 会员等级列表
@@ -61,4 +60,40 @@
return FebsUtil.view("modules/levelView/levelInfo");
}
+
+
+
+ /**
+ * 分销等级列表
+ */
+ @GetMapping("saleList")
+ @RequiresPermissions("saleList:view")
+ public String saleList() {
+ return FebsUtil.view("modules/levelView/saleList");
+ }
+
+ /**
+ * 分销等级新增
+ * @return
+ */
+ @GetMapping(value = "/saleAdd")
+ @RequiresPermissions("saleAdd:add")
+ public String saleAdd() {
+ return FebsUtil.view("modules/levelView/saleAdd");
+ }
+
+ /**
+ * 分销等级编辑
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("saleInfo/{id}")
+ @RequiresPermissions("saleInfo:view")
+ public String saleInfo(@PathVariable long id, Model model) {
+ HappySaleLevel happySaleLevel = happySaleLevelMapper.selectById(id);
+ model.addAttribute("happySaleLevel", happySaleLevel);
+ return FebsUtil.view("modules/levelView/saleInfo");
+ }
+
}
--
Gitblit v1.9.1