From b1412a03ad6f68ab592f4599a318421966c556c2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 19 五月 2024 14:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 63159ad..0ad9155 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
@@ -358,33 +358,33 @@
res.add(grantVO);
}
// 已领取司机奖励
- for (DriverActivityHistory driverActivityHistory : driverActivityHistories) {
- GrantVO grantVO = new GrantVO();
- grantVO.setInsertTime(format.format(driverActivityHistory.getInsertTime()));
- grantVO.setType("司机奖励");
- grantVO.setAmount(driverActivityHistory.getMoney().toString());
- TDriver tDriver = driverService.selectById(driverActivityHistory.getDriverId());
- if (tDriver!=null){
- grantVO.setName(tDriver.getFirstName()+tDriver.getLastName());
- }
- Integer type1 = driverActivityHistory.getType();
- switch (type1){
- case 1:
- grantVO.setRemark("邀请司机注册");
- break;
- case 2:
- grantVO.setRemark("邀请用户注册");
- break;
- case 3:
- grantVO.setRemark("累计在线");
- break;
- case 4:
- grantVO.setRemark("订单量");
- break;
- }
- driver = driver.add(new BigDecimal(driverActivityHistory.getMoney().toString()));
- res.add(grantVO);
- }
+// for (DriverActivityHistory driverActivityHistory : driverActivityHistories) {
+// GrantVO grantVO = new GrantVO();
+// grantVO.setInsertTime(format.format(driverActivityHistory.getInsertTime()));
+// grantVO.setType("司机奖励");
+// grantVO.setAmount(driverActivityHistory.getMoney().toString());
+// TDriver tDriver = driverService.selectById(driverActivityHistory.getDriverId());
+// if (tDriver!=null){
+// grantVO.setName(tDriver.getFirstName()+tDriver.getLastName());
+// }
+// Integer type1 = driverActivityHistory.getType();
+// switch (type1){
+// case 1:
+// grantVO.setRemark("邀请司机注册");
+// break;
+// case 2:
+// grantVO.setRemark("邀请用户注册");
+// break;
+// case 3:
+// grantVO.setRemark("累计在线");
+// break;
+// case 4:
+// grantVO.setRemark("订单量");
+// break;
+// }
+// driver = driver.add(new BigDecimal(driverActivityHistory.getMoney().toString()));
+// res.add(grantVO);
+// }
total = total.add(redPackage).add(coupon).add(discount).add(driver);
return res;
}
--
Gitblit v1.7.1