From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 19ee14a..ba8d672 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -85,6 +85,9 @@
@Resource
private DriverMapper driverMapper;
+
+ @Autowired
+ private DateUtil dateUtil;
@Resource
private DriverActivityRegisteredMapper driverActivityRegisteredMapper;
@@ -305,14 +308,17 @@
if(null != uid){
if(type == 2){//司机分享
Driver driver = driverMapper.selectById(uid);
- List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
+ Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+ //邀请用户注册
+ List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 2, 1, date.get("startTime"), date.get("endTime"));
BigDecimal bigDecimal = new BigDecimal("0");
- for(Map<String, Object> map : query){
- if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
- bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
- incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
- }
+ for (DriverActivityHistory driverActivityHistory : list) {
+ bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
+ incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
+ driverActivityHistory.setCarryOut(2);
+ driverActivityHistoryMapper.updateById(driverActivityHistory);
}
+
driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -655,18 +661,13 @@
if(null != uid){
if(type == 2){//司机分享
Driver driver = driverMapper.selectById(uid);
- List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
+ Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+ //邀请用户注册
+ List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 2, 1, date.get("startTime"), date.get("endTime"));
BigDecimal bigDecimal = new BigDecimal("0");
- for(Map<String, Object> map : query){
- if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
- bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
- incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
- }
- DriverActivityHistory dah = new DriverActivityHistory();
- dah.setActivityId(Integer.valueOf(map.get("id").toString()));
- dah.setDriverId(uid);
- dah.setType(2);
- DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+ for (DriverActivityHistory driverActivityHistory : list) {
+ bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
+ incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
driverActivityHistory.setCarryOut(2);
driverActivityHistoryMapper.updateById(driverActivityHistory);
}
@@ -1580,8 +1581,8 @@
userInfo1.setSex(userInfo.getSex());
userInfo1.setNickName(userInfo.getNickName());
this.updateById(userInfo1);
-
- this.deleteById(userInfo.getId());//删除原有数据
+ userInfo.setFlag(3);
+ this.updateById(userInfo);//删除原有数据
//还原之前账号领取的注册优惠券
List<UserCouponRecord> list = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("userId", userInfo.getId()));
for(UserCouponRecord ucr : list){
@@ -1731,6 +1732,9 @@
@Override
public ResultUtil depositBalance(Integer payType, String bankCardId, Double money, Integer uid, Integer type, Integer language) throws Exception {
UserInfo userInfo = userInfoMapper.selectById(uid);
+ if(ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
+ }
if(money.compareTo(0D) <= 0){
return ResultUtil.error(language == 1 ? "支付金额必须大于0元" : language == 2 ? "Payment amount must be greater than zero." : "Le montant du paiement doit être supérieur à zéro.", "");
}
--
Gitblit v1.7.1