From 17f18c3d56a70327874aa7dda0adfa2f5e3dafce Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:57:38 +0800
Subject: [PATCH] 代理商修改优惠券展示
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 108 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 88 insertions(+), 20 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..4c6f5ce 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;
@@ -32,6 +31,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
@@ -42,12 +42,14 @@
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;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.text.DateFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
@@ -93,6 +95,12 @@
@Autowired
private ITRechargeRecordService tRechargeRecordService;
+ @Autowired
+ private ITSystemConfigService systemConfigService;
+
+ @Resource
+ private AccountChangeDetailMapper accountChangeDetailMapper;
+
private Logger log = LoggerFactory.getLogger(this.getClass());
/**
@@ -123,10 +131,17 @@
* 跳转到修改
*/
@RequestMapping("/tDriver_update")
- public String tDriverUpdate( Integer tDriverId, Model model) {
+ public String tDriverUpdate( Integer tDriverId, Model model) throws ParseException {
TDriver tDriver = tDriverService.selectById(tDriverId);
TDriverResp tDriverResp = new TDriverResp();
BeanUtils.copyProperties(tDriver,tDriverResp);
+
+ if(Objects.nonNull(tDriverResp.getFirstCertificateTime())){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String format1 = format.format(tDriverResp.getFirstCertificateTime());
+ tDriverResp.setFirstCertificateTimeStr(format1);
+ }
+// tDriverResp.setFirstCertificateTime(format.parse(format1));
// 查询邀请人
TDriver tDriver1 = tDriverService.selectById(tDriver.getInviterId());
@@ -141,9 +156,22 @@
TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tDriver.getCityCode())
.last("LIMIT 1"));
- tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
- if(Objects.nonNull(district) && Objects.nonNull(city)){
- tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+// tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
+// if(Objects.nonNull(district) && Objects.nonNull(city)){
+// tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+// }
+ if(StringUtils.hasLength(tDriver.getAreaName()) && !tDriver.getAreaName().equals(tDriver.getCityName())){
+ tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
+ }else {
+ tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName());
+ }
+
+ if(Objects.nonNull(city)){
+ if(Objects.nonNull(district) && !district.getCode().equals(city.getCode())){
+ tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+ }else {
+ tDriverResp.setAreaId(city.getParentId()+"/"+city.getId());
+ }
}
model.addAttribute("item",tDriverResp);
@@ -234,12 +262,20 @@
String[] split = area.split("/");
model.addAttribute("provinceName",split[0]);
model.addAttribute("cityName",split[1]);
- model.addAttribute("districtName",split[2]);
+ if(split.length>2){
+ model.addAttribute("districtName",split[2]);
+ }else {
+ model.addAttribute("districtName","");
+ }
String[] split1 = areaId.split("/");
model.addAttribute("provinceId",split1[0]);
model.addAttribute("cityId",split1[1]);
- model.addAttribute("districtId",split1[2]);
+ if(split1.length>2) {
+ model.addAttribute("districtId", split1[2]);
+ }else {
+ model.addAttribute("districtId", "");
+ }
List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
@@ -253,7 +289,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 +303,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 +330,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 +535,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