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/controller/order/AdminMallOrderController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java
index 852b5b5..2ce691d 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java
@@ -513,7 +513,7 @@
orderSheet.setTitle(title);
// String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "配送方式", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};
- String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "自提点名称", "自提点号码", "自提点名称"};
+ String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "联系人", "联系号码", "自提点名称"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -522,13 +522,17 @@
List<MallOrderInfo> dataList = new ArrayList<>();
String orderIds = mallOrderInfo.getOrderIds();
List<String> ids = StrUtil.splitTrim(orderIds, ",");
+ String takeUniqueCode = "";
for(String id : ids){
long orderId = Long.parseLong(id);
MallOrderInfo mallOrderInfo1 = mallOrderInfoMapper.selectAllOrderInfoByIdAndTakeUniqueCode(orderId,mallOrderInfo.getTakeUniqueCode());
if(ObjectUtil.isNotEmpty(mallOrderInfo1)){
dataList.add(mallOrderInfo1);
+ takeUniqueCode = mallOrderInfo1.getTakeUniqueCode();
}
}
+
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
// List<MallOrderInfo> dataList = adminMallOrderService.findOrderListInPage(mallOrderInfo, request).getRecords();
List<List<Object>> list = new ArrayList<>();
if (CollUtil.isNotEmpty(dataList)) {
@@ -556,9 +560,9 @@
temp.add(item.getPhone());
temp.add(item.getAddress());
- temp.add(item.getLeaderName());
- temp.add(item.getLeaderPhone());
- temp.add(item.getAddressArea());
+ temp.add(mallTeamLeader.getName());
+ temp.add(mallTeamLeader.getPhone());
+ temp.add(mallTeamLeader.getAddressArea());
list.add(temp);
// adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
}
@@ -566,7 +570,6 @@
orderSheet.setDataList(list);
res.add(orderSheet);
response = ResponseHeadUtil.setExcelHead(response);
- MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(mallOrderInfo.getTakeUniqueCode());
String name = mallTeamLeader.getName();
response.setHeader("Content-Disposition",
"attachment;filename=" + URLEncoder.encode(name+"-"+title + DateUtil.format(new Date(), "yyyyMMDDHHmmss") + ".xlsx".trim(), "UTF-8"));
--
Gitblit v1.9.1