From 76dd910d1c4ea422700b155c6d38d46ce4e20888 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 二月 2024 10:54:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 6ae6492..b15ac78 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
@@ -1131,7 +1131,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Income> objectId = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid));
+ List<Income> objectId = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("type",1));
double sum = 0;
for (Income income : objectId) {
Double money = income.getMoney();
@@ -1243,6 +1243,21 @@
baseWarpper.setName(language == 1 ? "取消订单费用" : language == 2 ? "Cancellation fee" : "Frais d'annulation");
baseWarpper.setData(new Object());
}
+ if("5".equals(type)){
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("content", language == 1 ? "优惠券 (平台补贴)" : language == 2 ? "Coupon (I-GO Promotions)" : "Coupon (Promotions d’I-GO)");
+ baseWarpper.setData(map1);
+ }
+ if("6".equals(type)){
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("content", language == 1 ? "折扣 (平台补贴)" : language == 2 ? "Discount (I-GO Promotions)" : "Rabais (Promotions d’I-GO)");
+ baseWarpper.setData(map1);
+ }
+ if("7".equals(type)){
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("content", language == 1 ? "红包 (平台补贴)" : language == 2 ? "Lucky promo (I-GO Promotions)" : "Bonus (Promotions d’I-GO)");
+ baseWarpper.setData(map1);
+ }
data.add(baseWarpper);
}
return ResultUtil.success(data);
--
Gitblit v1.7.1