From 788e0aaa0896bb59ca4379e50bf72b4bd07211a6 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:54:54 +0800
Subject: [PATCH] 车型、司机活动、平台佣金统计代码提交
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 200 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index b3835c2..81f6980 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -1,7 +1,9 @@
package com.stylefeng.guns.modular.system.controller.general;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
@@ -16,7 +18,12 @@
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 系统设置控制器
@@ -53,8 +60,115 @@
@Autowired
private IDriverAssessmentService driverAssessmentService;
+ @Autowired
+ private ITSysOverTimeService sysOverTimeService;
+ /**
+ * 2.0新增红包支付设置
+ * @return
+ */
+ @RequestMapping("/redSet")
+ public String redPackageSet() {
+ return PREFIX + "tRedSet.html";
+ }
+ @RequestMapping("/redSet/addHtml")
+ public String addHtml(Model model) {
+ List<String> strings = new ArrayList<>();
+ strings.add("updateTime");
+ // 查询生效的红包折扣比例
+ List<TSysRedSet> isDelete = sysRedSetService.selectList(new EntityWrapper<TSysRedSet>()
+ .eq("isDelete", 0)
+ .orderDesc(strings));
+ if (isDelete.size()>0){
+ model.addAttribute("new",isDelete.get(0).getProportion());
+ }else{
+ model.addAttribute("new","_");
+ }
+ return PREFIX + "tRedSetAdd.html";
+ }
+ @RequestMapping("/redSet/updateHtml/{id}")
+ public String updateHtml(@PathVariable("id") Integer id,Model model) {
+ TSysRedSet tSysRedSet = sysRedSetService.selectById(id);
+ List<String> strings = new ArrayList<>();
+ strings.add("updateTime");
+ // 查询生效的红包折扣比例
+ List<TSysRedSet> isDelete = sysRedSetService.selectList(new EntityWrapper<TSysRedSet>()
+ .eq("isDelete", 0)
+ .orderDesc(strings));
+ if (isDelete.size()>0){
+ model.addAttribute("new",isDelete.get(0).getProportion());
+ }else{
+ model.addAttribute("new","_");
+ }
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ String format = simpleDateFormat.format(tSysRedSet.getStartTime());
+ model.addAttribute("time",format);
+ model.addAttribute("data",tSysRedSet);
+ return PREFIX + "tRedSetEdit.html";
+ }
+
+ @Autowired
+ private ISysRedSetService sysRedSetService;
+ /**
+ * 红包支付设置记录
+ */
+ @RequestMapping(value = "/redSet/list")
+ @ResponseBody
+ public Object redSetList() {
+
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(sysRedSetService.getList(page));
+ }
+ return super.packForBT(page);
+ }
+ @RequestMapping(value = "/redSet/add")
+ @ResponseBody
+ public Object redSetAdd(String proportion, String startTime) throws ParseException {
+ // 新增红包设置
+ TSysRedSet tSysRedSet = new TSysRedSet();
+ String name = ShiroKit.getUser().getName();
+ tSysRedSet.setHandle(name);
+ tSysRedSet.setProportion(proportion);
+ String replace = startTime.replace("T", " ");
+ String s = replace + ":00";
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = dateFormat.parse(s);
+ tSysRedSet.setStartTime(date);
+ sysRedSetService.insert(tSysRedSet);
+ return SUCCESS_TIP;
+ }
+
+ @RequestMapping(value = "/redSet/update")
+ @ResponseBody
+ public Object redSetUpdate(Integer id,String proportion, String startTime) throws ParseException {
+ // 修改红包设置
+ TSysRedSet tSysRedSet = sysRedSetService.selectById(id);
+ String name = ShiroKit.getUser().getName();
+ tSysRedSet.setHandle(name);
+ tSysRedSet.setProportion(proportion);
+ String replace = startTime.replace("T", " ");
+ String s = replace + ":00";
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = dateFormat.parse(s);
+ tSysRedSet.setStartTime(date);
+ tSysRedSet.setUpdateTime(new Date());
+ sysRedSetService.updateById(tSysRedSet);
+ return SUCCESS_TIP;
+ }
+
+ @RequestMapping(value = "/redSet/delete")
+ @ResponseBody
+ public Object redSetDelete(Integer id) {
+ // 删除红包设置
+ TSysRedSet tSysRedSet = sysRedSetService.selectById(id);
+ tSysRedSet.setIsDelete(1);
+ sysRedSetService.updateById(tSysRedSet);
+ return SUCCESS_TIP;
+ }
/**
* 跳转到系统设置首页
*/
@@ -98,10 +212,12 @@
model.addAttribute("czcAssignOrder", czcAssignOrder);
//普通取消设置(专车)
- TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+ TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>()
+ .eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
model.addAttribute("ptCancel1",ptCancel1);
//普通取消设置(出租车)
- TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+ TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>()
+ .eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
model.addAttribute("ptCancel2",ptCancel2);
//普通取消设置(跨城出行)
TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
@@ -126,6 +242,11 @@
//司机考勤
DriverAssessment driverAssessment = driverAssessmentService.selectOne(new EntityWrapper<DriverAssessment>().eq("companyId", ShiroKit.getUser().getObjectId()));
model.addAttribute("assessment", driverAssessment == null ? "" : driverAssessment.getAssessment());
+ // 超时设置
+ TSysOverTime overTime = sysOverTimeService.selectOne(new EntityWrapper<TSysOverTime>()
+ .eq("companyId", ShiroKit.getUser().getObjectId()));
+ model.addAttribute("overTime", overTime);
+
return PREFIX + "tSysReformist.html";
}
@@ -147,7 +268,14 @@
@RequestParam Integer zcPeople,@RequestParam Integer czcPeople,
@RequestParam Integer ptCancel1,@RequestParam BigDecimal ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,
@RequestParam Integer yyCancel1,@RequestParam BigDecimal yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
- @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3, @RequestParam String assessment) {
+ @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3,@RequestParam String assessment,
+
+ @RequestParam String km,@RequestParam Integer kmMinute,@RequestParam String km2,
+ @RequestParam Integer kmMinute2,
+ @RequestParam Integer overtime,@RequestParam Integer overtime1,@RequestParam Integer packageTime,
+ @RequestParam Integer reserveTime,
+ @RequestParam Integer reserveNext,@RequestParam String reserveMoney
+ ) {
//改派设置
TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(reformist)){
@@ -327,6 +455,11 @@
if (SinataUtil.isNotEmpty(ptCancelOne)){
ptCancelOne.setMinuteNum(ptCancel1);
ptCancelOne.setMoney(ptCancel2);
+
+ ptCancelOne.setKm(Integer.valueOf(km));
+ ptCancelOne.setKmMinute(kmMinute);
+ ptCancelOne.setOvertime(overtime);
+
tSysCancleOrderService.updateById(ptCancelOne);
}else{
ptCancelOne = new TSysCancleOrder();
@@ -335,6 +468,10 @@
ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
ptCancelOne.setType(1);
ptCancelOne.setOrderType(1);
+ ptCancelOne.setKm(Integer.valueOf(km));
+ ptCancelOne.setKmMinute(kmMinute);
+ ptCancelOne.setOvertime(overtime);
+
tSysCancleOrderService.insert(ptCancelOne);
}
@@ -343,12 +480,20 @@
if (SinataUtil.isNotEmpty(ptCancelTwo)){
ptCancelTwo.setMinuteNum(ptCancel3);
ptCancelTwo.setMoney(ptCancel4);
+
+ ptCancelTwo.setKm(Integer.valueOf(km));
+ ptCancelTwo.setKmMinute(kmMinute);
+ ptCancelTwo.setOvertime(overtime);
tSysCancleOrderService.updateById(ptCancelTwo);
}else{
ptCancelTwo = new TSysCancleOrder();
ptCancelTwo.setMinuteNum(ptCancel3);
ptCancelTwo.setMoney(ptCancel4);
ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+
+ ptCancelTwo.setKm(Integer.valueOf(km));
+ ptCancelTwo.setKmMinute(kmMinute);
+ ptCancelTwo.setOvertime(overtime);
ptCancelTwo.setType(1);
ptCancelTwo.setOrderType(2);
tSysCancleOrderService.insert(ptCancelTwo);
@@ -359,6 +504,12 @@
if (SinataUtil.isNotEmpty(ptCancelThree)){
ptCancelThree.setMinuteNum(ptCancel5);
ptCancelThree.setMoney(ptCancel6);
+
+ BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+ ptCancelThree.setKm(Integer.valueOf(km));
+ ptCancelThree.setKmMinute(kmMinute);
+ ptCancelThree.setOvertime(overtime);
+ ptCancelThree.setReserveMoney(bigDecimal1);
tSysCancleOrderService.updateById(ptCancelThree);
}else{
ptCancelThree = new TSysCancleOrder();
@@ -367,6 +518,12 @@
ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
ptCancelThree.setType(1);
ptCancelThree.setOrderType(3);
+
+ BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+ ptCancelThree.setKm(Integer.valueOf(km));
+ ptCancelThree.setKmMinute(kmMinute);
+ ptCancelThree.setOvertime(overtime);
+ ptCancelThree.setReserveMoney(bigDecimal1);
tSysCancleOrderService.insert(ptCancelThree);
}
@@ -375,6 +532,12 @@
if (SinataUtil.isNotEmpty(yyCancelOne)){
yyCancelOne.setMinuteNum(yyCancel1);
yyCancelOne.setMoney(yyCancel2);
+
+ BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+ yyCancelOne.setKm(Integer.valueOf(km2));
+ yyCancelOne.setKmMinute(kmMinute2);
+ yyCancelOne.setOvertime(overtime);
+ yyCancelOne.setReserveMoney(bigDecimal1);
tSysCancleOrderService.updateById(yyCancelOne);
}else{
yyCancelOne = new TSysCancleOrder();
@@ -383,6 +546,12 @@
yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
yyCancelOne.setType(2);
yyCancelOne.setOrderType(1);
+
+ BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+ yyCancelOne.setKm(Integer.valueOf(km2));
+ yyCancelOne.setKmMinute(kmMinute2);
+ yyCancelOne.setOvertime(overtime);
+ yyCancelOne.setReserveMoney(bigDecimal1);
tSysCancleOrderService.insert(yyCancelOne);
}
//预约取消设置(出租车)
@@ -390,6 +559,11 @@
if (SinataUtil.isNotEmpty(yyCancelTwo)){
yyCancelTwo.setMinuteNum(yyCancel3);
yyCancelTwo.setMoney(yyCancel4);
+ BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+ yyCancelTwo.setKm(Integer.valueOf(km2));
+ yyCancelTwo.setKmMinute(kmMinute2);
+ yyCancelTwo.setOvertime(overtime);
+ yyCancelTwo.setReserveMoney(bigDecimal1);
tSysCancleOrderService.updateById(yyCancelTwo);
}else{
yyCancelTwo = new TSysCancleOrder();
@@ -398,6 +572,12 @@
yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
yyCancelTwo.setType(2);
yyCancelTwo.setOrderType(2);
+
+ BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);
+ yyCancelTwo.setKm(Integer.valueOf(km2));
+ yyCancelTwo.setKmMinute(kmMinute2);
+ yyCancelTwo.setOvertime(overtime);
+ yyCancelTwo.setReserveMoney(bigDecimal1);
tSysCancleOrderService.insert(yyCancelTwo);
}
@@ -466,6 +646,23 @@
driverAssessment.setInsertTime(new Date());
driverAssessmentService.insert(driverAssessment);
}
+ // 超时设置
+ TSysOverTime overTime = sysOverTimeService.selectOne(new EntityWrapper<TSysOverTime>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (overTime!=null){
+ overTime.setCar(overtime1);
+ overTime.setPackageTime(packageTime);
+ overTime.setReserveTime(reserveTime);
+ overTime.setReserveNext(reserveNext);
+ sysOverTimeService.updateById(overTime);
+ }else{
+ TSysOverTime tSysOverTime = new TSysOverTime();
+ tSysOverTime.setCompanyId(ShiroKit.getUser().getObjectId());
+ tSysOverTime.setCar(overtime1);
+ tSysOverTime.setPackageTime(packageTime);
+ tSysOverTime.setReserveTime(reserveTime);
+ tSysOverTime.setReserveNext(reserveNext);
+ sysOverTimeService.insert(tSysOverTime);
+ }
return SUCCESS_TIP;
}
--
Gitblit v1.7.1