From 821fc2f632f8b974a2c0fc37630e13c5fbe6086c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 17:26:16 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
index e5d9aed..35a7f04 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -11,6 +11,7 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -165,23 +166,14 @@
if (SinataUtil.isNotEmpty(userActivityDiscount1)) {
// 专车
Map<String, Object> resultMap = userCouponRecordService.getDiscountStatic(startTimes, endTimes, userActivityDiscount1.getId());
- BigDecimal bigDecimal = new BigDecimal(resultMap.get("money").toString());
- String string = resultMap.get("number").toString();
- Integer i = Integer.valueOf(string);
- // 小件物流
- Map<String, Object> resultMap1 = userCouponRecordService.getDiscountStatic1(startTimes, endTimes, userActivityDiscount1.getId());
- if (null != resultMap1) {
- BigDecimal bigDecimal1 = new BigDecimal(resultMap1.get("money").toString());
- String string1 = resultMap1.get("number").toString();
- Integer i1 = Integer.valueOf(string1);
- BigDecimal add = bigDecimal.add(bigDecimal1);
- i += i1;
- map.put("userActivityDiscount1Money", add);
- map.put("userActivityDiscount1Number", i);
- } else {
- map.put("userActivityDiscount1Money", 0);
- map.put("userActivityDiscount1Number", 0);
+ BigDecimal bigDecimal = BigDecimal.ZERO;
+ String string = "";
+ if(null != resultMap){
+ bigDecimal = new BigDecimal(resultMap.get("money").toString());
+ string = resultMap.get("number").toString();
}
+ map.put("userActivityDiscount1Money", bigDecimal);
+ map.put("userActivityDiscount1Number", string);
} else {
map.put("userActivityDiscount1Money", 0);
map.put("userActivityDiscount1Number", 0);
@@ -430,8 +422,12 @@
@RequestMapping(value = "/updateStatus")
@ResponseBody
public Object updateStatus(UserActivity driverActivity) {
+ UserActivity userActivity = userActivityService.selectById(driverActivity.getId());
+ if(System.currentTimeMillis() >= userActivity.getEndTime().getTime()){
+ return ResultUtil.error("活动已结束，修改状态失败");
+ }
userActivityService.updateById(driverActivity);
- return SUCCESS_TIP;
+ return ResultUtil.success();
}
/**
--
Gitblit v1.7.1