From c4a098e3f88bc5071e36b92b9e5dcceb51129957 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:25:07 +0800
Subject: [PATCH] 同步后台代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 7a85671..bfc2786 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -14,11 +15,9 @@
import com.stylefeng.guns.modular.system.controller.util.HttpUtils;
import com.stylefeng.guns.modular.system.controller.util.TokenUtils;
import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
+import com.stylefeng.guns.modular.system.dao.AccountChangeDetailMapper;
import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
-import com.stylefeng.guns.modular.system.model.TDriver;
-import com.stylefeng.guns.modular.system.model.TDriverWork;
-import com.stylefeng.guns.modular.system.model.TRechargeRecord;
-import com.stylefeng.guns.modular.system.model.TRegion;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
@@ -42,6 +41,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
@@ -92,6 +92,12 @@
private RedisUtil redisUtil;
@Autowired
private ITRechargeRecordService tRechargeRecordService;
+
+ @Autowired
+ private ITSystemConfigService systemConfigService;
+
+ @Resource
+ private AccountChangeDetailMapper accountChangeDetailMapper;
private Logger log = LoggerFactory.getLogger(this.getClass());
@@ -253,7 +259,7 @@
// 查询区
List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
- List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+ List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
model.addAttribute("districtList",tRegions2);
return PREFIX + "tDriverAreaUpdate.html";
@@ -267,15 +273,15 @@
String[] split1 = areaId.split("/");
List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
model.addAttribute("provinceList",tRegions);
- List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
- // 查询市
- List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
- model.addAttribute("cityList",tRegions1);
-
- // 查询区
- List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
- List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
- model.addAttribute("districtList",tRegions2);
+// List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
+// // 查询市
+// List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+// model.addAttribute("cityList",tRegions1);
+//
+// // 查询区
+// List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
+// List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+// model.addAttribute("districtList",tRegions2);
if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){
String[] split = area.split("/");
@@ -294,7 +300,17 @@
}else {
model.addAttribute("districtId", "");
}
+
+ List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+ model.addAttribute("cityList",tRegions1);
+
+ // 查询区
+ List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
+ model.addAttribute("districtList",tRegions2);
}else {
+ model.addAttribute("cityList",new ArrayList<>());
+ model.addAttribute("districtList",new ArrayList<>());
+
model.addAttribute("provinceName","");
model.addAttribute("cityName","split[1]");
model.addAttribute("districtName","");
@@ -489,6 +505,28 @@
tDriver.setApprovalUserId(shiroUser.getId());
tDriver.setApprovalTime(new Date());
tDriverService.updateById(tDriver);
+
+ //增加积分奖励
+ if(approvalStatus == 2 && null != tDriver.getInviterId()){
+ TSystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 4));
+ Integer num7 = JSON.parseObject(systemConfig.getContent()).getInteger("num7");
+ TDriver tDriver1 = tDriverService.selectById(tDriver.getInviterId());
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(tDriver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(10);
+ accountChangeDetail.setOldData(tDriver1.getIntegral().doubleValue());
+ tDriver1.setIntegral(tDriver1.getIntegral() + num7);
+ accountChangeDetail.setNewData(tDriver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("推荐奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetailMapper.insert(accountChangeDetail);
+ tDriverService.updateById(tDriver1);
+ }
+
return SUCCESS_TIP;
}
--
Gitblit v1.7.1