From e47a578e0caace7c23b38aecf16c378eb75ff963 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 10 四月 2024 12:05:37 +0800
Subject: [PATCH] 提交1.0版本
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 83fa659..e858a79 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -9,6 +9,7 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
+import com.stylefeng.guns.modular.system.dao.DriverActivityHistoryMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ALiSendSms;
@@ -27,6 +28,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -84,6 +86,9 @@
@Autowired
private TEmailService emailService;
+
+ @Resource
+ private DriverActivityHistoryMapper driverActivityHistoryMapper;
@@ -1106,11 +1111,35 @@
List<Map<String, Object>> list = driverService.queryActivityIncome(language, uid, pageNum, size);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
- BaseWarpper baseWarpper = new BaseWarpper();
- baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
- baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
- baseWarpper.setName(language == 1 ? "活动奖励" : language == 2 ? "Activity reward" : "Récompenses pour événements");
- data.add(baseWarpper);
+ String incomeId = map.get("incomeId").toString();
+ DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectById(incomeId);
+ if(null == driverActivityHistory){
+ BaseWarpper baseWarpper = new BaseWarpper();
+ baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
+ baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
+ baseWarpper.setName(language == 1 ? "活动奖励" : language == 2 ? "Activity reward" : "Récompenses pour événements");
+ data.add(baseWarpper);
+ }else{
+ Integer type = driverActivityHistory.getType();
+ BaseWarpper baseWarpper = new BaseWarpper();
+ baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
+ baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
+ switch (type){
+ case 1:
+ baseWarpper.setName(language == 1 ? "邀请司机奖励(活动)" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent");
+ break;
+ case 2:
+ baseWarpper.setName(language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent");
+ break;
+ case 3:
+ baseWarpper.setName(language == 1 ? "在线时长奖励(活动)" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne");
+ break;
+ case 4:
+ baseWarpper.setName(language == 1 ? "累计接单奖励(活动)" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes");
+ break;
+ }
+ data.add(baseWarpper);
+ }
}
return ResultUtil.success(data);
}catch (Exception e){
@@ -1192,6 +1221,9 @@
switch (Integer.valueOf(map.get("orderType").toString())){
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(map.get("incomeId").toString());
+ if(null == orderPrivateCar){
+ continue;
+ }
List<Income> incomes = incomeService.queryData(1, null, 2, orderPrivateCar.getId(), 1);
map1.put("travelMoney", orderPrivateCar != null ? orderPrivateCar.getOrderMoney() : 0);//行程费
map1.put("parkMoney", orderPrivateCar != null ? orderPrivateCar.getParkMoney() : 0);//停车费
--
Gitblit v1.7.1