From 20fb7c22fd9d4a936a2e9f4b003da51a0c2a0217 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 18:11:19 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index 81da78f..0880e19 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -1,18 +1,14 @@
package com.stylefeng.guns.modular.system.controller;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
-import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.vo.GrantMoneyVO;
import com.stylefeng.guns.modular.system.vo.GrantVO;
-import com.stylefeng.guns.modular.system.vo.PlatformVO;
import com.stylefeng.guns.modular.system.vo.UseMoneyVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -21,15 +17,15 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -43,17 +39,6 @@
public class TSubsidyController extends BaseController {
private String PREFIX = "/system/subsidy/";
-
- @RequestMapping("/grant")
- public String index(Model model) {
- return PREFIX + "grant.html";
- }
-
- @RequestMapping("/use")
- public String watter(Model model) {
- return PREFIX + "use.html";
- }
-
@Autowired
private IIncomeService tIncomeService;
@Autowired
@@ -94,7 +79,9 @@
private ISysCouponRecordService sysCouponRecordService;
@Autowired
private IUserActivityDiscount1Service userActivityDiscount1Service;
-
+ @Autowired
+ private ISysRedPacketRecordService sysRedPacketRecordService;
+
public static void main(String[] args) {
String temp = "[{\"money\":14.46,\"id\":91},{\"money\":1,\"id\":90}]";
JSONArray objects = JSONArray.parseArray(temp);
@@ -104,6 +91,16 @@
temp1 = temp1.add(new BigDecimal(string));
}
System.err.println(temp1);
+ }
+
+ @RequestMapping("/grant")
+ public String index(Model model) {
+ return PREFIX + "grant.html";
+ }
+
+ @RequestMapping("/use")
+ public String watter(Model model) {
+ return PREFIX + "use.html";
}
/**
@@ -955,9 +952,6 @@
return useMoneyVO;
}
- @Autowired
- private ISysRedPacketRecordService sysRedPacketRecordService;
-
/**
* 发放补贴统计
*/
@@ -1263,7 +1257,7 @@
// 已领取司机奖励
for (DriverActivityHistory driverActivityHistory : driverActivityHistories) {
GrantVO grantVO = new GrantVO();
- grantVO.setInsertTime(format.format(driverActivityHistory.getInsertTime()));
+ grantVO.setInsertTime(null == driverActivityHistory.getCompletionTime() ? format.format(driverActivityHistory.getInsertTime()) : format.format(driverActivityHistory.getCompletionTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(driverActivityHistory.getMoney().toString());
TDriver tDriver = driverMap.get(driverActivityHistory.getDriverId());
@@ -1279,10 +1273,10 @@
grantVO.setRemark("邀请用户注册");
break;
case 3:
- grantVO.setRemark("累计在线");
+ grantVO.setRemark("在线时长奖励");
break;
case 4:
- grantVO.setRemark("订单量");
+ grantVO.setRemark("累计接单奖励");
break;
}
driver = driver.add(new BigDecimal(driverActivityHistory.getMoney().toString()));
--
Gitblit v1.7.1