From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:44 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 adab99c..a2599a2 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
@@ -21,6 +21,7 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -151,9 +152,20 @@
map.put("userActivityInviteUseMoney",0);
}
if(SinataUtil.isNotEmpty(userActivityDiscount1)){
+ // 专车
Map<String,Object> resultMap = userCouponRecordService.getDiscountStatic(startTimes,endTimes,userActivityDiscount1.getId());
- map.put("userActivityDiscount1Money",resultMap.get("money"));
- map.put("userActivityDiscount1Number",resultMap.get("number"));
+ 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());
+ 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);
--
Gitblit v1.7.1