From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:23:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/settlementAllocation/settlementAllocation.html | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java | 14
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html | 53
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html | 47
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java | 5
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/userRedRecord.html | 61 +
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 14
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSetInfo.js | 12
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 8
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html | 15
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 29
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java | 13
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java | 1
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html | 44
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 18
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html | 12
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java | 7
ManagementIGOTravel/guns-admin/src/main/webapp/static/img/dengyu.png | 0
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml | 28
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java | 5
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html | 13
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 231 +++
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html | 3
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 4
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html | 48
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java | 5
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 6
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js | 13
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html | 10
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 1412 ++++++++++------------
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetAdd.html | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 38
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_auth.html | 14
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 520 +++++---
ManagementIGOTravel/guns-admin/src/main/resources/application-test.yml | 4
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/settlementAllocation/settlementAllocation.js | 8
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 34
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java | 18
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 117 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java | 11
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml | 4
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html | 5
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java | 1
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 22
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html | 35
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js | 1
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/img/jiahao.png | 0
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java | 9
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js | 55
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js | 14
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js | 13
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java | 42
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java | 11
ManagementIGOTravel/guns-admin/src/main/webapp/static/img/jianhao.png | 0
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html | 6
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js | 8
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java | 14
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html | 9
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java | 16
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 5
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html | 4
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js | 8
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html | 4
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java | 12
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js | 12
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml | 31
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java | 15
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java | 1
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/userRedRecord.js | 146 ++
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js | 14
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html | 27
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_add.html | 7
88 files changed, 2,271 insertions(+), 1,217 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index d85374d..191fed6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -27,6 +28,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 控制器
@@ -109,7 +111,7 @@
@ResponseBody
public Object getCount(Integer time,String insertTime,Integer state) {
if (time == null){
- time = 1;
+ time =1;
}
String beginTime = null;
String endTime = null;
@@ -168,46 +170,51 @@
}
List<Income> incomes = new ArrayList<>();
List<SettlementDetail> settlementDetails = new ArrayList<>();
- if (state!=null){
- switch (state){
- case 1:
- // 已结算
- // 查询已结算的
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
- .ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
-
-
- break;
- case 2:
- // 未结算
-
- break;
- }
- }else{
+ if (time == null){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
+ .eq("userType", 1)
+ .eq("objectId",1)
.ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
+ .isNotNull("orderType"));
+ }else{
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ incomes = tIncomeService.selectList(new EntityWrapper<Income>()
+ .eq("userType", 1)
+ .eq("objectId",1)
+ .ne("type", 1)
+ .isNotNull("orderType"));
+ }else{
+ incomes = tIncomeService.selectList(new EntityWrapper<Income>()
+ .eq("userType", 1)
+ .eq("objectId",1)
+ .ne("type", 1)
+ .isNotNull("orderType")
+ .between("insertTime", start, end));
+ }
+
}
-
-
List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
// 已结算金额
BigDecimal balance = new BigDecimal("0");
// 未结算金额
BigDecimal unBalance = new BigDecimal("0");
- // 查询所有已结算的订单
+ // 查询订单是否已结算
+
+ // 专车订单结算明细
+ List<SettlementDetail> privateCar = settlementDetails.stream().filter(t -> t.getOrderType() == 1).collect(Collectors.toList());
+ // 小件物流结算明细
+ List<SettlementDetail> xjwl = settlementDetails.stream().filter(t -> t.getOrderType() == 4).collect(Collectors.toList());
+
+ // 查询已结算的订单
for (Income income : incomes) {
PlatformVO platformVO = new PlatformVO();
platformVO.setState(1);
switch (income.getOrderType()){
case 1:
+ if (state!=null && state==2){
+ continue;
+ }
// 查询订单信息
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
if (tOrderPrivateCar==null){
@@ -219,7 +226,6 @@
platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setDriverPhone(tDriver.getPhone());
}
-
platformVO.setRemark(tOrderPrivateCar.getRemark());
if (income.getInsertTime()!=null){
platformVO.setEndTime(format.format(income.getInsertTime()));
@@ -245,11 +251,15 @@
platformVO.setPayType("现金支付");
break;
}
+
// 专车订单
balance = balance.add(new BigDecimal(income.getMoney()));
res.add(platformVO);
break;
case 4:
+ if (state!=null && state==2){
+ continue;
+ }
// 小件物流
// 查询订单信息
TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
@@ -286,16 +296,22 @@
platformVO.setPayType("现金支付");
break;
}
+
// 专车订单
balance = balance.add(new BigDecimal(income.getMoney()));
res.add(platformVO);
break;
}
}
+
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- settlementDetailEntityWrapper.between("createTime", start, end);
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+
+ }else{
+ settlementDetailEntityWrapper.between("createTime", start, end);
+ }
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
- // 查询所有现金支付的订单
+ // 查询所有现金支付的订单 再根据结算主表判断是否已结算
for (SettlementDetail settlementDetail : settlementDetails) {
PlatformVO platformVO = new PlatformVO();
switch (settlementDetail.getOrderType()){
@@ -311,43 +327,33 @@
platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setDriverPhone(tDriver.getPhone());
}
-
platformVO.setRemark(tOrderPrivateCar.getRemark());
-
platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
String string = settlementDetail.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
platformVO.setMoney(bigDecimal1);
platformVO.setPayType("现金支付");
-
- // 查询是否结算
- SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- if (state!=null){
- if (state == 1){
- // 查询已结算的
- if (settlementRecord.getPaymentStatus() == 1){
+ if (settlementDetail.getSettlementRecordId()!=null){
+ SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
continue;
}
- }
- if (state == 2){
- // 查询未结算的
- if (settlementRecord.getPaymentStatus() == 2){
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
continue;
}
- }
- }
- if (settlementRecord.getPaymentStatus() == 2){
- // 已结算
- platformVO.setState(1);
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- if (settlementRecord.getDay()!=null){
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
- }else{
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
+
res.add(platformVO);
break;
case 4:
@@ -369,33 +375,25 @@
platformVO.setMoney(bigDecimal2);
platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
platformVO.setPayType("现金支付");
- // 查询是否结算
- SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- if (state!=null){
- if (state == 1){
- // 查询已结算的
- if (settlementRecord1.getPaymentStatus() == 1){
+ if (settlementDetail.getSettlementRecordId()!=null){
+ SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
continue;
}
- }
- if (state == 2){
- // 查询未结算的
- if (settlementRecord1.getPaymentStatus() == 2){
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
continue;
}
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
- }
- if (settlementRecord1.getPaymentStatus() == 2){
- // 已结算
- platformVO.setState(1);
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- if (settlementRecord1.getDay()!=null){
- platformVO.setEndTime(format.format(settlementRecord1.getDay()));
- }
- }else{
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
@@ -423,6 +421,16 @@
@RequestMapping(value = "/water/getCount")
@ResponseBody
public Object getCount1(Integer time,String insertTime,Integer payType,Integer type) {
+ if (payType!=null){
+ switch (payType){
+ case 1:
+ payType = 2;
+ break;
+ case 2:
+ payType = 1;
+ break;
+ }
+ }
if (time == null){
time = 1;
}
@@ -481,89 +489,123 @@
break;
}
}
- List<Income> incomes = new ArrayList<>();
- List<SettlementDetail> settlementDetails = new ArrayList<>();
- // 用户订单记录
- List<TPubTransactionDetails> tOrderPrivateCars = new ArrayList<>();
+ // 用户小件物流订单记录
+ List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
+ List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
// 用户充值
List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
+ // 司机结算总额
+ List<SettlementDetail> settlementDetails1 = new ArrayList<>();
// 司机提现
List<TPubWithdrawal> driver = new ArrayList<>();
// 用户提现
List<TPubWithdrawal> user = new ArrayList<>();
// 余额充值wrapper
- Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>()
- .eq("orderType", 5)
- .between("insertTime",start,end);
+ Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>();
// 用户提现wrapper
- Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 1)
- .between("handleTime", start, end);
+ Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>();
// 司机提现wrapper
- Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 2)
- .between("handleTime", start, end);
- // 用户订单wrapper
-// Wrapper<PaymentRecord> between1 = new EntityWrapper<PaymentRecord>()
-// .eq("type", 1)
-// .eq("category", 1)
-// .ne("orderType", 3)
-// .ne("orderType", 5)
-// .ne("orderType", 6)
-// .between("insertTime", start, end);
- // 用户订单wrapper
- Wrapper<TPubTransactionDetails> between1 = new EntityWrapper<TPubTransactionDetails>()
- .in("orderType", Arrays.asList(1, 4))
- .between("insertTime", start, end);
+ Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>();
+ // 用户专车订单wrapper
+ EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
+ // 用户小件物流订单wrapper
+ EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
+ // 司机手动结算金额
+ Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ // 余额充值wrapper
+ orderType = new EntityWrapper<TPubTransactionDetails>()
+ .eq("userType",1)
+ .eq("orderType", 5)
+ ;
+ // 用户提现wrapper
+ userWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 1)
+ ;
+ // 司机提现wrapper
+ between = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2);
+ // 用户专车订单wrapper
+ tOrderPrivateCarEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2));
+ // 用户小件物流订单wrapper
+ tOrderLogisticsEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2));
+ // 司机手动结算金额
+ orderType1 = new EntityWrapper<SettlementDetail>()
+ .in("orderType", Arrays.asList(1, 4));
+ }else{
+ orderType = new EntityWrapper<TPubTransactionDetails>()
+ .eq("orderType", 5)
+ .eq("userType",1)
+ .between("insertTime",start,end);
+ // 用户提现wrapper
+ userWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 1)
+ .between("handleTime", start, end);
+ // 司机提现wrapper
+ between = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ .between("handleTime", start, end);
+ // 司机手动结算金额
+ orderType1 = new EntityWrapper<SettlementDetail>()
+ .in("orderType", Arrays.asList(1, 4))
+ .between("createTime", start, end);
+ // 用户专车订单wrapper
+ tOrderPrivateCarEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2))
+ .between("insertTime", start, end);
+ // 用户小件物流订单wrapper
+ tOrderLogisticsEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2))
+ .between("insertTime", start, end);
+ }
+
if (type != null){
switch (type){
case 1:
// 只查询用户订单
- tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
+ tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
+ tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
+
break;
case 2:
// 只查询用户充值
tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
break;
case 3:
- // 只查询司机已结算的
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
- .ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
+ // 只查询司机手动结算的
+ settlementDetails1 = settlementDetailService.selectList(orderType1);
break;
case 4:
- if(payType!=null && payType == 2){
- break;
- }
driver = pubWithdrawalService.selectList(between);
// 只查询司机提现
break;
case 5:
- if(payType!=null && payType == 2){
- break;
- }
// 只查询用户提现
user = pubWithdrawalService.selectList(userWrapper);
break;
}
}else{
- tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
+ // 只查询用户订单
+ tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
+ tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
- .ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
+ // 只查询司机手动结算的
+ settlementDetails1 = settlementDetailService.selectList(orderType1);
driver = pubWithdrawalService.selectList(between);
user = pubWithdrawalService.selectList(userWrapper);
}
List<WaterVO> res = new ArrayList<>();
-// List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// 司机结算金额
BigDecimal balance = new BigDecimal("0");
@@ -576,121 +618,83 @@
// 用户提现金额
BigDecimal userWithdrawal = new BigDecimal("0");
// 用户订单消费
+ for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
+ if (payType!=null){
+ if (tOrderPrivateCar.getPayType()!=payType){
+ continue;
+ }
+ }
- for (TPubTransactionDetails tOrderPrivateCar : tOrderPrivateCars) {
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
waterVO.setType("用户订单消费");
- switch (tOrderPrivateCar.getOrderType()){
+ switch (tOrderPrivateCar.getPayType()){
case 1:
- // 专车
- TOrderPrivateCar tOrderPrivateCar1 = orderPrivateCarService.selectById(tOrderPrivateCar.getOrderId());
- if (tOrderPrivateCar1 != null){
- waterVO.setCode(tOrderPrivateCar1.getOrderNum());
- String string = tOrderPrivateCar.getMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
- }else{
- waterVO.setMoney(new BigDecimal("0"));
- }
- TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
- if (user1!=null){
- waterVO.setName(user1.getNickName());
- waterVO.setPhone(user1.getPhone());
- }
-
- if (tOrderPrivateCar1 != null){
- if (tOrderPrivateCar1.getPayType()!=null){
- switch (tOrderPrivateCar1.getPayType()){
- case 1:
- if (payType!=null){
- if (payType == 1){
- continue;
- }
- }
- waterVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType == 2){
- continue;
- }
- }
- waterVO.setPayType("银行卡支付");
- break;
- case 3:
-
- case 4:
- continue;
- }
- }else{
- continue;
- }
- }else{
- continue;
- }
- if (tOrderPrivateCar1 != null){
- waterVO.setRemark(tOrderPrivateCar1.getRemark());
- }
- res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
+ waterVO.setPayType("手机支付");
break;
- case 4:
- // 小件物流
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tOrderPrivateCar.getOrderId());
- if (tOrderLogistics != null){
- waterVO.setCode(tOrderLogistics.getOrderNum());
- String string = tOrderPrivateCar.getMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
- }else{
- waterVO.setMoney(new BigDecimal("0"));
- }
- TUser user2 = appUserService.selectById(tOrderPrivateCar.getUserId());
- if (user2!=null){
- waterVO.setName(user2.getNickName());
- waterVO.setPhone(user2.getPhone());
- }
- waterVO.setType("用户订单消费");
- if (tOrderLogistics != null){
- if (tOrderLogistics.getPayType()!=null){
- switch (tOrderLogistics.getPayType()){
- case 1:
- if (payType!=null){
- if (payType == 1){
- continue;
- }
- }
- waterVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType == 2){
- continue;
- }
- }
- waterVO.setPayType("银行卡支付");
- break;
- case 3:
-
- case 4:
- continue;
- }
- }else{
- continue;
- }
- }else{
- continue;
- }
- if (tOrderLogistics != null){
- waterVO.setRemark(tOrderLogistics.getRemark());
- }
- res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
+ case 2:
+ waterVO.setPayType("银行卡支付");
break;
}
+ // 专车
+ if (tOrderPrivateCar != null){
+ waterVO.setCode(tOrderPrivateCar.getOrderNum());
+ String string = tOrderPrivateCar.getPayMoney().toString();
+ waterVO.setMoney(new BigDecimal(string));
+ }else{
+ waterVO.setMoney(new BigDecimal("0"));
+ }
+ TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ if (user1!=null){
+ waterVO.setName(user1.getNickName());
+ waterVO.setPhone(user1.getPhone());
+ }
+
+ if (tOrderPrivateCar != null){
+ waterVO.setRemark(tOrderPrivateCar.getRemark());
+ }
+ res.add(waterVO);
+ userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
}
+ for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
+ if (payType!=null){
+ if (tOrderLogistic.getPayType()!=payType){
+ continue;
+ }
+ }
+ WaterVO waterVO = new WaterVO();
+ waterVO.setInsertTime(format.format(tOrderLogistic.getInsertTime()));
+ waterVO.setType("用户订单消费");
+ // 小件物流
+ waterVO.setCode(tOrderLogistic.getOrderNum());
+ String string = tOrderLogistic.getPayMoney().toString();
+ waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal("0"));
+ TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
+ if (user2!=null){
+ waterVO.setName(user2.getNickName());
+ waterVO.setPhone(user2.getPhone());
+ }
+ waterVO.setType("用户订单消费");
+ switch (tOrderLogistic.getPayType()){
+ case 1:
+ waterVO.setPayType("手机支付");
+ break;
+ case 2:
+ waterVO.setPayType("银行卡支付");
+ break;
+ }
+ if (tOrderLogistics != null){
+ waterVO.setRemark(tOrderLogistic.getRemark());
+ }
+ res.add(waterVO);
+ userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
+ break;
+ }
+
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
@@ -711,11 +715,13 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
- waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
+ if (tPubWithdrawal.getHandleTime()!=null){
+ waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
+ }
waterVO.setCode(tPubWithdrawal.getCode());
TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
if (user2!=null){
@@ -735,13 +741,17 @@
Integer orderId = tPubTransactionDetail.getOrderId();
PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
if (paymentRecord!=null){
+ if (paymentRecord.getState() == 1){
+ // 临时数据
+ continue;
+ }
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
waterVO.setCode(paymentRecord.getCode());
if (paymentRecord.getPayType()!=null){
switch (paymentRecord.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -749,7 +759,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -776,13 +786,44 @@
userRecharge = userRecharge.add(new BigDecimal(paymentRecord.getAmount().toString()));
}
// 查询所有已结算的订单
- for (Income income : incomes) {
+ for (SettlementDetail income : settlementDetails1) {
WaterVO platformVO = new WaterVO();
platformVO.setType("司机结算");
switch (income.getOrderType()){
case 1:
+ SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
+ if (settlementRecord!=null){
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
+ switch (settlementRecord.getPayType()){
+ case 1:
+ if (payType!=null){
+ if (payType != 1){
+ continue;
+ }
+ }
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ if (payType!=null){
+ if (payType != 2){
+ continue;
+ }
+ }
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ case 4:
+ continue;
+ }
+
+ }else{
+ continue;
+ }
+ }else{
+ continue;
+ }
// 查询订单信息
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getOrderId());
if (tOrderPrivateCar==null){
continue;
}
@@ -792,14 +833,13 @@
platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setPhone(tDriver.getPhone());
}
-
platformVO.setRemark(tOrderPrivateCar.getRemark());
- if (income.getInsertTime()!=null){
- platformVO.setInsertTime(format.format(income.getInsertTime()));
+ if (income.getCreateTime()!=null){
+ platformVO.setInsertTime(format.format(income.getCreateTime()));
}
platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
- if (tOrderPrivateCar.getOrderMoney() != null){
- String string = tOrderPrivateCar.getOrderMoney().toString();
+ if (income.getOrderMoney() != null){
+ String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
platformVO.setMoney(bigDecimal1);
}else{
@@ -809,179 +849,74 @@
if (tOrderPrivateCar.getPayType() == null){
continue;
}
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- if (payType!=null){
- if (payType == 1){
- continue;
- }
- }
- platformVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType == 2){
- continue;
- }
- }
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- case 4:
- continue;
- }
+
// 专车订单
- String string4 = tOrderPrivateCar.getOrderMoney().toString();
+ String string4 = income.getPrice().toString();
balance = balance.add(new BigDecimal(string4));
res.add(platformVO);
break;
case 4:
- // 小件物流
- // 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
- if (tOrderLogistics==null){
+ SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
+ if (settlementRecord1!=null&& settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
+ if (settlementRecord1.getPayType()!=null){
+ switch (settlementRecord1.getPayType()){
+ case 1:
+ if (payType!=null){
+ if (payType != 1){
+ continue;
+ }
+ }
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ if (payType!=null){
+ if (payType != 2){
+ continue;
+ }
+ }
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ case 4:
+ continue;
+ }
+
+ }
+ }else {
continue;
}
- platformVO.setCode(tOrderLogistics.getOrderNum());
- TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
+ // 小件物流
+ // 查询订单信息
+ TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
+ if (tOrderLogistics1==null){
+ continue;
+ }
+ platformVO.setCode(tOrderLogistics1.getOrderNum());
+ TDriver tDriver1 = driverService.selectById(tOrderLogistics1.getDriverId());
if (tDriver1!=null){
platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
platformVO.setPhone(tDriver1.getPhone());
}
-
- platformVO.setRemark(tOrderLogistics.getRemark());
- platformVO.setMoney(new BigDecimal(income.getMoney()));
- if (income.getInsertTime()!=null){
- platformVO.setInsertTime(format.format(income.getInsertTime()));
+ platformVO.setRemark(tOrderLogistics1.getRemark());
+ platformVO.setMoney(new BigDecimal(income.getPrice()));
+ if (income.getCreateTime()!=null){
+ platformVO.setInsertTime(format.format(income.getCreateTime()));
}
- platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
- if (tOrderLogistics.getPayType() == null){
+ platformVO.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
+ if (tOrderLogistics1.getPayType() == null){
continue;
}
- switch (tOrderLogistics.getPayType()){
- case 1:
- if (payType!=null){
- if (payType == 1){
- continue;
- }
- }
- platformVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType == 2){
- continue;
- }
- }
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- case 4:
- continue;
- }
- String string1 = tOrderLogistics.getOrderMoney().toString();
+ String string1 = income.getPrice().toString();
// 小件物流订单
balance = balance.add(new BigDecimal(string1));
res.add(platformVO);
break;
}
}
-// EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
-// settlementDetailEntityWrapper.between("createTime", start, end);
-// settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
-// // 查询所有现金支付的订单
-// for (SettlementDetail settlementDetail : settlementDetails) {
-// WaterVO platformVO = new WaterVO();
-// switch (settlementDetail.getOrderType()){
-// case 1:
-// // 专车订单
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
-// if (tOrderPrivateCar==null){
-// continue;
-// }
-// platformVO.setCode(tOrderPrivateCar.getOrderNum());
-// TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
-// if (tDriver!=null){
-// platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
-// platformVO.setDriverPhone(tDriver.getPhone());
-// }
-// platformVO.setRemark(tOrderPrivateCar.getRemark());
-// platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
-// String string = settlementDetail.getPrice().toString();
-// BigDecimal bigDecimal1 = new BigDecimal(string);
-// platformVO.setMoney(bigDecimal1);
-// platformVO.setPayType("现金支付");
-// // 查询是否结算
-// SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
-//
-// if (settlementRecord.getPaymentStatus() == 1){
-// continue;
-// }
-//
-// // 已结算
-// platformVO.setState(1);
-// balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
-// if (settlementRecord.getDay()!=null){
-// platformVO.setInsertTime(format.format(settlementRecord.getDay()));
-// }
-//
-// res.add(platformVO);
-// break;
-// case 4:
-// // 小件物流
-// // 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
-// if (tOrderLogistics==null){
-// continue;
-// }
-// platformVO.setCode(tOrderLogistics.getOrderNum());
-// TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
-// if (tDriver1!=null){
-// platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
-// platformVO.setDriverPhone(tDriver1.getPhone());
-// }
-// platformVO.setRemark(tOrderLogistics.getRemark());
-// String string1 = settlementDetail.getPrice().toString();
-// BigDecimal bigDecimal2 = new BigDecimal(string1);
-// platformVO.setMoney(bigDecimal2);
-// platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
-// platformVO.setPayType("现金支付");
-// // 查询是否结算
-// SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
-// if (payType!=null){
-// if (payType == 1){
-// // 查询已结算的
-// if (settlementRecord1.getPaymentStatus() == 1){
-// continue;
-// }
-// }
-// if (payType == 2){
-// // 查询未结算的
-// if (settlementRecord1.getPaymentStatus() == 2){
-// continue;
-// }
-// }
-// }
-// if (settlementRecord1.getPaymentStatus() == 2){
-// // 已结算
-// platformVO.setState(1);
-// balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
-// if (settlementRecord1.getDay()!=null){
-// platformVO.setInsertTime(format.format(settlementRecord1.getDay()));
-// }
-// }else{
-// // 未结算
-// platformVO.setState(2);
-// unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
-// }
-// res.add(platformVO);
-// break;
-// }
-// }
- // 计算佣金总额
-// BigDecimal add = unBalance.add(balance);
+ // 过滤掉res中insertTime未空的数据
+ res.removeIf(waterVO -> waterVO.getInsertTime() == null);
Collections.sort(res, Comparator.comparing(WaterVO::getInsertTime).reversed());
WaterMoneyVO waterMoneyVO = new WaterMoneyVO();
BigDecimal add = userRecharge.add(userConsume).add(balance).subtract(driverWithdrawal).subtract(userWithdrawal);
@@ -1008,6 +943,16 @@
@RequestMapping(value = "/water/list")
@ResponseBody
public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
+ if (payType!=null){
+ switch (payType){
+ case 1:
+ payType = 2;
+ break;
+ case 2:
+ payType = 1;
+ break;
+ }
+ }
if (time == null){
time = 1;
}
@@ -1066,89 +1011,125 @@
break;
}
}
- List<Income> incomes = new ArrayList<>();
- List<SettlementDetail> settlementDetails = new ArrayList<>();
- // 用户订单记录
- List<TPubTransactionDetails> tOrderPrivateCars = new ArrayList<>();
+ // 用户小件物流订单记录
+ List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
+ List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
// 用户充值
List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
+ // 司机结算总额
+ List<SettlementDetail> settlementDetails1 = new ArrayList<>();
// 司机提现
List<TPubWithdrawal> driver = new ArrayList<>();
// 用户提现
List<TPubWithdrawal> user = new ArrayList<>();
// 余额充值wrapper
- Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>()
- .eq("orderType", 5)
- .between("insertTime",start,end);
+ Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>();
// 用户提现wrapper
- Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 1)
- .between("handleTime", start, end);
+ Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>();
// 司机提现wrapper
- Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 2)
- .between("handleTime", start, end);
- // 用户订单wrapper
-// Wrapper<PaymentRecord> between1 = new EntityWrapper<PaymentRecord>()
-// .eq("type", 1)
-// .eq("category", 1)
-// .ne("orderType", 3)
-// .ne("orderType", 5)
-// .ne("orderType", 6)
-// .between("insertTime", start, end);
- // 用户订单wrapper
- Wrapper<TPubTransactionDetails> between1 = new EntityWrapper<TPubTransactionDetails>()
- .in("orderType", Arrays.asList(1, 4))
- .between("insertTime", start, end);
+ Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>();
+ // 用户专车订单wrapper
+ EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
+ // 用户小件物流订单wrapper
+ EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
+ // 司机手动结算金额
+ Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ // 余额充值wrapper
+ orderType = new EntityWrapper<TPubTransactionDetails>()
+ .eq("userType",1)
+ .eq("orderType", 5)
+ ;
+ // 用户提现wrapper
+ userWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 1)
+ ;
+ // 司机提现wrapper
+ between = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2);
+ // 用户专车订单wrapper
+ tOrderPrivateCarEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2));
+ // 用户小件物流订单wrapper
+ tOrderLogisticsEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2));
+ // 司机手动结算金额
+ orderType1 = new EntityWrapper<SettlementDetail>()
+ .isNotNull("settlementRecordId")
+ .in("orderType", Arrays.asList(1, 4));
+ }else{
+ orderType = new EntityWrapper<TPubTransactionDetails>()
+ .eq("orderType", 5)
+ .eq("userType",1)
+ .between("insertTime",start,end);
+ // 用户提现wrapper
+ userWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 1)
+ .between("handleTime", start, end);
+ // 司机提现wrapper
+ between = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ .between("handleTime", start, end);
+ // 司机手动结算金额
+ orderType1 = new EntityWrapper<SettlementDetail>()
+ .isNotNull("settlementRecordId")
+ .in("orderType", Arrays.asList(1, 4))
+ .between("createTime", start, end);
+ // 用户专车订单wrapper
+ tOrderPrivateCarEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2))
+ .between("insertTime", start, end);
+ // 用户小件物流订单wrapper
+ tOrderLogisticsEntityWrapper
+ .isNotNull("payMoney")
+ .in("payType",Arrays.asList(1, 2))
+ .between("insertTime", start, end);
+ }
+
if (type != null){
switch (type){
case 1:
// 只查询用户订单
- tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
+ tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
+ tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
+
break;
case 2:
// 只查询用户充值
tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
break;
case 3:
- // 只查询司机已结算的
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
- .ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
+ // 只查询司机手动结算的
+ settlementDetails1 = settlementDetailService.selectList(orderType1);
break;
case 4:
- if(payType!=null && payType == 2){
- break;
- }
driver = pubWithdrawalService.selectList(between);
// 只查询司机提现
break;
case 5:
- if(payType!=null && payType == 2){
- break;
- }
// 只查询用户提现
user = pubWithdrawalService.selectList(userWrapper);
break;
}
}else{
- tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
+ // 只查询用户订单
+ tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
+ tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
- .ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
+ // 只查询司机手动结算的
+ settlementDetails1 = settlementDetailService.selectList(orderType1);
driver = pubWithdrawalService.selectList(between);
user = pubWithdrawalService.selectList(userWrapper);
}
List<WaterVO> res = new ArrayList<>();
-// List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// 司机结算金额
BigDecimal balance = new BigDecimal("0");
@@ -1162,120 +1143,81 @@
BigDecimal userWithdrawal = new BigDecimal("0");
// 用户订单消费
- for (TPubTransactionDetails tOrderPrivateCar : tOrderPrivateCars) {
+ for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
+ if (payType!=null){
+ if (tOrderPrivateCar.getPayType()!=payType){
+ continue;
+ }
+ }
WaterVO waterVO = new WaterVO();
waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
waterVO.setType("用户订单消费");
- switch (tOrderPrivateCar.getOrderType()){
+ switch (tOrderPrivateCar.getPayType()){
case 1:
- // 专车
- TOrderPrivateCar tOrderPrivateCar1 = orderPrivateCarService.selectById(tOrderPrivateCar.getOrderId());
- if (tOrderPrivateCar1 != null){
- waterVO.setCode(tOrderPrivateCar1.getOrderNum());
- String string = tOrderPrivateCar.getMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
- }else{
- waterVO.setMoney(new BigDecimal("0"));
- }
- TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
- if (user1!=null){
- waterVO.setName(user1.getNickName());
- waterVO.setPhone(user1.getPhone());
- }
-
- if (tOrderPrivateCar1 != null){
- if (tOrderPrivateCar1.getPayType()!=null){
- switch (tOrderPrivateCar1.getPayType()){
- case 1:
- if (payType!=null){
- if (payType == 1){
- continue;
- }
- }
- waterVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType == 2){
- continue;
- }
- }
- waterVO.setPayType("银行卡支付");
- break;
- case 3:
-
- case 4:
- continue;
- }
- }else{
- continue;
- }
- }else{
- continue;
- }
- if (tOrderPrivateCar1 != null){
- waterVO.setRemark(tOrderPrivateCar1.getRemark());
- }
- res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
+ waterVO.setPayType("手机支付");
break;
- case 4:
- // 小件物流
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tOrderPrivateCar.getOrderId());
- if (tOrderLogistics != null){
- waterVO.setCode(tOrderLogistics.getOrderNum());
- String string = tOrderPrivateCar.getMoney().toString();
- waterVO.setMoney(new BigDecimal(string));
- }else{
- waterVO.setMoney(new BigDecimal("0"));
- }
- TUser user2 = appUserService.selectById(tOrderPrivateCar.getUserId());
- if (user2!=null){
- waterVO.setName(user2.getNickName());
- waterVO.setPhone(user2.getPhone());
- }
- waterVO.setType("用户订单消费");
- if (tOrderLogistics != null){
- if (tOrderLogistics.getPayType()!=null){
- switch (tOrderLogistics.getPayType()){
- case 1:
- if (payType!=null){
- if (payType == 1){
- continue;
- }
- }
- waterVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType == 2){
- continue;
- }
- }
- waterVO.setPayType("银行卡支付");
- break;
- case 3:
-
- case 4:
- continue;
- }
- }else{
- continue;
- }
- }else{
- continue;
- }
- if (tOrderLogistics != null){
- waterVO.setRemark(tOrderLogistics.getRemark());
- }
- res.add(waterVO);
- userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
+ case 2:
+ waterVO.setPayType("银行卡支付");
break;
}
+ // 专车
+ if (tOrderPrivateCar != null){
+ waterVO.setCode(tOrderPrivateCar.getOrderNum());
+ String string = tOrderPrivateCar.getPayMoney().toString();
+ waterVO.setMoney(new BigDecimal(string));
+ }else{
+ waterVO.setMoney(new BigDecimal("0"));
+ }
+ TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
+ if (user1!=null){
+ waterVO.setName(user1.getNickName());
+ waterVO.setPhone(user1.getPhone());
+ }
+
+ if (tOrderPrivateCar != null){
+ waterVO.setRemark(tOrderPrivateCar.getRemark());
+ }
+ res.add(waterVO);
+ userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
+ }
+ for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
+ if (payType!=null){
+ if (tOrderLogistic.getPayType()!=payType){
+ continue;
+ }
+ }
+ WaterVO waterVO = new WaterVO();
+ waterVO.setInsertTime(format.format(tOrderLogistic.getInsertTime()));
+ waterVO.setType("用户订单消费");
+ // 小件物流
+ waterVO.setCode(tOrderLogistic.getOrderNum());
+ String string = tOrderLogistic.getPayMoney().toString();
+ waterVO.setMoney(new BigDecimal(string));
+ waterVO.setMoney(new BigDecimal("0"));
+ TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
+ if (user2!=null){
+ waterVO.setName(user2.getNickName());
+ waterVO.setPhone(user2.getPhone());
+ }
+ waterVO.setType("用户订单消费");
+ switch (tOrderLogistic.getPayType()){
+ case 1:
+ waterVO.setPayType("手机支付");
+ break;
+ case 2:
+ waterVO.setPayType("银行卡支付");
+ break;
+ }
+ if (tOrderLogistics != null){
+ waterVO.setRemark(tOrderLogistic.getRemark());
+ }
+ res.add(waterVO);
+ userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
+ break;
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1296,7 +1238,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 2){
+ if(payType!=null && payType == 1){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1320,13 +1262,17 @@
Integer orderId = tPubTransactionDetail.getOrderId();
PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
if (paymentRecord!=null){
+ if (paymentRecord.getState() == 1){
+ // 临时数据
+ continue;
+ }
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
waterVO.setCode(paymentRecord.getCode());
if (paymentRecord.getPayType()!=null){
switch (paymentRecord.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1334,12 +1280,16 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
+
waterVO.setPayType("银行卡支付");
break;
+ case 3:
+ case 4:
+ continue;
}
}
@@ -1361,13 +1311,42 @@
userRecharge = userRecharge.add(new BigDecimal(paymentRecord.getAmount().toString()));
}
// 查询所有已结算的订单
- for (Income income : incomes) {
+ for (SettlementDetail income : settlementDetails1) {
WaterVO platformVO = new WaterVO();
platformVO.setType("司机结算");
switch (income.getOrderType()){
case 1:
+ SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
+ if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
+ if (settlementRecord.getPayType()!=null){
+ switch (settlementRecord.getPayType()){
+ case 1:
+ if (payType!=null){
+ if (payType != 1){
+ continue;
+ }
+ }
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ if (payType!=null){
+ if (payType != 2){
+ continue;
+ }
+ }
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ case 4:
+ continue;
+ }
+
+ }
+ }else{
+ continue;
+ }
// 查询订单信息
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getOrderId());
if (tOrderPrivateCar==null){
continue;
}
@@ -1377,14 +1356,13 @@
platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setPhone(tDriver.getPhone());
}
-
platformVO.setRemark(tOrderPrivateCar.getRemark());
- if (income.getInsertTime()!=null){
- platformVO.setInsertTime(format.format(income.getInsertTime()));
+ if (income.getCreateTime()!=null){
+ platformVO.setInsertTime(format.format(income.getCreateTime()));
}
platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
- if (tOrderPrivateCar.getOrderMoney() != null){
- String string = tOrderPrivateCar.getOrderMoney().toString();
+ if (income.getPrice() != null){
+ String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
platformVO.setMoney(bigDecimal1);
}else{
@@ -1393,27 +1371,6 @@
if (tOrderPrivateCar.getPayType() == null){
continue;
- }
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- if (payType!=null){
- if (payType == 1){
- continue;
- }
- }
- platformVO.setPayType("手机支付");
- break;
- case 2:
- if (payType!=null){
- if (payType == 2){
- continue;
- }
- }
- platformVO.setPayType("银行卡支付");
- break;
- case 3:
- case 4:
- continue;
}
// 专车订单
@@ -1424,30 +1381,45 @@
case 4:
// 小件物流
// 查询订单信息
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
- if (tOrderLogistics==null){
- continue;
- }
- platformVO.setCode(tOrderLogistics.getOrderNum());
- TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
- if (tDriver1!=null){
- platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
- platformVO.setPhone(tDriver1.getPhone());
- }
+ SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
+ if (settlementRecord1!=null){
+ if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
+ switch (settlementRecord1.getPayType()){
+ case 1:
+ if (payType!=null){
+ if (payType != 1){
+ continue;
+ }
+ }
+ platformVO.setPayType("手机支付");
+ break;
+ case 2:
+ if (payType!=null){
+ if (payType != 2){
+ continue;
+ }
+ }
+ platformVO.setPayType("银行卡支付");
+ break;
+ case 3:
+ case 4:
+ continue;
+ }
- platformVO.setRemark(tOrderLogistics.getRemark());
- platformVO.setMoney(new BigDecimal(income.getMoney()));
- if (income.getInsertTime()!=null){
- platformVO.setInsertTime(format.format(income.getInsertTime()));
- }
- platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
- if (tOrderLogistics.getPayType() == null){
+ }else{
+ continue;
+ }
+ }else{
continue;
}
- switch (tOrderLogistics.getPayType()){
+ TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
+ if (tOrderLogistics1==null){
+ continue;
+ }
+ switch (tOrderLogistics1.getPayType()){
case 1:
if (payType!=null){
- if (payType == 1){
+ if (payType != 1){
continue;
}
}
@@ -1455,7 +1427,7 @@
break;
case 2:
if (payType!=null){
- if (payType == 2){
+ if (payType != 2){
continue;
}
}
@@ -1466,105 +1438,30 @@
case 4:
continue;
}
- String string1 = tOrderLogistics.getOrderMoney().toString();
+ platformVO.setCode(tOrderLogistics1.getOrderNum());
+ TDriver tDriver1 = driverService.selectById(tOrderLogistics1.getDriverId());
+ if (tDriver1!=null){
+ platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
+ platformVO.setPhone(tDriver1.getPhone());
+ }
+
+ platformVO.setRemark(tOrderLogistics1.getRemark());
+ platformVO.setMoney(BigDecimal.valueOf(income.getPrice()));
+ if (income.getCreateTime()!=null){
+ platformVO.setInsertTime(format.format(income.getCreateTime()));
+ }
+ platformVO.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
+ if (tOrderLogistics1.getPayType() == null){
+ continue;
+ }
+
+ String string1 = tOrderLogistics1.getOrderMoney().toString();
// 小件物流订单
balance = balance.add(new BigDecimal(string1));
res.add(platformVO);
break;
}
}
-// EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
-// settlementDetailEntityWrapper.between("createTime", start, end);
-// settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
-// // 查询所有现金支付的订单
-// for (SettlementDetail settlementDetail : settlementDetails) {
-// WaterVO platformVO = new WaterVO();
-// switch (settlementDetail.getOrderType()){
-// case 1:
-// // 专车订单
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
-// if (tOrderPrivateCar==null){
-// continue;
-// }
-// platformVO.setCode(tOrderPrivateCar.getOrderNum());
-// TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
-// if (tDriver!=null){
-// platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
-// platformVO.setDriverPhone(tDriver.getPhone());
-// }
-// platformVO.setRemark(tOrderPrivateCar.getRemark());
-// platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
-// String string = settlementDetail.getPrice().toString();
-// BigDecimal bigDecimal1 = new BigDecimal(string);
-// platformVO.setMoney(bigDecimal1);
-// platformVO.setPayType("现金支付");
-// // 查询是否结算
-// SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
-//
-// if (settlementRecord.getPaymentStatus() == 1){
-// continue;
-// }
-//
-// // 已结算
-// platformVO.setState(1);
-// balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
-// if (settlementRecord.getDay()!=null){
-// platformVO.setInsertTime(format.format(settlementRecord.getDay()));
-// }
-//
-// res.add(platformVO);
-// break;
-// case 4:
-// // 小件物流
-// // 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
-// if (tOrderLogistics==null){
-// continue;
-// }
-// platformVO.setCode(tOrderLogistics.getOrderNum());
-// TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
-// if (tDriver1!=null){
-// platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
-// platformVO.setDriverPhone(tDriver1.getPhone());
-// }
-// platformVO.setRemark(tOrderLogistics.getRemark());
-// String string1 = settlementDetail.getPrice().toString();
-// BigDecimal bigDecimal2 = new BigDecimal(string1);
-// platformVO.setMoney(bigDecimal2);
-// platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
-// platformVO.setPayType("现金支付");
-// // 查询是否结算
-// SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
-// if (payType!=null){
-// if (payType == 1){
-// // 查询已结算的
-// if (settlementRecord1.getPaymentStatus() == 1){
-// continue;
-// }
-// }
-// if (payType == 2){
-// // 查询未结算的
-// if (settlementRecord1.getPaymentStatus() == 2){
-// continue;
-// }
-// }
-// }
-// if (settlementRecord1.getPaymentStatus() == 2){
-// // 已结算
-// platformVO.setState(1);
-// balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
-// if (settlementRecord1.getDay()!=null){
-// platformVO.setInsertTime(format.format(settlementRecord1.getDay()));
-// }
-// }else{
-// // 未结算
-// platformVO.setState(2);
-// unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
-// }
-// res.add(platformVO);
-// break;
-// }
-// }
// 计算佣金总额
// BigDecimal add = unBalance.add(balance);
Collections.sort(res, Comparator.comparing(WaterVO::getInsertTime).reversed());
@@ -1577,8 +1474,9 @@
@RequestMapping(value = "/commission/list")
@ResponseBody
public Object list(Integer time,String insertTime,Integer state) {
+
if (time == null){
- time = 1;
+ time =1;
}
String beginTime = null;
String endTime = null;
@@ -1593,7 +1491,7 @@
LocalDate e = LocalDate.parse(endTime);
start = s.atStartOfDay();
end = e.atTime(LocalTime.MAX);
- }else if (time!=null) {
+ }else{
switch (time) {
case 1:
// 获取当天的 00:00:00 和 23:59:59
@@ -1638,33 +1536,36 @@
Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
List<Income> incomes = new ArrayList<>();
List<SettlementDetail> settlementDetails = new ArrayList<>();
- if (state!=null){
- switch (state){
- case 1:
- // 已结算
- // 查询已结算的
- incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
- .ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
-
-
- break;
- case 2:
- // 未结算
-
- break;
- }
- }else{
+ if (time == null){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
- .eq("userType", 2)
+ .eq("userType", 1)
+ .eq("objectId",1)
.ne("type", 1)
- .isNotNull("orderType")
- .between("insertTime", start, end));
+ .isNotNull("orderType"));
+ }else{
+
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ incomes = tIncomeService.selectList(new EntityWrapper<Income>()
+ .eq("userType", 1)
+ .eq("objectId",1)
+ .ne("type", 1)
+ .isNotNull("orderType"));
+ }else{
+ incomes = tIncomeService.selectList(new EntityWrapper<Income>()
+ .eq("userType", 1)
+ .eq("objectId",1)
+ .ne("type", 1)
+ .isNotNull("orderType")
+ .between("insertTime", start, end));
+ }
}
+ EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
-
+ }else{
+ settlementDetailEntityWrapper.between("createTime", start, end);
+ }
+ settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1678,6 +1579,9 @@
platformVO.setState(1);
switch (income.getOrderType()){
case 1:
+ if (state!=null && state==2){
+ continue;
+ }
// 查询订单信息
TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
if (tOrderPrivateCar==null){
@@ -1689,15 +1593,12 @@
platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setDriverPhone(tDriver.getPhone());
}
-
platformVO.setRemark(tOrderPrivateCar.getRemark());
if (income.getInsertTime()!=null){
platformVO.setEndTime(format.format(income.getInsertTime()));
}
- platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
- String string = income.getMoney().toString();
- BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ platformVO.setMoney(new BigDecimal(income.getMoney()));
+ platformVO.setInsertTime(format.format(income.getInsertTime()));
if (tOrderPrivateCar.getPayType() == null){
continue;
}
@@ -1715,11 +1616,15 @@
platformVO.setPayType("现金支付");
break;
}
+
// 专车订单
balance = balance.add(new BigDecimal(income.getMoney()));
res.add(platformVO);
break;
case 4:
+ if (state!=null && state==2){
+ continue;
+ }
// 小件物流
// 查询订单信息
TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
@@ -1732,7 +1637,6 @@
platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
platformVO.setDriverPhone(tDriver1.getPhone());
}
-
platformVO.setRemark(tOrderLogistics.getRemark());
platformVO.setMoney(new BigDecimal(income.getMoney()));
if (income.getInsertTime()!=null){
@@ -1756,15 +1660,13 @@
platformVO.setPayType("现金支付");
break;
}
+
// 专车订单
balance = balance.add(new BigDecimal(income.getMoney()));
res.add(platformVO);
break;
}
}
- EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- settlementDetailEntityWrapper.between("createTime", start, end);
- settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
// 查询所有现金支付的订单
for (SettlementDetail settlementDetail : settlementDetails) {
PlatformVO platformVO = new PlatformVO();
@@ -1781,42 +1683,30 @@
platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
platformVO.setDriverPhone(tDriver.getPhone());
}
-
platformVO.setRemark(tOrderPrivateCar.getRemark());
-
platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
String string = settlementDetail.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
platformVO.setMoney(bigDecimal1);
platformVO.setPayType("现金支付");
-
- // 查询是否结算
- SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- if (state!=null){
- if (state == 1){
- // 查询已结算的
- if (settlementRecord.getPaymentStatus() == 1){
+ if (settlementDetail.getSettlementRecordId()!=null){
+ SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
continue;
}
- }
- if (state == 2){
- // 查询未结算的
- if (settlementRecord.getPaymentStatus() == 2){
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getPayTime()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
continue;
}
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
- }
- if (settlementRecord.getPaymentStatus() == 2){
- // 已结算
- platformVO.setState(1);
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- if (settlementRecord.getDay()!=null){
- platformVO.setEndTime(format.format(settlementRecord.getDay()));
- }
- }else{
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
@@ -1839,33 +1729,25 @@
platformVO.setMoney(bigDecimal2);
platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
platformVO.setPayType("现金支付");
- // 查询是否结算
- SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- if (state!=null){
- if (state == 1){
- // 查询已结算的
- if (settlementRecord1.getPaymentStatus() == 1){
+ if (settlementDetail.getSettlementRecordId()!=null){
+ SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
+ if (state!=null && state!=1){
continue;
}
- }
- if (state == 2){
- // 查询未结算的
- if (settlementRecord1.getPaymentStatus() == 2){
+ // 已结算
+ platformVO.setState(1);
+ balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
+ }else{
+ // 未结算
+ if (state!=null && state!=2){
continue;
}
+ platformVO.setState(2);
+ unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
+ platformVO.setEndTime(format.format(settlementRecord.getDay()));
}
- }
- if (settlementRecord1.getPaymentStatus() == 2){
- // 已结算
- platformVO.setState(1);
- balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
- if (settlementRecord1.getDay()!=null){
- platformVO.setEndTime(format.format(settlementRecord1.getDay()));
- }
- }else{
- // 未结算
- platformVO.setState(2);
- unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
}
res.add(platformVO);
break;
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 d13ddf3..d46fcdc 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
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -15,16 +17,19 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 控制器
@@ -86,6 +91,17 @@
private ISysCouponRecordService sysCouponRecordService;
@Autowired
private IUserActivityDiscount1Service userActivityDiscount1Service;
+
+ public static void main(String[] args) {
+ String temp = "[{\"money\":14.46,\"id\":91},{\"money\":1,\"id\":90}]";
+ JSONArray objects = JSONArray.parseArray(temp);
+ BigDecimal temp1 = new BigDecimal(BigInteger.ZERO);
+ for (int i = 0; i < objects.size(); i++) {
+ String string = objects.getJSONObject(i).getString("money");
+ temp1 = temp1.add(new BigDecimal(string));
+ }
+ System.err.println(temp1);
+ }
/**
* 使用补贴统计
*/
@@ -167,61 +183,103 @@
// 司机消费
List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
// 司机提现
- List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
- // 司机提现wrapper
+ List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();
+
Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 2)
- .between("handleTime", start, end);
+ ;
// 专车wrapper
Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("activityId")
- .isNotNull("discountMoney")
-
-
- .between("insertTime", start, end);
+ ;
// 小件物流wrapper
Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
- .isNotNull("activityId")
- .isNotNull("discountMoney")
-
-
- .between("insertTime", start, end);
+ ;
// 已使用优惠券记录wrapper
Wrapper<TOrderPrivateCar> between2 = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("couponId")
- .isNotNull("couponMoney")
-
-
- .between("insertTime", start, end);
+ ;
Wrapper<TOrderLogistics> between22 = new EntityWrapper<TOrderLogistics>()
- .isNotNull("couponId")
- .isNotNull("couponMoney")
-
-
- .between("insertTime", start, end);
+ ;
// 已使用红包记录wrapper
Wrapper<TOrderPrivateCar> between3 = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("redPacketId")
- .isNotNull("redPacketMoney")
-
-
- .between("insertTime", start, end);
+ ;
Wrapper<TOrderLogistics> between33 = new EntityWrapper<TOrderLogistics>()
- .isNotNull("redPacketId")
- .isNotNull("redPacketMoney")
-
-
- .between("insertTime", start, end);
+ ;
// 司机已消费金额
Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
- .ne("purpose", 6)
- .between("createTime", start, end);
- // 司机提现
- Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6)
- .between("createTime", start, end);
+ ;
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 已使用优惠券记录wrapper
+ between2 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ between22 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ // 已使用红包记录wrapper
+ between3 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ between33 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ // 司机已消费金额
+ between4 = new EntityWrapper<BalanceUsageRecord>()
+ .ne("purpose", 6);
+ // 司机提现
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("type",1)
+ .eq("userType", 2)
+ ;
+ }else{
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("type",1)
+ .eq("userType", 2)
+ .between("insertTime", start, end);
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+ // 已使用优惠券记录wrapper
+ between2 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+ between22 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+ // 已使用红包记录wrapper
+ between3 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+ between33 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+ // 司机已消费金额
+ between4 = new EntityWrapper<BalanceUsageRecord>()
+ .ne("purpose", 6)
+ .between("createTime", start, end);
+
+ }
+ // 司机提现wrapper
if (type!=null){
switch (type){
case 1:
@@ -237,8 +295,7 @@
case 3:
// 司机消费记录
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
-
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
break;
case 4:
// 专车订单
@@ -261,7 +318,7 @@
// 消费
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
// 提现
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
}
// 已发放补贴总额
@@ -280,9 +337,6 @@
BigDecimal driverWithdrawal1 = new BigDecimal("0");
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
- if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
- continue;
- }
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -293,12 +347,9 @@
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
-
+ res.add(grantVO);
}
for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
- if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
- continue;
- }
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -309,16 +360,20 @@
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
+ res.add(grantVO);
}
- // 查询已领取红包总额
+ // 查询已使用红包总额
for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {
- if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
+ BigDecimal temp = new BigDecimal(BigInteger.ZERO);
+ for (int i = 0; i < objects.size(); i++) {
+ String string = objects.getJSONObject(i).getString("money");
+ temp = temp.add(new BigDecimal(string));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -328,13 +383,16 @@
redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
}
for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
- if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
+ BigDecimal temp = new BigDecimal(BigInteger.ZERO);
+ for (int i = 0; i < objects.size(); i++) {
+ String string = objects.getJSONObject(i).getString("money");
+ temp = temp.add(new BigDecimal(string));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -345,13 +403,10 @@
}
// 查询已领取优惠券总额
for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
- if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -361,13 +416,10 @@
res.add(grantVO);
}
for (TOrderLogistics userCouponRecord : userCouponRecords1) {
- if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
- continue;
- }
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
@@ -412,20 +464,16 @@
res.add(grantVO);
}
// 司机提现
- for (BalanceUsageRecord balanceUsageRecord : driverWithdrawal) {
+ for (TPubWithdrawal balanceUsageRecord : driverWithdrawal) {
GrantVO grantVO = new GrantVO();
- grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
+ grantVO.setInsertTime(format.format(balanceUsageRecord.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getDriverId());
+ TDriver tUser = driverService.selectById(balanceUsageRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
- switch (balanceUsageRecord.getPurpose()){
- case 6:
- grantVO.setRemark("司机提现");
- break;
- }
+ grantVO.setRemark("司机提现");
driverWithdrawal1 = driverWithdrawal1.add(new BigDecimal(balanceUsageRecord.getMoney().toString()));
res.add(grantVO);
}
@@ -436,6 +484,7 @@
driver = driverConsume.add(driverWithdrawal1);
return res;
}
+
@RequestMapping(value = "/use/getCount")
@ResponseBody
public Object getCount1(Integer time,String insertTime,Integer type) {
@@ -514,63 +563,102 @@
// 司机消费
List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
// 司机提现
- List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
- // 司机提现wrapper
+ List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();
Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
- .eq("state", 2)
- .eq("userType", 2)
- .between("handleTime", start, end);
+ ;
// 专车wrapper
Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("activityId")
- .isNotNull("discountMoney")
- .between("insertTime", start, end)
-
;
// 小件物流wrapper
Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
- .isNotNull("activityId")
- .isNotNull("discountMoney")
- .between("insertTime", start, end)
-
;
// 已使用优惠券记录wrapper
Wrapper<TOrderPrivateCar> between2 = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("couponId")
- .isNotNull("couponMoney")
- .between("insertTime", start, end)
-
-
;
Wrapper<TOrderLogistics> between22 = new EntityWrapper<TOrderLogistics>()
- .isNotNull("couponId")
- .isNotNull("couponMoney")
- .between("insertTime", start, end)
-
-
;
// 已使用红包记录wrapper
Wrapper<TOrderPrivateCar> between3 = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("redPacketId")
- .isNotNull("redPacketMoney")
- .between("insertTime", start, end)
-
;
Wrapper<TOrderLogistics> between33 = new EntityWrapper<TOrderLogistics>()
- .isNotNull("redPacketId")
- .isNotNull("redPacketMoney")
- .between("insertTime", start, end)
-
-
;
// 司机已消费金额
Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
- .ne("purpose", 6)
- .between("createTime", start, end);
+ ;
// 司机提现
Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6)
- .between("createTime", start, end);
+ ;
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("type",1)
+ .eq("userType", 2)
+ .between("insertTime", start, end);
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney");
+ // 已使用优惠券记录wrapper
+ between2 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ between22 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney");
+ // 已使用红包记录wrapper
+ between3 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ between33 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney");
+ // 司机已消费金额
+ between4 = new EntityWrapper<BalanceUsageRecord>()
+ .ne("purpose", 6);
+
+ }else{
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("type",1)
+ .eq("userType", 2)
+ .between("insertTime", start, end);
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("activityId")
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end);
+ // 已使用优惠券记录wrapper
+ between2 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+ between22 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("couponId")
+ .isNotNull("couponMoney")
+ .between("insertTime", start, end);
+ // 已使用红包记录wrapper
+ between3 = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+ between33 = new EntityWrapper<TOrderLogistics>()
+ .isNotNull("redPacketId")
+ .isNotNull("redPacketMoney")
+ .between("insertTime", start, end);
+ // 司机已消费金额
+ between4 = new EntityWrapper<BalanceUsageRecord>()
+ .ne("purpose", 6)
+ .between("createTime", start, end);
+ }
if (type!=null){
switch (type){
@@ -588,7 +676,8 @@
// 司机消费记录
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ // 司机提现记录
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
break;
case 4:
// 专车订单
@@ -611,7 +700,7 @@
// 消费
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
// 提现
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
}
// 已发放补贴总额
@@ -643,7 +732,7 @@
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
-
+ res.add(grantVO);
}
for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
@@ -659,6 +748,7 @@
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
+ res.add(grantVO);
}
// 查询已领取红包总额
for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {
@@ -668,14 +758,20 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
+ BigDecimal temp = new BigDecimal(BigInteger.ZERO);
+ for (int i = 0; i < objects.size(); i++) {
+ String string = objects.getJSONObject(i).getString("money");
+ temp = temp.add(new BigDecimal(string));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
res.add(grantVO);
- redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
+ redPackage = redPackage.add(new BigDecimal(temp.toString()));
}
for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
@@ -684,14 +780,20 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
grantVO.setType("红包");
- grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
+ JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
+ BigDecimal temp = new BigDecimal(BigInteger.ZERO);
+ for (int i = 0; i < objects.size(); i++) {
+ String string = objects.getJSONObject(i).getString("money");
+ temp = temp.add(new BigDecimal(string));
+ }
+ grantVO.setAmount(temp.toString());
TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
res.add(grantVO);
- redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
+ redPackage = redPackage.add(new BigDecimal(temp.toString()));
}
// 查询已领取优惠券总额
for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
@@ -701,13 +803,13 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
- coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
+ coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
res.add(grantVO);
}
for (TOrderLogistics userCouponRecord : userCouponRecords1) {
@@ -717,13 +819,13 @@
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
grantVO.setType("优惠券");
- grantVO.setAmount(userCouponRecord.getPayMoney().toString());
+ grantVO.setAmount(userCouponRecord.getCouponMoney().toString());
TUser tUser = appUserService.selectById(userCouponRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
- coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
+ coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
res.add(grantVO);
}
// 司机消费奖励
@@ -763,24 +865,19 @@
res.add(grantVO);
}
// 司机提现
- for (BalanceUsageRecord balanceUsageRecord : driverWithdrawal) {
+ for (TPubWithdrawal balanceUsageRecord : driverWithdrawal) {
GrantVO grantVO = new GrantVO();
- grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
+ grantVO.setInsertTime(format.format(balanceUsageRecord.getInsertTime()));
grantVO.setType("司机奖励");
grantVO.setAmount(balanceUsageRecord.getMoney().toString());
- TDriver tUser = driverService.selectById(balanceUsageRecord.getDriverId());
+ TDriver tUser = driverService.selectById(balanceUsageRecord.getUserId());
if (tUser!=null){
grantVO.setName(tUser.getFirstName()+tUser.getLastName());
}
- switch (balanceUsageRecord.getPurpose()){
- case 6:
- grantVO.setRemark("司机提现");
- break;
- }
+ grantVO.setRemark("司机提现");
driverWithdrawal1 = driverWithdrawal1.add(new BigDecimal(balanceUsageRecord.getMoney().toString()));
res.add(grantVO);
}
-
// 总额
total = total.add(redPackage).add(coupon).add(discount).add(driverConsume).add(driverWithdrawal1);
// 已使用司机奖励合计
@@ -793,7 +890,6 @@
useMoneyVO.setDriver(driver);
useMoneyVO.setDriverWithdrawal(driverWithdrawal1);
useMoneyVO.setDriverConsume(driverConsume);
-
return useMoneyVO;
}
@@ -878,31 +974,69 @@
// 专车wrapper
Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
- .isNotNull("discountMoney")
- .between("insertTime", start, end)
;
// 小件物流wrapper
Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
- .between("insertTime", start, end)
- .isNotNull("discountMoney")
-
;
// 优惠券领取记录wrapper
Wrapper<UserCouponRecord> between2 = new EntityWrapper<UserCouponRecord>()
- .ne("couponUseType", 2)
- .ne("couponUseType", 3)
- .between("insertTime", start, end);
+ ;
// 红包领取记录wrapper
Wrapper<UserRedPacketRecord> between3 = new EntityWrapper<UserRedPacketRecord>()
- .ne("orderType", 2)
- .ne("orderType", 3)
- .between("insertTime", start, end);
+ ;
// 司机奖励
Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
- .eq("carryOut", 2)
- .between("insertTime", start, end);
+ ;
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ ;
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ ;
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ ;
+ }else{
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end)
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .between("insertTime", start, end)
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ .between("insertTime", start, end);
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ .between("insertTime", start, end);
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ .between("insertTime", start, end);
+ }
+
if (type!=null){
switch (type){
@@ -948,12 +1082,8 @@
BigDecimal driver = new BigDecimal("0");
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
- if (tOrderPrivateCar.getDiscountMoney()==null){
+ if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
continue;
- }
- if (tOrderPrivateCar.getState() != 8 && tOrderPrivateCar.getState()!=9){
- continue;
-
}
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
GrantVO grantVO = new GrantVO();
@@ -974,12 +1104,10 @@
res.add(grantVO);
}
for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
- if (tOrderPrivateCar.getDiscountMoney()==null){
+ if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
continue;
}
- if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
- continue;
- }
+
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
GrantVO grantVO = new GrantVO();
grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -1030,10 +1158,9 @@
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- SysCouponRecord sysCouponRecord =
- sysCouponRecordService.selectById(userCouponRecord.getCouponId());
- if (sysCouponRecord!=null){
- grantVO.setRemark(sysCouponRecord.getName());
+ SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(userCouponRecord.getCouponActivityId());
+ if (sysCouponActivity!=null){
+ grantVO.setRemark(sysCouponActivity.getName());
}
coupon = coupon.add(new BigDecimal(userCouponRecord.getMoney().toString()));
res.add(grantVO);
@@ -1066,8 +1193,11 @@
driver = driver.add(new BigDecimal(driverActivityHistory.getMoney().toString()));
res.add(grantVO);
}
+ List<GrantVO> sortedList = res.stream()
+ .sorted((o1, o2) -> o2.getInsertTime().compareTo(o1.getInsertTime()))
+ .collect(Collectors.toList());
total = total.add(redPackage).add(coupon).add(discount).add(driver);
- return res;
+ return sortedList;
}
@RequestMapping(value = "/grant/getCount")
@ResponseBody
@@ -1147,34 +1277,68 @@
// 专车wrapper
Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
- .between("insertTime", start, end)
- .isNotNull("discountMoney")
-// .eq("state", 8)
-// .or()
-// .eq("state", 9)
+
;
// 小件物流wrapper
Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
- .between("insertTime", start, end)
- .isNotNull("discountMoney")
-// .eq("state", 8)
-// .or()
-// .eq("state", 9)
+
;
// 优惠券领取记录wrapper
Wrapper<UserCouponRecord> between2 = new EntityWrapper<UserCouponRecord>()
- .ne("couponUseType", 2)
- .ne("couponUseType", 3)
- .between("insertTime", start, end);
+ ;
// 红包领取记录wrapper
Wrapper<UserRedPacketRecord> between3 = new EntityWrapper<UserRedPacketRecord>()
- .ne("orderType", 2)
- .ne("orderType", 3)
- .between("insertTime", start, end);
+ ;
// 司机奖励
Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
- .eq("carryOut", 2)
- .between("insertTime", start, end);
+ ;
+ if (time == 5 && !StringUtils.hasLength(insertTime)){
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ ;
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ ;
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ ;
+ }else{
+ // 专车wrapper
+ between = new EntityWrapper<TOrderPrivateCar>()
+ .isNotNull("discountMoney")
+ .between("insertTime", start, end)
+ ;
+ // 小件物流wrapper
+ between1 = new EntityWrapper<TOrderLogistics>()
+ .between("insertTime", start, end)
+ .isNotNull("discountMoney")
+ ;
+ // 优惠券领取记录wrapper
+ between2 = new EntityWrapper<UserCouponRecord>()
+ .ne("couponUseType", 2)
+ .ne("couponUseType", 3)
+ .between("insertTime", start, end);
+ // 红包领取记录wrapper
+ between3 = new EntityWrapper<UserRedPacketRecord>()
+ .between("insertTime", start, end);
+ // 司机奖励
+ between4 = new EntityWrapper<DriverActivityHistory>()
+ .eq("carryOut", 2)
+ .between("insertTime", start, end);
+ }
if (type!=null){
switch (type){
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
index 8ff141a..25b1572 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -241,7 +241,7 @@
@ResponseBody
public Object add(String staTime, String startTime, String num1, Double num2
, Double num3
- , Integer num4
+ , String num4
, Double num5
, Integer num6
, Double num7
@@ -250,7 +250,6 @@
, Integer num10
, Double num11
, String num12
-
) {
driverActivityService.insertOrUpdate(null,staTime,startTime, num1, num2
@@ -284,7 +283,7 @@
@ResponseBody
public Object update(Integer id,String staTime, String startTime, String num1, Double num2
, Double num3
- , Integer num4
+ , String num4
, Double num5
, Integer num6
, Double num7
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
index 4e7f6a5..1de9759 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.controller.general;
+import cn.hutool.system.UserInfo;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -9,7 +10,11 @@
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.model.UserRedPacketRecord;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService;
import com.stylefeng.guns.modular.system.service.impl.UserServiceImpl;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -25,10 +30,7 @@
import com.stylefeng.guns.modular.system.service.ISysRedPacketRecordService;
import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
/**
* 控制器
@@ -46,6 +48,14 @@
private ISysRedPacketRecordService sysRedPacketRecordService;
@Autowired
private IUserRedPacketRecordService userRedPacketRecordService;
+
+
+ @RequestMapping("/redRecord")
+ public String index( Model model,Integer couponActivityId,Integer activityType) {
+ model.addAttribute("activityType",activityType);
+ model.addAttribute("couponActivityId",couponActivityId);
+ return PREFIX + "userRedRecord.html";
+ }
/**
@@ -81,46 +91,117 @@
}
+ @Autowired
+ private ITSystemNoticeService systemNoticeService;
+
+ @Autowired
+ private ITUserService userService;
+
+
@RequestMapping(value = "/direct")
@ResponseBody
public ResultUtil direct(String ids, Integer redId) {
-
System.err.println("========="+ids+"======="+redId);
Double money = 0D;
-
-
SysRedPacketRecord sysRedPacketRecord = sysRedPacketRecordService.selectById(redId);
+ List<UserRedPacketRecord> redPacketActivityId = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("redPacketActivityId", redId));
+
+ double totalRemainingAmount = redPacketActivityId.stream()
+ .mapToDouble(UserRedPacketRecord::getRemainingAmount)
+ .sum();
+
+ //还可发放的金额
+ double v = sysRedPacketRecord.getTotalMoney().doubleValue() - totalRemainingAmount;
+
if(null != sysRedPacketRecord){
Integer type = sysRedPacketRecord.getType();
if(type == 1){//固定金额
+
money = Double.valueOf(String.valueOf(sysRedPacketRecord.getMoney()));
- }else{//随机金额
- Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
- Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
- int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
- Random random = new Random();
- int num = random.nextInt(i);
- money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ //计算剩余金额是否够
+
+ if (v-money*ids.split(",").length < 0){
+ return ResultUtil.error("当前红包剩余金额不足");
+ }
+
+
+
}
+
+// else{//随机金额
+// Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
+// Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
+// int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
+// Random random = new Random();
+// int num = random.nextInt(i);
+// money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+// }
}
String[] split = ids.split(",");
for (String s : split) {
- if(money > 0){
+ if(money > 0||sysRedPacketRecord.getType()!=1){
+ if (sysRedPacketRecord.getType()!=1){
+ Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
+ Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
+ int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
+ Random random = new Random();
+ int num;
+ if (!startMoney.equals(endMoney)){
+ num = random.nextInt(i);
+
+ }else {
+ num = 0;
+ }
+ money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ v=v-money;
+ if (v<0){
+ return ResultUtil.success("当前红包为随机红包，可能有部分用户无法领取",null,"当前红包为随机红包，可能有部分用户无法领取");
+ }
+ }
//添加临时红包数据
UserRedPacketRecord userRedPacketRecord = new UserRedPacketRecord();
userRedPacketRecord.setMoney(money);
+ userRedPacketRecord.setRemainingAmount(money);
userRedPacketRecord.setInsertTime(new Date());
userRedPacketRecord.setCompanyId(1);
- userRedPacketRecord.setState(0);
+ userRedPacketRecord.setState(1);
userRedPacketRecord.setOrderId(null);
- userRedPacketRecord.setOrderType(3);
+ userRedPacketRecord.setRedPacketActivityId(redId);
+// userRedPacketRecord.setOrderType(3);
userRedPacketRecord.setUserId(Integer.valueOf(s));
userRedPacketRecordService.insert(userRedPacketRecord);
+
+ TUser tUser = userService.selectById(Integer.valueOf(s));
+ Integer language = tUser.getLanguage();
+ try {
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您收到一个额度为GHS"+money+"的红包，请查收。" : language == 2 ? "You have received a red envelope with a limit of GHS"+money+". Please check it." : "Vous recevez un paquet rouge avec une limite de ghs+"+money+", veuillez vérifier.", tUser.getId());
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+
+
+
}
}
- return ResultUtil.success();
+ return ResultUtil.success("指派成功",null,"当前红包为随机红包，可能有部分用户无法领取");
}
+
+ @RequestMapping(value = "/user/list")
+ @ResponseBody
+ public Object list(String createTime,String userName,String userPhone,Integer couponActivityId,Integer activityType,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(sysRedPacketRecordService.getList(page,beginTime,endTime,userName,userPhone,couponActivityId,activityType,state));
+ return super.packForBT(page);
+ }
+
/**
* 获取列表
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
index 9baf926..9e608f0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
@@ -82,8 +82,10 @@
*/
@RequestMapping("/user")
public String userIndex(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 3));
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 3).eq("language",1));
model.addAttribute("one",one);
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 3).eq("language",1));
+ model.addAttribute("two",two);
return PREFIX + "tAgreementUser.html";
}
@@ -155,8 +157,10 @@
*/
@RequestMapping("/showCommonProblem")
public String showCommonProblem(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 12));
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 12).eq("language",1));
model.addAttribute("one",one);
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 12).eq("language",1));
+ model.addAttribute("two",two);
return PREFIX + "commonProblem.html";
}
@@ -217,12 +221,18 @@
*/
@RequestMapping(value = "/updateAppParam")
@ResponseBody
- public Object updateAppParam(@RequestParam Integer id,@RequestParam String context) {
+ public Object updateAppParam(@RequestParam Integer id,@RequestParam String context, Integer id1, String context1) {
TAgreement agreement = tAgreementService.selectById(id);
agreement.setContent(context);
agreement.setUpdateTime(new Date());
agreement.setUpdateUser(ShiroKit.getUser().getId());
tAgreementService.updateById(agreement);
+
+ TAgreement agreement1 = tAgreementService.selectById(id1);
+ agreement1.setContent(context1);
+ agreement1.setUpdateTime(new Date());
+ agreement1.setUpdateUser(ShiroKit.getUser().getId());
+ tAgreementService.updateById(agreement1);
return SUCCESS_TIP;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 43981ca..ec969f8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -136,6 +136,8 @@
model.addAttribute("zcModelList",zcModelList);
List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
model.addAttribute("kcModelList",kcModelList);
+ List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ model.addAttribute("xjModelList",xjModelList);
List<TCarColor> state = carColorService.selectList(new EntityWrapper<TCarColor>().eq("state", 1));
model.addAttribute("color", state);
return PREFIX + "tCar_add.html";
@@ -198,6 +200,7 @@
Integer six = 1;
Integer zcModel = 0;
Integer kcModel = 0;
+ Integer xjModel = 0;
for (TCarService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -211,7 +214,8 @@
kcModel = obj.getServerCarModelId();
}
if (obj.getType() == 4){
- four = 2;
+ four = 4;
+ xjModel = obj.getServerCarModelId();
}
if (obj.getType() == 5){
five = 2;
@@ -228,11 +232,14 @@
model.addAttribute("six",six);
model.addAttribute("zcModel",zcModel);
model.addAttribute("kcModel",kcModel);
+ model.addAttribute("xjModel",xjModel);
List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
model.addAttribute("zcModelList",zcModelList);
List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
model.addAttribute("kcModelList",kcModelList);
+ List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ model.addAttribute("xjModelList",xjModelList);
//车辆品牌
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
@@ -258,6 +265,7 @@
Integer six = 1;
Integer zcModel = 0;
Integer kcModel = 0;
+ Integer xjModel = 0;
for (TCarService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -267,12 +275,19 @@
four = 2;
zcModel = obj.getServerCarModelId();
}
+ if (obj.getType() == 4){
+ four = 4;
+ xjModel = obj.getServerCarModelId();
+ }
}
model.addAttribute("one",one);
model.addAttribute("four",four);
model.addAttribute("zcModel",zcModel);
+ model.addAttribute("xjModel",xjModel);
List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
model.addAttribute("zcModelList",zcModelList);
+ List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ model.addAttribute("xjModelList",xjModelList);
LogObjectHolder.me().set(tCar);
return PREFIX + "tCar_auth.html";
}
@@ -441,7 +456,7 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) throws Exception {
+ public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel) throws Exception {
TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate()));
if(null != tCar1){
throw new Exception("车牌号重复");
@@ -497,8 +512,8 @@
service.setType(Integer.valueOf(serverArray[i]));
if (1 == service.getType()){
service.setServerCarModelId(Integer.valueOf(zcModel));
- }else if (3 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (4 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(xjModel));
}
tCarServiceService.insert(service);
}
@@ -529,7 +544,7 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel)throws Exception {
+ public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel)throws Exception {
TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate()));
if(null != tCar1 && tCar.getId().compareTo(tCar1.getId()) != 0){
throw new Exception("车牌号重复");
@@ -576,8 +591,8 @@
service.setType(Integer.valueOf(serverArray[i]));
if (1 == service.getType()){
service.setServerCarModelId(Integer.valueOf(zcModel));
- }else if (3 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (4 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(xjModel));
}
tCarServiceService.insert(service);
}
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 c952541..8086944 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
@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 系统设置控制器
@@ -120,7 +121,8 @@
@RequestMapping(value = "/redSet/list")
@ResponseBody
public Object redSetList() {
-
+ List<String> strings = new ArrayList<>();
+ strings.add("updateTime");
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
@@ -129,7 +131,16 @@
for (Map<String, Object> stringObjectMap : list) {
stringObjectMap.put(stringObjectMap.get("deductionRatio").toString(),stringObjectMap.get("deductionRatio")+"%");
}
- page.setRecords(list);
+ List<Map<String, Object>> sortedList = list.stream()
+ .sorted((map1, map2) -> {
+ // 获取 updateTime 字段
+ String time1 = map1.get("updateTime").toString();
+ String time2 = map2.get("updateTime").toString();
+ // 倒序排列
+ return time2.compareTo(time1);
+ })
+ .collect(Collectors.toList());
+ page.setRecords(sortedList);
}
return super.packForBT(page);
}
@@ -148,7 +159,12 @@
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
+ if (date.before(new Date())){
+ // 选择的生效时间不能小于当前时间
+ return 501;
+ }
tSysRedSet.setInsertTime(new Date());
+ tSysRedSet.setUpdateTime(new Date());
tSysRedSet.setEffectiveDate(date);
tSysRedSet.setStatus(1);
redEnvelopePaymentSettingsService.insert(tSysRedSet);
@@ -167,7 +183,7 @@
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
- tSysRedSet.setInsertTime(date);
+ tSysRedSet.setEffectiveDate(date);
tSysRedSet.setUpdateTime(new Date());
redEnvelopePaymentSettingsService.updateById(tSysRedSet);
return SUCCESS_TIP;
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
index 111aee9..8a20baa 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
@@ -121,13 +121,12 @@
tIntegralOrder.setState(2);
tIntegralOrder.setManageRemark(tIntegralOrder.getRemark());
tIntegralOrder.setRemark(null);
-
tIntegralOrderService.updateById(tIntegralOrder);
-
+ TIntegralOrder tIntegralOrder1 = tIntegralOrderService.selectById(tIntegralOrder.getId());
new Thread(new Runnable() {
@Override
public void run() {
- TUser tUser = userService.selectById(tIntegralOrder.getUserId());
+ TUser tUser = userService.selectById(tIntegralOrder1.getUserId());
if(ToolUtil.isNotEmpty(tUser.getEmail())){
try {
Integer language = tUser.getLanguage();
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 1abaeb0..0fba0af 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -1,6 +1,9 @@
package com.stylefeng.guns.modular.system.controller.specialTrain;
+import cn.hutool.system.UserInfo;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.google.gson.Gson;
@@ -12,6 +15,7 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
+import com.stylefeng.guns.modular.system.dao.TSystemPriceMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
@@ -32,6 +36,8 @@
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.util.*;
/**
@@ -204,9 +210,9 @@
@RequestMapping(value = "/frozenOrder")
@ResponseBody
- public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) {
+ public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) throws Exception {
TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
-
+ orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
//添加已收入明细
TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
Double taxi = company.getSpeMoney().doubleValue();
@@ -239,9 +245,230 @@
}
orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
+ orderPrivateCar.setState(7);
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
+
return SUCCESS_TIP;
}
+ @Resource
+ private TSystemPriceMapper systemPriceMapper;
+ public TOrderPrivateCar setMoney(TOrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception {
+ System.err.println("计算金额:"+orderPrivateCar);
+ Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
+ //开始根据不同的方式计算金额
+ double amount = 0;
+ JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());
+ Double num1 = jsonObject.getDouble("num1");//起步价（元）
+ Double num2 = jsonObject.getDouble("num2");//起步公里（公里）
+ Double num3 = jsonObject.getDouble("num3");//起步时间（分钟）
+ Double num4 = jsonObject.getDouble("num4");//里程费（元）
+ Double num5 = jsonObject.getDouble("num5");//时长费（分钟）
+ Double num6 = jsonObject.getDouble("num6");//等待费（分钟）
+ Double num7 = jsonObject.getDouble("num7");//等待费（元）
+ Double num8 = jsonObject.getDouble("num8");//远途费（公里）
+ Double num9 = jsonObject.getDouble("num9");//远途费（公里）
+ Double num10 = jsonObject.getDouble("num10");//远途费（元）
+ Double num11 = jsonObject.getDouble("num11");//远途费（公里）
+ Double num12 = jsonObject.getDouble("num12");//远途费（公里）
+ Double num13 = jsonObject.getDouble("num13");//远途费（元）
+ Double num14 = jsonObject.getDouble("num14");//远途费（公里）
+ Double num15 = jsonObject.getDouble("num15");//远途费（元）
+ String num16 = jsonObject.getString("num16");//夜间费（开始时间）
+ Double num17 = jsonObject.getDouble("num17");//夜间费（元）
+ Double num18 = jsonObject.getDouble("num18");//夜间费（元）
+ Double num19 = jsonObject.getDouble("num19");//夜间费（元）
+ Double num20 = jsonObject.getDouble("num20");//夜间费（元）
+ Double num21 = jsonObject.getDouble("num21");//夜间费（元）
+ Double num22 = jsonObject.getDouble("num22");//夜间费（元）
+ String num23 = jsonObject.getString("num23");//高峰费（开始时间）
+ String num24 = jsonObject.getString("num24");//高峰费（开始时间）
+ Double num25 = jsonObject.getDouble("num25");//高峰费（元）
+ Double num26 = jsonObject.getDouble("num26");//高峰费（元）
+ Double num27 = jsonObject.getDouble("num27");//高峰费（元）
+ Double num28 = jsonObject.getDouble("num28");//高峰费（元）
+ Double num29 = jsonObject.getDouble("num29");//高峰费（元）
+ Double num30 = jsonObject.getDouble("num30");//高峰费（元）
+
+ Date date = new Date();
+ double d = (null == orderPrivateCar.getMileage() ? 0D : orderPrivateCar.getMileage()) / 1000;//实际公里
+ if (orderPrivateCar.getEndServiceTime() == null){
+ orderPrivateCar.setEndServiceTime(new Date());
+ }
+ double t=1;
+ if (orderPrivateCar.getStartServiceTime() == null){
+ t = 1;//实际时间（不满一分钟按一分钟算）
+ }else{
+ t = ((orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000) + 1;//实际时间（不满一分钟按一分钟算）
+ }
+ double w = ((orderPrivateCar.getStartServiceTime().getTime() - orderPrivateCar.getArriveTime().getTime()) / 60000) + 1;//等待分钟（不满一分钟按一分钟算）
+ double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里
+ double t1 = (t - num3) < 0 ? 0 : new BigDecimal(t - num3).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超过起步分钟数的时间
+ double w1 = (w - num6) < 0 ? 0 : new BigDecimal(w - num6).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超出等待时间的时间
+ double yt1 = 0;//远途1段
+ double yt2 = 0;//远途2段
+ double yt3 = 0;//远途3段
+
+
+ //夜间服务处理逻辑
+ if(ToolUtil.isNotEmpty(num16)){
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
+ s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
+ s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));
+
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
+ e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));
+
+ if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
+ if(d > num8.doubleValue() && d <= num9.doubleValue()){
+ yt1 = num20 * (d - num8);
+ }
+ if(d > num9.doubleValue()){
+ yt1 = num20 * (num9 - num8);
+ }
+ if(d > num11.doubleValue() && d <= num12.doubleValue()){
+ yt2 = num21 * (d - num11);
+ }
+ if(d > num12.doubleValue()){
+ yt2 = num21 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num22 * (d - num14);
+ }
+ amount = num17 + (d1 * num18) + (t1 * num19) + (w1 * num7) + yt1 + yt2 + yt3;
+ orderPrivateCar.setStartMileage(num2);
+ orderPrivateCar.setStartMoney(new BigDecimal(num17));//起步价
+ orderPrivateCar.setStartDuration((int)(num3.doubleValue()));
+ orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num18).setScale(2, BigDecimal.ROUND_HALF_EVEN));//里程费
+ orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num19).setScale(2, BigDecimal.ROUND_HALF_EVEN));//时长费
+ orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setWaitMoney(new BigDecimal(w1 * num7).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
+ orderPrivateCar.setLongDistance(new BigDecimal((d > num8) ? d - num8 : 0).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setLongDistanceMoney(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN));//远途费
+ orderPrivateCar.setParkMoney(new BigDecimal(parkingFee));//停车费
+ orderPrivateCar.setRoadTollMoney(new BigDecimal(crossingFee));//过路费
+ orderPrivateCar.setRedPacketMoney(new BigDecimal("0"));//红包抵扣
+ orderPrivateCar.setCouponMoney(new BigDecimal("0"));//优惠券抵扣
+ orderPrivateCar.setDiscount(0D);//优惠抵扣
+ orderPrivateCar.setPayMoney(new BigDecimal("0"));//支付金额
+ orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ orderPrivateCar.setMoneyType(2);
+ orderPrivateCar.setMoneyTime(num16);
+ return orderPrivateCar;
+ }
+ }
+
+
+ //高峰时段处理逻辑
+ Calendar s1 = Calendar.getInstance();
+ s1.setTime(date);
+ s1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[0].split(":")[0]));
+ s1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[0].split(":")[1]));
+
+ Calendar e1 = Calendar.getInstance();
+ e1.setTime(date);
+ e1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[1].split(":")[0]));
+ e1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[1].split(":")[1]));
+
+ Calendar s2 = Calendar.getInstance();
+ s2.setTime(date);
+ s2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[0].split(":")[0]));
+ s2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[0].split(":")[1]));
+
+ Calendar e2 = Calendar.getInstance();
+ e2.setTime(date);
+ e2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[1].split(":")[0]));
+ e2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[1].split(":")[1]));
+
+ if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){
+ if(d > num8.doubleValue() && d <= num9.doubleValue()){
+ yt1 = num28 * (d - num8);
+ }
+ if(d > num9.doubleValue()){
+ yt1 = num28 * (num9 - num8);
+ }
+ if(d > num11.doubleValue() && d <= num12.doubleValue()){
+ yt2 = num29 * (d - num11);
+ }
+ if(d > num12.doubleValue()){
+ yt2 = num29 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num30 * (d - num14);
+ }
+ amount = num25 + (d1 * num26) + (t1 * num27) + (w1 * num7) + yt1 + yt2 + yt3;
+ orderPrivateCar.setStartMileage(num2);
+ orderPrivateCar.setStartDuration((int)(num3.doubleValue()));
+ orderPrivateCar.setStartMoney(new BigDecimal(num25));//起步价
+ orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num26).setScale(2, BigDecimal.ROUND_HALF_EVEN));//里程费
+ orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num27).setScale(2, BigDecimal.ROUND_HALF_EVEN));//时长费
+ orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setWaitMoney(new BigDecimal(w1 * num7).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
+ orderPrivateCar.setLongDistance(new BigDecimal((d > num8) ? d - num8 : 0).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setLongDistanceMoney(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN));//远途费
+ orderPrivateCar.setParkMoney(new BigDecimal(parkingFee));//停车费
+ orderPrivateCar.setRoadTollMoney(new BigDecimal(crossingFee));//过路费
+ orderPrivateCar.setRedPacketMoney(new BigDecimal("0"));//红包抵扣
+ orderPrivateCar.setCouponMoney(new BigDecimal("0"));//优惠券抵扣
+ orderPrivateCar.setDiscount(0D);//优惠抵扣
+ orderPrivateCar.setPayMoney(new BigDecimal("0"));//支付金额
+ orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+
+ orderPrivateCar.setMoneyType(3);
+ if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis())){
+ orderPrivateCar.setMoneyTime(num23);
+ }else{
+ orderPrivateCar.setMoneyTime(num24);
+ }
+
+ return orderPrivateCar;
+ }
+
+ //其他时间段的计算
+ if(d > num8.doubleValue() && d <= num9.doubleValue()){
+ yt1 = num10 * (d - num8);
+ }
+ if(d > num9.doubleValue()){
+ yt1 = num10 * (num9 - num8);
+ }
+ if(d > num11.doubleValue() && d <= num12.doubleValue()){
+ yt2 = num13 * (d - num11);
+ }
+ if(d > num12.doubleValue()){
+ yt2 = num13 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num15 * (d - num14);
+ }
+ amount = num1 + (d1 * num4) + (t1 * num5) + (w1 * num7) + yt1 + yt2 + yt3;
+ orderPrivateCar.setStartMileage(num2);
+ orderPrivateCar.setStartDuration((int)(num3.doubleValue()));
+ orderPrivateCar.setStartMoney(new BigDecimal(num1));//起步价
+ orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num4).setScale(2, BigDecimal.ROUND_HALF_EVEN));//里程费
+ orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num5).setScale(2, BigDecimal.ROUND_HALF_EVEN));//时长费
+ orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setWaitMoney(new BigDecimal(w1 * num7).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
+ orderPrivateCar.setLongDistance(new BigDecimal((d > num8) ? d - num8 : 0).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setLongDistanceMoney(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN));//远途费
+ orderPrivateCar.setParkMoney(new BigDecimal(parkingFee));//停车费
+ orderPrivateCar.setRoadTollMoney(new BigDecimal(crossingFee));//过路费
+ orderPrivateCar.setRedPacketMoney(new BigDecimal("0"));//红包抵扣
+ orderPrivateCar.setCouponMoney(new BigDecimal("0"));//优惠券抵扣
+ orderPrivateCar.setDiscount(0D);//优惠抵扣
+ orderPrivateCar.setPayMoney(new BigDecimal("0"));//支付金额
+ orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+//
+ orderPrivateCar.setMoneyType(1);
+ return orderPrivateCar;
+ }
/**
* 支付专车订单
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 4cc0539..0c937d1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -556,23 +556,23 @@
System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
}
- //返回驾驶员处罚金
- TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
- originalDriver.setBalance(originalDriver.getBalance().add(new BigDecimal(tReassign.getMoney())));
- itDriverService.updateById(originalDriver);
-
- //增加交易明细
- TPubTransactionDetails details = new TPubTransactionDetails();
- details.setUserId(originalDriver.getId());
- details.setInsertTime(new Date());
- details.setRemark("【小件物流】:改派失败或订单取消");
- details.setMoney(new BigDecimal(tReassign.getMoney()));
- details.setState(1);
- details.setType(1);
- details.setUserType(2);
- details.setOrderType(tReassign.getOrderType());
- details.setOrderId(tReassign.getOrderId());
- itPubTransactionDetailsService.insert(details);
+// //返回驾驶员处罚金
+// TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
+// originalDriver.setBalance(originalDriver.getBalance().add(new BigDecimal(tReassign.getMoney())));
+// itDriverService.updateById(originalDriver);
+//
+// //增加交易明细
+// TPubTransactionDetails details = new TPubTransactionDetails();
+// details.setUserId(originalDriver.getId());
+// details.setInsertTime(new Date());
+// details.setRemark("【小件物流】:改派失败或订单取消");
+// details.setMoney(new BigDecimal(tReassign.getMoney()));
+// details.setState(1);
+// details.setType(1);
+// details.setUserType(2);
+// details.setOrderType(tReassign.getOrderType());
+// details.setOrderId(tReassign.getOrderId());
+// itPubTransactionDetailsService.insert(details);
return SUCCESS_TIP;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
index c8f2b88..4b72592 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
@@ -170,7 +170,7 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage ) {
+ public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar) {
int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 1)
.eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
@@ -178,9 +178,8 @@
}
tServerCarmodel.setInsertTime(new Date());
tServerCarmodel.setState(1);
- tServerCarmodel.setType(1);
- tServerCarmodel.setIsPackage(isPackage);
- tServerCarmodel.setIsPrivateCar(isPrivateCar);
+ tServerCarmodel.setType(isPrivateCar);
+
tServerCarmodelService.insert(tServerCarmodel);
return SUCCESS_TIP;
}
@@ -190,12 +189,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage) {
+ public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar) {
tServerCarmodel.setInsertTime(new Date());
tServerCarmodel.setState(1);
- tServerCarmodel.setType(1);
- tServerCarmodel.setIsPackage(isPackage);
- tServerCarmodel.setIsPrivateCar(isPrivateCar);
+ tServerCarmodel.setType(isPrivateCar);
tServerCarmodelService.updateById(tServerCarmodel);
return SUCCESS_TIP;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index c260e41..17abe1c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -107,7 +107,7 @@
//查询所有专车车型
Integer objectId = ShiroKit.getUser().getObjectId();
List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", objectId).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("isPackage", 1).eq("state", 1));
+ List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state",1));
List<TServerCarmodel> serverCarmodels = new ArrayList<>();
for(TServerCarmodel tsc : modelList){
boolean b = true;
@@ -160,6 +160,40 @@
return PREFIX + "tSystemPrice_edit.html";
}
+
+
+ @RequestMapping("/tSmallPrice_update/{tSystemPriceId}")
+ public String tSmallPrice_update(@PathVariable Integer tSystemPriceId, Model model) {
+ TSystemPrice tSystemPrice = tSystemPriceService.selectById(tSystemPriceId);
+ model.addAttribute("item",tSystemPrice);
+ LogObjectHolder.me().set(tSystemPrice);
+
+ JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
+ model.addAttribute("json",json);
+
+ //查询所有专车车型
+// List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).ne("state", 3));
+// List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ List<TServerCarmodel> serverCarmodels = new ArrayList<>();
+// for(TServerCarmodel tsc : modelList){
+// boolean b = true;
+// for(TSystemPrice tsp : tSystemPrices){
+// if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
+// b = false;
+// break;
+// }
+// }
+// if(b){
+// serverCarmodels.add(tsc);
+// }
+// }
+ TServerCarmodel tSystemPrice1 = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ serverCarmodels.add(tSystemPrice1);
+ model.addAttribute("modelList", serverCarmodels);
+
+ return PREFIX + "tSystemPrice_edit.html";
+ }
+
/**
* 获取专车价格设置列表
*/
@@ -175,7 +209,7 @@
@ResponseBody
public Object listSmall(String name,Integer state) {
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
+ page.setRecords(tSystemPriceService.getSpecialPriceList1(page,ShiroKit.getUser().getObjectId(),name,state));
return super.packForBT(page);
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java
index 6178336..a29bbb3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java
@@ -1,7 +1,12 @@
package com.stylefeng.guns.modular.system.dao;
+import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -13,4 +18,11 @@
*/
public interface SysRedPacketRecordMapper extends BaseMapper<SysRedPacketRecord> {
-}
+ List<Map<String,Object>> getList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("couponActivityId") Integer couponActivityId,
+ @Param("activityType") Integer activityType,
+ @Param("state") Integer state);}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java
index af7ac0e..74930ce 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java
@@ -25,4 +25,19 @@
@Param("companyId") Integer companyId,
@Param("name") String name,
@Param("state") Integer state);
+ /**
+ * 查询小件物流价格设置
+ */
+ List<Map<String,Object>> getSpecialPriceList1(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("state") Integer state);
+ /**
+ * 获取价格
+ * @param companyId
+ * @param type
+ * @return
+ */
+ Map<String, Object> query(@Param("companyId") Integer companyId, @Param("type") Integer type,
+ @Param("serverCarModelId") Integer serverCarModelId);
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml
index 4376c9d..d8f4457 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml
@@ -22,5 +22,36 @@
<sql id="Base_Column_List">
id, money, insertTime, companyId, name, type, totalMoney, laveMoney, startMoney, endMoney, effective, companyType
</sql>
+ <select id="getList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT
+ c.id,
+ c.money,
+ c.insertTime,
+ c.companyId,
+ c.state,
+ c.userId,
+ u.nickName,
+ u.phone
+ FROM
+ t_user_red_packet_record c
+ LEFT JOIN t_user u ON c.userId = u.id
+
+ WHERE 1=1
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (c.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName !=''">
+ and u.nickName like CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone !=''">
+ and u.phone like CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="couponActivityId != null">
+ and c.redPacketActivityId=#{couponActivityId}
+ </if>
+ <if test="state != null and state !=''">
+ and c.state=#{state}
+ </if>
+ </select>
</mapper>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml
index 86a8c82..ab065f4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml
@@ -23,7 +23,9 @@
<!--根据条件查询兑换订单列表-->
<select id="getIntegralOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ui.nickName as userName,ig.`name` as goodsName,io.id,io.insertTime,io.userId,io.goodsId,io.num,io.consigneeName,io.consigneePhone,io.consigneeAddress,io.state,io.manageRemark as remark FROM t_integral_order as io
+ SELECT * FROM (
+ SELECT
+ ui.nickName as userName,ig.`name` as goodsName,io.id,io.insertTime,io.userId,io.goodsId,io.num,io.consigneeName,io.consigneePhone,io.consigneeAddress,io.state,io.manageRemark as remark FROM t_integral_order as io
LEFT JOIN t_user as ui on ui.id = io.userId
LEFT JOIN t_integral_goods as ig on ig.id = io.goodsId) as o
<where>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
index 7e07b10..fd7f1c1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
@@ -21,13 +21,13 @@
<select id="getServerCarModelList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM t_server_carmodel as o
<where>
- o.type = #{type} and not FIND_IN_SET(o.state,'3')
<if test="name != null and name != ''">
and o.name LIKE CONCAT('%',#{name},'%')
</if>
<if test="state != null and state != ''">
and o.state = #{state}
</if>
+ and (o.type =1 or o.type =4)
</where>
order by o.id desc
</select>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml
index 42e2f0e..6e92c48 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml
@@ -23,6 +23,21 @@
SELECT * FROM (SELECT sp.id,sp.type,sp.companyId,sc.`name`,sc.img,sp.state from t_system_price as sp
LEFT JOIN t_server_carmodel as sc on sc.id = sp.serverCarModelId) as o
<where>
+ o.type = 1 and o.state != 3 and o.companyId = #{companyId}
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+ <!--查询小件物流价格设置-->
+ <select id="getSpecialPriceList1" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT sp.id,sp.type,sp.companyId,sc.`name`,sc.img,sp.state from t_system_price as sp
+ LEFT JOIN t_server_carmodel as sc on sc.id = sp.serverCarModelId) as o
+ <where>
o.type = 4 and o.state != 3 and o.companyId = #{companyId}
<if test="name != null and name != ''">
and o.name LIKE CONCAT('%',#{name},'%')
@@ -34,4 +49,17 @@
order by o.id desc
</select>
+ <select id="query" resultType="map">
+ select
+ id as id,
+ content as content
+ from t_system_price where companyId = #{companyId}
+ <if test="null != type">
+ and `type` = #{type}
+ </if>
+ <if test="null != serverCarModelId">
+ and serverCarModelId = #{serverCarModelId}
+ </if>
+ </select>
+
</mapper>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
index 17d8c7e..970a9b4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
@@ -55,7 +55,6 @@
private Date endTime;
private Integer companyType;
- private String offline;
public Integer getCompanyType() {
return companyType;
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
index cbcadac..57246c2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
import java.io.Serializable;
/**
@@ -16,6 +18,7 @@
* @since 2020-06-17
*/
@TableName("t_driver_activity_online")
+@Data
public class DriverActivityOnline extends Model<DriverActivityOnline> {
private static final long serialVersionUID = 1L;
@@ -37,11 +40,13 @@
/**
* 在线小时
*/
- private Integer online;
+ private Double online;
/**
* 奖励金额
*/
private Double money;
+ // 自动下班时间
+ private Double offlineTime;
/**
* 有效期开始时间
*/
@@ -88,11 +93,11 @@
this.type = type;
}
- public Integer getOnline() {
+ public Double getOnline() {
return online;
}
- public void setOnline(Integer online) {
+ public void setOnline(Double online) {
this.online = online;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java
index 452a992..ea1830e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java
@@ -62,7 +62,7 @@
/**
* 有效天数
*/
- private Integer effective;
+// private Integer effective;
/**
* 1=平台 2=分公司 3=加盟商
*/
@@ -149,13 +149,13 @@
this.endMoney = endMoney;
}
- public Integer getEffective() {
- return effective;
- }
-
- public void setEffective(Integer effective) {
- this.effective = effective;
- }
+// public Integer getEffective() {
+// return effective;
+// }
+//
+// public void setEffective(Integer effective) {
+// this.effective = effective;
+// }
public Integer getCompanyType() {
return companyType;
@@ -183,7 +183,7 @@
", laveMoney=" + laveMoney +
", startMoney=" + startMoney +
", endMoney=" + endMoney +
- ", effective=" + effective +
+// ", effective=" + effective +
", companyType=" + companyType +
"}";
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java
index ebc8a14..941305d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java
@@ -64,6 +64,7 @@
* 状态 1=未处理 2=已处理 3=已删除
*/
private Integer state;
+ private Integer integral;
private String manageRemark;
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
index 3f2de40..26fadff 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
import java.io.Serializable;
/**
@@ -17,6 +19,7 @@
* @since 2020-09-24
*/
@TableName("t_order_logistics")
+@Data
public class TOrderLogistics extends Model<TOrderLogistics> {
private static final long serialVersionUID = 1L;
@@ -169,7 +172,7 @@
/**
* 红包记录id
*/
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -553,13 +556,6 @@
this.couponMoney = couponMoney;
}
- public Integer getRedPacketId() {
- return redPacketId;
- }
-
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
public Integer getCouponId() {
return couponId;
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index bb5d30e..a2c2c8f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import java.util.Date;
@@ -34,6 +35,36 @@
*/
private Integer type;
private String remark;
+ @TableField("startMileage")
+ private Double startMileage;
+
+ private Integer startDuration;
+ @TableField("duration")
+ private Double duration;
+ @TableField("wait")
+ private Double wait;
+ @TableField("longDistance")
+ private Double longDistance;
+
+ @TableField("mileageKilometers")
+ private Double mileageKilometers;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* 用户id
@@ -137,7 +168,8 @@
private BigDecimal orderMoney;
private Double waitMoney;
-
+ private Integer moneyType;
+ private String moneyTime;
/**
* 起步价
*/
@@ -173,7 +205,7 @@
/**
* 红包记录id
*/
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -607,13 +639,7 @@
this.couponMoney = couponMoney;
}
- public Integer getRedPacketId() {
- return redPacketId;
- }
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
public Integer getCouponId() {
return couponId;
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
index 64bca7f..b6f456b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
@@ -51,11 +51,12 @@
/**
* 是否勾选了专车 0否1是
*/
- private Integer isPrivateCar;
+// private Integer isPrivateCar;
/**
* 是否勾选了包裹 0否1是
*/
- private Integer isPackage;
+// private Integer isPackage;
+
/**
* 添加时间
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
index c76f88b..865773d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
import java.util.Date;
@@ -11,6 +12,7 @@
* 用户红包记录
*/
@TableName("t_user_red_packet_record")
+@Data
public class UserRedPacketRecord {
/**
* 主键
@@ -23,6 +25,9 @@
*/
@TableField("money")
private Double money;
+ @TableField("remainingAmount")
+
+ private Double remainingAmount;
// /**
// * 过期时间
// */
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
index debd72e..3925f23 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
@@ -34,7 +34,7 @@
void insertOrUpdate(Integer id,String staTime, String startTime, String num1, Double num2
, Double num3
- , Integer num4
+ , String num4
, Double num5
, Integer num6
, Double num7
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java
index 94a73a2..aa0394e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java
@@ -1,7 +1,11 @@
package com.stylefeng.guns.modular.system.service;
+import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -12,5 +16,12 @@
* @since 2020-06-13
*/
public interface ISysRedPacketRecordService extends IService<SysRedPacketRecord> {
+ List<Map<String,Object>> getList(Page<Map<String, Object>> page,
+ String beginTime,
+ String endTime,
+ String userName,
+ String userPhone,
+ Integer couponActivityId,
+ Integer activityType, Integer state);
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java
index 8867c65..30da49d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java
@@ -12,5 +12,6 @@
* @since 2020-06-10
*/
public interface ITSystemNoticeService extends IService<TSystemNotice> {
+ void addSystemNotice(Integer userType, String content, Integer userId) throws Exception;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java
index 03fdca8..3563be8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java
@@ -25,4 +25,11 @@
@Param("companyId") Integer companyId,
@Param("name") String name,
@Param("state") Integer state);
+ /**
+ * 查询小件物流价格设置
+ */
+ List<Map<String,Object>> getSpecialPriceList1(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("state") Integer state);
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
index 370509d..e61dc8c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -52,7 +52,10 @@
}
@Override
- public void insertOrUpdate(Integer id, String staTime, String startTime, String num1, Double num2, Double num3, Integer num4, Double num5, Integer num6, Double num7, Integer num8, Double num9, Integer num10, Double num11,String num12) {
+ public void insertOrUpdate(Integer id, String staTime, String startTime,
+ String num1, Double num2, Double num3, String num4,
+ Double num5, Integer num6, Double num7, Integer num8,
+ Double num9, Integer num10, Double num11,String num12) {
//判断id是否为空，为空执行添加，或者执行修改
if(id==null){
String[] timeArray = startTime.split(" - ");
@@ -69,7 +72,6 @@
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
driverActivity.setEndTime(endTimes);
- driverActivity.setOffline(num12);
driverActivity.insertOrUpdate();
//添加在线活动-专车
DriverActivityOnline driverActivityOnline = new DriverActivityOnline();
@@ -79,8 +81,9 @@
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setInsertTime(nowDay);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
+ driverActivityOnline.setOfflineTime(Double.valueOf(num12));
driverActivityOnline.insertOrUpdate();
// //添加在线活动-出租车
// driverActivityOnline = new DriverActivityOnline();
@@ -152,7 +155,7 @@
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
driverActivity.setEndTime(endTimes);
- driverActivity.setOffline(num12);
+
driverActivity.insertOrUpdate();
//添加在线活动-专车
DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",1));
@@ -165,8 +168,9 @@
driverActivityOnline.setStartTime(startTimes);
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
+ driverActivityOnline.setOfflineTime(Double.valueOf(num12));
driverActivityOnline.insertOrUpdate();
//添加在线活动-出租车
// driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
index f79e94e..23ba07f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
@@ -1,10 +1,14 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
import com.stylefeng.guns.modular.system.dao.SysRedPacketRecordMapper;
import com.stylefeng.guns.modular.system.service.ISysRedPacketRecordService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -16,5 +20,8 @@
*/
@Service
public class SysRedPacketRecordServiceImpl extends ServiceImpl<SysRedPacketRecordMapper, SysRedPacketRecord> implements ISysRedPacketRecordService {
-
+ @Override
+ public List<Map<String, Object>> getList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String userPhone, Integer couponActivityId, Integer activityType, Integer state) {
+ return this.baseMapper.getList(page,beginTime,endTime,userName,userPhone,couponActivityId,activityType,state);
+ }
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
index 55a2301..73b2594 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.Date;
+
/**
* <p>
* 系统通知 服务实现类
@@ -16,5 +18,15 @@
*/
@Service
public class TSystemNoticeServiceImpl extends ServiceImpl<TSystemNoticeMapper, TSystemNotice> implements ITSystemNoticeService {
-
+ @Override
+ public void addSystemNotice(Integer userType, String content, Integer userId) throws Exception {
+ TSystemNotice systemNotice = new TSystemNotice();
+ systemNotice.setContent(content);
+ systemNotice.setInsertTime(new Date());
+ systemNotice.setRead(1);
+ systemNotice.setType(2);
+ systemNotice.setUserId(userId);
+ systemNotice.setUserType(userType);
+ this.insert(systemNotice);
+ }
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
index 06c8caa..7a1903a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
@@ -25,4 +25,8 @@
public List<Map<String, Object>> getSpecialPriceList(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
return this.baseMapper.getSpecialPriceList(page, companyId, name, state);
}
+ @Override
+ public List<Map<String, Object>> getSpecialPriceList1(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
+ return this.baseMapper.getSpecialPriceList1(page, companyId, name, state);
+ }
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/application-test.yml b/ManagementIGOTravel/guns-admin/src/main/resources/application-test.yml
index 1ea3bf1..b74f6c4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/application-test.yml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/application-test.yml
@@ -42,9 +42,9 @@
spring:
datasource:
- url: jdbc:mysql://182.160.16.251:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.110.80:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: HjKbXilb9zajmXbl
+ password: 123456
db-name: igotravel #用来搜集数据库的所有表
filters: wall,mergeStat
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
index 6ce970c..3408304 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
@@ -35,7 +35,7 @@
<input type="text" id="num5" class="form-control newWidth" /> GHS
<br/>
<br/>
- 连续在线 <input type="text" id="num12" class="form-control newWidth" /> 小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
+ 累计在线 <input type="text" id="num12" class="form-control newWidth" /> 小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
<br/>
<br/>
<!--
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
index 4bfe147..a2aecb7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
@@ -55,12 +55,12 @@
name="zc7" class="form-control newWidth" readonly/> GHS
<br/>
<br/>
- 连续在线 <input type="text" @if(isNotEmpty(item.offline)){
- value="${item.offline}"
+ 累计在线 <input type="text" @if(isNotEmpty(online1.offlineTime)){
+ value="${online1.offlineTime}"
@}else{
value=""
@}
- name="num12" class="form-control newWidth" readonly/> 小时奖励
+ name="num12" class="form-control newWidth" readonly/> 小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
<br/>
<!--
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
index 1c12ac6..51f0366 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -56,12 +56,12 @@
name="zc7" id="num5" class="form-control newWidth"/> GHS
<br/>
<br/>
- 连续在线 <input type="text" @if(isNotEmpty(item.offline)){
- value="${item.offline}"
+ 累计在线 <input type="text" @if(isNotEmpty(online1.offlineTime)){
+ value="${online1.offlineTime}"
@}else{
value=""
@}
- name="num12" class="form-control newWidth"/> 小时奖励
+ id="num12" class="form-control newWidth"/> 小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
<br/>
<!--
<br/>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html
index 353e3b3..1ffddb5 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html
@@ -57,14 +57,21 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
- <div class="col-sm-3">
- <#SelectCon id="time" name="时间" >
- <option value="">今日</option>
- <option value="1">今日</option>
- <option value="2">本周</option>
- <option value="3">本月</option>
- <option value="4">全年</option>
- </#SelectCon>
+ <div class="col-sm-3">
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 时间
+ </button>
+ </div>
+ <select class="form-control" id="time" onchange="tradeYse()">
+ <option value="1">今日</option>
+ <option value="2">本周</option>
+ <option value="3">本月</option>
+ <option value="4">全年</option>
+ <option value="5">全部</option>
+ </select>
+ </div>
</div>
<div class="col-sm-3">
<#TimeCon id="insertTime" name="时间" isTime="false"/>
@@ -88,13 +95,13 @@
<h2 id="text1">佣金总额</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png">
<div class="rectangle2">
<h1 id="num2">0</h1>
<br>
<h2 id="text2">司机已结算</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num3">0</h1>
@@ -116,5 +123,22 @@
elem: '#insertTime'
,range: true
});
+ function tradeYse() {
+ var time =document.getElementById("insertTime");
+
+ if ("5" == $("#time").val()){
+ time.value="";
+ time.disabled = false;
+ }else{
+ time.value="";
+ time.disabled = true;
+ }
+ }
+ window.onload = function () {
+ var time =document.getElementById("insertTime");
+ time.value="";
+ time.disabled = true;
+ }
+
</script>
@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html
index b86fb6f..9b9b9e8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html
@@ -18,7 +18,7 @@
margin-right: 40px; /* 设置矩形框之间的间距 */
}
.rectangle2 {
- width: 200px; /* 设置框的宽度 */
+ width: 150px; /* 设置框的宽度 */
height: 130px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
@@ -31,7 +31,7 @@
margin-top: 15px;
}
.rectangle3 {
- width: 200px; /* 设置框的宽度 */
+ width: 150px; /* 设置框的宽度 */
height: 130px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
@@ -59,14 +59,21 @@
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
- <#SelectCon id="time" name="时间" >
- <option value="">今日</option>
- <option value="1">今日</option>
- <option value="2">本周</option>
- <option value="3">本月</option>
- <option value="4">全年</option>
- </#SelectCon>
- </div>
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 时间
+ </button>
+ </div>
+ <select class="form-control" id="time" onchange="tradeYse()">
+ <option value="1">今日</option>
+ <option value="2">本周</option>
+ <option value="3">本月</option>
+ <option value="4">全年</option>
+ <option value="5">全部</option>
+ </select>
+ </div>
+ </div>
<div class="col-sm-3">
<#TimeCon id="insertTime" name="时间" isTime="false"/>
</div>
@@ -99,31 +106,31 @@
<h2 id="text1">第三方流水余额合计</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png">
<div class="rectangle2">
<h1 id="num2">0</h1>
<br>
<h2 id="text2">用户订单消费</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num3">0</h1>
<br>
<h2 id="text3">用户充值总额</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num4">0</h1>
<br>
<h2 id="text4">司机结算总额</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png">
<div class="rectangle3">
<h1 id="num5">0</h1>
<br>
<h2 id="text5">司机提现总额</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png">
<div class="rectangle3">
<h1 id="num6">0</h1>
<br>
@@ -143,5 +150,21 @@
elem: '#insertTime'
,range: true
});
+ function tradeYse() {
+ var time =document.getElementById("insertTime");
+
+ if ("5" == $("#time").val()){
+ time.value="";
+ time.disabled = false;
+ }else{
+ time.value="";
+ time.disabled = true;
+ }
+ }
+ window.onload = function () {
+ var time =document.getElementById("insertTime");
+ time.value="";
+ time.disabled = true;
+ }
</script>
@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/settlementAllocation/settlementAllocation.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/settlementAllocation/settlementAllocation.html
index 67e730d..3c22c05 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/settlementAllocation/settlementAllocation.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/settlementAllocation/settlementAllocation.html
@@ -16,7 +16,7 @@
</div>
<div class="form-group">
<input type="radio" name="type" value="2" ${null != item && item.type == '2' ? 'checked' : ''}> 每周
- 每周 <input type="number" min="1" max="7" class="date" value="${null != item && item.type == '2' ? item.day : ''}" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"/> 可结算
+ 每周 <input type="number" min="1" max="7" class="date" value="${null != item && item.type == '2' ? item.day : ''}" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"/> (几)可结算
</div>
<div class="form-group">
每天超过 <input type="number" min="1" max="31" id="maxPrice" value="${null != item ? item.maxPrice : ''}" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"/> 必须结算
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
index 134a23a..dff9e66 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
@@ -59,14 +59,21 @@
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
- <#SelectCon id="time" name="时间" >
- <option value="">今日</option>
- <option value="1">今日</option>
- <option value="2">本周</option>
- <option value="3">本月</option>
- <option value="4">全年</option>
- </#SelectCon>
- </div>
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 时间
+ </button>
+ </div>
+ <select class="form-control" id="time" onchange="tradeYse()">
+ <option value="1">今日</option>
+ <option value="2">本周</option>
+ <option value="3">本月</option>
+ <option value="4">全年</option>
+ <option value="5">全部</option>
+ </select>
+ </div>
+ </div>
<div class="col-sm-3">
<#TimeCon id="insertTime" name="时间" isTime="false"/>
</div>
@@ -91,25 +98,25 @@
<h2 id="text1">已发放补贴总额</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png">
<div class="rectangle2">
<h1 id="num2">0</h1>
<br>
<h2 id="text2">已使用折扣总额(用户端)</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num3">0</h1>
<br>
<h2 id="text3">已领取红包总额(用户端)</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num4">0</h1>
<br>
<h2 id="text4">已领取优惠券总额(用户端)</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num5">0</h1>
<br>
@@ -131,5 +138,21 @@
elem: '#insertTime'
,range: true
});
+ function tradeYse() {
+ var time =document.getElementById("insertTime");
+
+ if ("5" == $("#time").val()){
+ time.value="";
+ time.disabled = false;
+ }else{
+ time.value="";
+ time.disabled = true;
+ }
+ }
+ window.onload = function () {
+ var time =document.getElementById("insertTime");
+ time.value="";
+ time.disabled = true;
+ }
</script>
@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
index 7b1d5bf..9080281 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
@@ -65,20 +65,28 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>三方流水统计</h5>
+ <h5>使用补贴统计</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
- <#SelectCon id="time" name="时间" >
- <option value="1">今日</option>
- <option value="2">本周</option>
- <option value="3">本月</option>
- <option value="4">全年</option>
- </#SelectCon>
- </div>
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 时间
+ </button>
+ </div>
+ <select class="form-control" id="time" onchange="tradeYse()">
+ <option value="1">今日</option>
+ <option value="2">本周</option>
+ <option value="3">本月</option>
+ <option value="4">全年</option>
+ <option value="5">全部</option>
+ </select>
+ </div>
+ </div>
<div class="col-sm-3">
<#TimeCon id="insertTime" name="时间" isTime="false"/>
</div>
@@ -103,25 +111,25 @@
<h2 id="text1">已使用补贴总额</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png">
<div class="rectangle2">
<h1 id="num2">0</h1>
<br>
<h2 id="text2">已使用折扣总额(用户端)</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num3">0</h1>
<br>
<h2 id="text3">已使用红包总额(用户端)</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
<h1 id="num4">0</h1>
<br>
<h2 id="text4">已使用优惠券总额(用户端)</h2>
</div>
- <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png.">
+ <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png">
<div class="rectangle4">
<h1 id="num5">0</h1>
<br>
@@ -149,5 +157,21 @@
elem: '#insertTime'
,range: true
});
+ function tradeYse() {
+ var time =document.getElementById("insertTime");
+
+ if ("5" == $("#time").val()){
+ time.value="";
+ time.disabled = false;
+ }else{
+ time.value="";
+ time.disabled = true;
+ }
+ }
+ window.onload = function () {
+ var time =document.getElementById("insertTime");
+ time.value="";
+ time.disabled = true;
+ }
</script>
@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
index f081a85..866528d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
@@ -20,7 +20,8 @@
<div class="hidden-xs" id="SysRedPacketRecordTableToolbar" role="group">
@if(shiro.hasPermission("/sysRedPacketRecord/add")){
<#button name="添加" icon="fa-plus" clickFun="SysRedPacketRecord.openAddSysRedPacketRecord()"/>
- <#button name="指定派发" icon="fa-plus" clickFun="SysRedPacketRecord.userList()"/>
+ <#button name="领取记录" icon="fa-remove" clickFun="SysRedPacketRecord.userCouponRecord()" space="true"/>
+ <#button name="指定派发" icon="fa-plus" clickFun="SysRedPacketRecord.userList()"/>
@}
@if(shiro.hasPermission("/sysRedPacketRecord/update")){
<#button name="修改" icon="fa-edit" clickFun="SysRedPacketRecord.openSysRedPacketRecordDetail()" space="true"/>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html
index 44f02c6..e30ff9b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html
@@ -47,12 +47,12 @@
</div>
</div>
<div class="col-sm-12">
- <div class="form-group">
- <label class="col-sm-2 control-label">有效天数</label>
- <div class="col-sm-5">
- <input id="effective" style="width: 170px;height: 35px;"> 天
- </div>
- </div>
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-2 control-label">有效天数</label>-->
+<!-- <div class="col-sm-5">-->
+<!-- <input id="effective" style="width: 170px;height: 35px;"> 天-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html
index 7aa0ebb..7f4a6a5 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html
@@ -52,7 +52,7 @@
<div style="display: flex; justify-content: center;">
<button type="button" class="btn btn-primary button-margin" onclick="TUser.freezeUser()" id="">
- <i class="fa fa-remove"></i> 冻结
+ <i class="fa fa-remove"></i> 派发
</button>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/userRedRecord.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/userRedRecord.html
new file mode 100644
index 0000000..aeeb4dc
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/userRedRecord.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <input type="hidden" id="activityType" value="${activityType}">
+ <input type="hidden" id="couponActivityId" value="${couponActivityId}">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="领取人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="领取人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未使用</option>
+ <option value="2">已使用</option>
+<!-- <option value="3">已过期</option>-->
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="UserCouponRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="UserCouponRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="UserCouponRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/userCouponRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="UserCouponRecord.openAddUserCouponRecord()"/>
+ @}
+ @if(shiro.hasPermission("/userCouponRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="UserCouponRecord.openUserCouponRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userCouponRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="UserCouponRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="UserCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/userRedRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html
index c9e54e9..fa44bf8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html
@@ -11,6 +11,7 @@
<div class="row row-lg">
<div class="col-sm-12">
<input type="hidden" id="id" value="${one.id}">
+ <input type="hidden" id="id1" value="${two.id}">
<div class="tabs-container">
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">常见问题设置</a></li>
@@ -27,7 +28,10 @@
</div>
</div>
<div class="panel-body" style="padding-top: 60px;">
+ <span>用户端：</span>
<textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <span>司机端：</span>
+ <textarea id="editor_2" type="text/plain" style="width:1200px;height:400px;">${two.content}</textarea>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
<#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
@@ -50,6 +54,7 @@
$(function () {
//初始化编辑器
editor_1 = UE.getEditor('editor_1');
+ editor_2 = UE.getEditor('editor_2');
$('#language').on('change', function () {
var ajax = new $ax(Feng.ctxPath + "/tAgreement/getAgreement", function(data){
@@ -62,6 +67,18 @@
ajax.set("type", 12);
ajax.set("useType", 1);
ajax.start();
+
+
+ var ajax1 = new $ax(Feng.ctxPath + "/tAgreement/getAgreement", function(data){
+ editor_2.setContent(data.content);
+ $('#id1').val(data.id);
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax1.set("language", $(this).val());
+ ajax1.set("type", 12);
+ ajax1.set("useType", 2);
+ ajax1.start();
})
});
@@ -70,10 +87,14 @@
Feng.error("内容不能为空!");
return;
}
- submitData(editor_1.getContent(), $('#id').val());
+ if (editor_2.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(), $('#id').val(),editor_2.getContent(), $('#id1').val());
}
- function submitData(content,id) {
+ function submitData(content,id,content1,id1) {
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
Feng.success("编辑成功!");
@@ -82,6 +103,8 @@
});
ajax.set("context", content);
ajax.set("id", id);
+ ajax.set("context1", content1);
+ ajax.set("id1", id1);
ajax.start();
}
</script>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
index 077f467..37d0f09 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
@@ -19,7 +19,7 @@
<div class="tab-content">
<div id="tab-1" class="tab-pane active">
<input type="hidden" id="id1" value="${one.id}">
- <div class="col-sm-3" style="padding-top: 10px;display: none;">
+ <div class="col-sm-3" style="padding-top: 10px;">
<div class="input-group" style="width: 100%;">
<select class="form-control" id="language1">
<option value="1">中文</option>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html
index c88eace..a07e967 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html
@@ -19,7 +19,7 @@
<div class="tab-content">
<div id="tab-1" class="tab-pane active">
<input type="hidden" id="id1" value="${one.id}">
- <div class="col-sm-3" style="padding-top: 10px;display: none;">
+ <div class="col-sm-3" style="padding-top: 10px;">
<div class="input-group" style="width: 100%;">
<select class="form-control" id="language1">
<option value="1">中文</option>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
index 53bec87..79b900e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
@@ -11,11 +11,13 @@
<div class="row row-lg">
<div class="col-sm-12">
<input type="hidden" id="id" value="${one.id}">
+ <input type="hidden" id="id1" value="${two.id}">
<div class="tabs-container">
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">用户指南设置</a></li>
</ul>
<div class="tab-content">
+
<div id="tab-1" class="tab-pane active">
<div class="col-sm-3" style="padding-top: 10px;">
<div class="input-group" style="width: 100%;">
@@ -26,8 +28,16 @@
</select>
</div>
</div>
+
+
<div class="panel-body" style="padding-top: 60px;">
- <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <span>用户端：</span>
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content!}</textarea>
+ <br>
+ <br>
+ <br>
+ <span>司机端：</span>
+ <textarea id="editor_2" type="text/plain" style="width:1200px;height:400px;">${two.content!}</textarea>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
<#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
@@ -38,6 +48,8 @@
</div>
</div>
+
+
</div>
</div>
</div>
@@ -47,9 +59,11 @@
<script type="text/javascript">
var editor_1 = null;
+ var editor_2 = null;
$(function () {
//初始化编辑器
editor_1 = UE.getEditor('editor_1');
+ editor_2 = UE.getEditor('editor_2');
$('#language').on('change', function () {
var ajax = new $ax(Feng.ctxPath + "/tAgreement/getAgreement", function(data){
@@ -64,6 +78,19 @@
ajax.set("type", 3);
ajax.set("useType", 1);
ajax.start();
+
+ var ajax1 = new $ax(Feng.ctxPath + "/tAgreement/getAgreement", function(data){
+ if(null != data){
+ editor_2.setContent(data.content);
+ $('#id1').val(data.id);
+ }
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax1.set("language", $(this).val());
+ ajax1.set("type", 3);
+ ajax1.set("useType", 2);
+ ajax1.start();
})
});
@@ -72,10 +99,10 @@
Feng.error("内容不能为空!");
return;
}
- submitData(editor_1.getContent(), $('#id').val());
+ submitData(editor_1.getContent(), $('#id').val(),editor_2.getContent(), $('#id1').val());
}
- function submitData(content,id) {
+ function submitData(content,id,content1,id1) {
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
Feng.success("编辑成功!");
@@ -83,7 +110,9 @@
Feng.error("编辑失败!" + data.responseJSON.message + "!");
});
ajax.set("context", content);
+ ajax.set("context1", content1);
ajax.set("id", id);
+ ajax.set("id1", id1);
ajax.start();
}
</script>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
index 197d86b..d3b93ed 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -58,7 +58,7 @@
<label for="serverBox3"> 跨城出行 </label>
</div>-->
<div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4">
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4" onclick="TCarInfoDlg.xjServerClick()">
<label for="serverBox4"> 市内小件物流 </label>
</div><!--
<div class="checkbox checkbox-success checkbox-inline">
@@ -83,6 +83,17 @@
</select>
</div>
</div>
+ <div class="form-group" style="display: none;" id="xjModelDiv">
+ <label class="col-sm-3 control-label">市内小件物流车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="xjModel" name="xjModel">
+ <option value="">选择车型</option>
+ @for(obj in xjModelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
<!--
<div class="form-group" style="display: none;" id="kcModelDiv">
<label class="col-sm-3 control-label">跨城出行车型：</label>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_auth.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_auth.html
index c67aad8..e1ee362 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_auth.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_auth.html
@@ -12,7 +12,7 @@
<label for="serverBox1"> 专车 </label>
</div>
<div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${4 == four ? 'checked=checked' : ''} onclick="TCarInfoDlg.xjServerClick()">
<label for="serverBox4"> 市内小件物流 </label>
</div>
</div>
@@ -25,6 +25,17 @@
<option value="">选择车型</option>
@for(obj in zcModelList){
<option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" style="display: none;" id="xjModelDiv">
+ <label class="col-sm-3 control-label">市内小件物流车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="xjModel" name="xjModel">
+ <option value="">选择车型</option>
+ @for(obj in xjModelList){
+ <option value="${obj.id}"${obj.id == xjModel ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -94,6 +105,7 @@
TCarInfoDlg.zcServerClick();
TCarInfoDlg.kcServerClick();
+ TCarInfoDlg.xjServerClick();
});
</script>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
index fe1659d..47a2d43 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -60,7 +60,7 @@
<label for="serverBox3"> 跨城出行 </label>
</div>-->
<div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${4 == four ? 'checked=checked' : ''} onclick="TCarInfoDlg.xjServerClick()">
<label for="serverBox4"> 市内小件物流 </label>
</div><!--
<div class="checkbox checkbox-success checkbox-inline">
@@ -81,6 +81,17 @@
<option value="">选择车型</option>
@for(obj in zcModelList){
<option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" style="display: none;" id="xjModelDiv">
+ <label class="col-sm-3 control-label">市内小件物流车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="xjModel" name="xjModel">
+ <option value="">选择车型</option>
+ @for(obj in xjModelList){
+ <option value="${obj.id}" ${obj.id == xjModel ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -209,7 +220,7 @@
}
TCarInfoDlg.zcServerClick();
- TCarInfoDlg.kcServerClick();
+ TCarInfoDlg.xjServerClick();
});
</script>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index dbe1fa2..adf6a26 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -77,8 +77,8 @@
<fieldset>
<label class="col-sm-3 control-label">经营业务：</label>
<div class="col-sm-9">
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox1" value="1">
+ <div class="checkbox checkbox-success checkbox-inline" >
+ <input type="checkbox" name="serverBox" id="serverBox1" value="1">
<label for="serverBox1"> 专车 </label>
</div><!--
<div class="checkbox checkbox-success checkbox-inline">
@@ -89,8 +89,8 @@
<input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" >
<label for="serverBox3"> 跨城出行 </label>
</div>-->
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4">
+ <div class="checkbox checkbox-success checkbox-inline" >
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4">
<label for="serverBox4"> 市内小件物流 </label>
</div><!--
<div class="checkbox checkbox-success checkbox-inline">
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
index 0d7ea20..cece345 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>专车车型设置管理</h5>
+ <h5>车型设置管理</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
index f21118d..0bfaa36 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
@@ -15,14 +15,14 @@
<div class="col-sm-9">
<fieldset>
<div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox1" type="checkbox" value="1" >
+ <input name="radio1" id="checkbox1" type="radio" value="4" >
<label for="checkbox1">
包裹
</label>
</div>
<div class="checkbox checkbox-info">
- <input name="checkbox" id="checkbox4" type="checkbox" value="4" >
+ <input name="radio1" checked id="checkbox4" type="radio" value="1" >
<label for="checkbox4">
专车
</label>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
index 5464944..32b0663 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
@@ -15,14 +15,14 @@
<div class="col-sm-9">
<fieldset>
<div class="checkbox checkbox-success">
- <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == data.isPackage ? 'checked=checked' : ''} >
+ <input name="radio1" id="checkbox1" type="radio" value="4" ${4 == data.type ? 'checked=checked' : ''} >
<label for="checkbox1">
包裹
</label>
</div>
<div class="checkbox checkbox-info">
- <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == data.isPrivateCar ? 'checked=checked' : ''} >
+ <input name="radio1" id="checkbox4" type="radio" value="1" ${1 == data.type ? 'checked=checked' : ''} >
<label for="checkbox4">
专车
</label>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetAdd.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetAdd.html
index 761c71f..24ca245 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetAdd.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetAdd.html
@@ -13,7 +13,7 @@
<div class="form-group" >
<label class="col-sm-3 control-label">红包可抵扣比例：</label>
<div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" class="form-control" id="proportion" name="proportion" placeholder="请输入红包可抵扣比例" type="text">
+ <input style="width: 300px" class="form-control" id="proportion" name="proportion" placeholder="请输入红包可抵扣比例" type="number">
<span id="priceLabel1" style="margin-left: 5px;margin-top: 5px">%</span>
</div>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html
index 1986aec..71d4bb6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html
@@ -14,7 +14,7 @@
<div class="form-group" >
<label class="col-sm-3 control-label">红包可抵扣比例：</label>
<div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" class="form-control" id="proportion" value="${data.deductionRatio}" name="proportion" placeholder="请输入红包可抵扣比例" type="text">
+ <input style="width: 300px" class="form-control" id="proportion" value="${data.deductionRatio}" name="proportion" placeholder="请输入红包可抵扣比例" type="number">
<span id="priceLabel1" style="margin-left: 5px;margin-top: 5px">%</span>
</div>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index 258d15d..a7022e8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -340,7 +340,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">预约订单取消规则：</label>
<div class="col-sm-10">
- 订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ 预约订单在预约时间前 <input type="text" oninput="checkIsInt(this)"
@if(isNotEmpty(orderAcceptanceTime1)){
value="${orderAcceptanceTime1}"
@}else{
@@ -353,7 +353,7 @@
@}else{
value=""
@}
- name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
+ name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> GHS取消费用；
里程费 <input type="text" oninput="checkIsDouble(this)"
@if(isNotEmpty(mileageFee1)){
value="${mileageFee1}"
@@ -513,14 +513,16 @@
}
}
- var regDouble = /^[0-9]\d*(\.\d*[0-9])?$/;
+ var regDouble = /^\d+(\.\d{1,2})?$/;
function checkIsDouble(obj){
var num = $(obj).val();
+ console.log("看看数字");
+ console.log(num)
if(!regDouble.test(num)){
- layer.msg("小数/正整数格式");
+ console.log("进入")
+ layer.msg("小数不超过两位/正整数格式");
}
}
-
//验证是否输入正整数
var regInt = /^[0-9]\d*$/;
function checkIsInt(obj){
@@ -605,6 +607,8 @@
var reserveTime = $('#reserveTime').val().trim();
var reserveNext = $('#reserveNext').val().trim();
+ console.log("提交")
+ console.log(ptCancel2)
if ("" == one || "" == two || "" == three
|| "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
|| '' == zcAssignOrder || '' == zcPeople
@@ -635,8 +639,10 @@
|| !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)/* || !regDouble.test(czcAssignOrder) || !regInt.test(czcPeople)*/
|| !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4)|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
- || !regInt.test(km) || !regInt.test(km2)
+ || !regDouble.test(km) || !regDouble.test(km2)
+ || !regDouble.test(kmMinute) || !regDouble.test(kmMinute2)
|| !regDouble.test(reserveMoney)
+ || !regDouble.test(yyCancel2)
/*|| !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)*/) {
Feng.info("格式不正确!");
return ;
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_add.html
index 5b03ee4..e81ccaa 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_add.html
@@ -102,7 +102,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">高峰期费用设置：</label>
<div class="col-sm-10">
- <input type="text" name="num23" id="num23" class="form-control newWidth" placeholder="选择时间段"/>
+ <input type="text" name="num23" id="num23" oninput="checkDate(this)" class="form-control newWidth" placeholder="选择时间段"/>
和 <input type="text" name="num24" id="num24" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/> 元
<br>
@@ -160,6 +160,11 @@
layer.msg("【元】输入框不能超过3位数,保留两位小数");
}
}
+
+ function checkDate(obj){
+ var num = $(obj).val();
+
+ }
function checkIsGongLi(obj){
var num = $(obj).val();
if(!regDouble.test(num)){
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
index 3d98984..1e25ac3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
@@ -26,7 +26,7 @@
</div>
<div class="hidden-xs" id="TSystemPriceTableToolbar" role="group">
@if(shiro.hasPermission("/tSystemPrice/addSpecial")){
- <#button name="添加" icon="fa-plus" clickFun="TSystemPrice.addSpecial()"/>
+ <#button name="添加" icon="fa-plus" clickFun="TSystemPrice.addSpecial1()"/>
@}
@if(shiro.hasPermission("/tSystemPrice/updateSpecial")){
<#button name="修改" icon="fa-edit" clickFun="TSystemPrice.updateSpecial()" space="true"/>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
index 15d42c1..bb5c7d7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
@@ -239,11 +239,6 @@
每个红包金额： <input type="text" name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
<br/>
<br/>
- 有效期：
-
- <input type="text" name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天
- <br/>
- <br/>
最高金额： <input type="text" name="zc1" id="content6Num5" class="form-control newWidth" />
<br/>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
index d810a8c..ea6946d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
@@ -427,16 +427,7 @@
name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
<br/>
<br/>
- 有效期：
-
- <input type="text"
- @if(isNotEmpty(item5Red)){
- value="${item5Red.effective}"
- @}else{
- value=""
- @}
- name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天，
最高金额： <input type="text"
@if(isNotEmpty(item5)){
value="${item5.totalPrice}"
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
index 4d5b517..2dffc61 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
@@ -440,16 +440,7 @@
name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
<br/>
<br/>
- 有效期：
-
- <input type="text"
- @if(isNotEmpty(item5Red)){
- value="${item5Red.effective}"
- @}else{
- value=""
- @}
- name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天
最高金额： <input type="text"
@if(isNotEmpty(item5)){
value="${item5.totalPrice}"
@@ -463,6 +454,7 @@
</div>
</div>
</div>
+ </div>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/img/=.png b/ManagementIGOTravel/guns-admin/src/main/webapp/static/img/dengyu.png
similarity index 100%
rename from ManagementIGOTravel/guns-admin/src/main/webapp/static/img/=.png
rename to ManagementIGOTravel/guns-admin/src/main/webapp/static/img/dengyu.png
Binary files differ
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/img/+.png b/ManagementIGOTravel/guns-admin/src/main/webapp/static/img/jiahao.png
similarity index 100%
rename from ManagementIGOTravel/guns-admin/src/main/webapp/static/img/+.png
rename to ManagementIGOTravel/guns-admin/src/main/webapp/static/img/jiahao.png
Binary files differ
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/img/-.png b/ManagementIGOTravel/guns-admin/src/main/webapp/static/img/jianhao.png
similarity index 100%
rename from ManagementIGOTravel/guns-admin/src/main/webapp/static/img/-.png
rename to ManagementIGOTravel/guns-admin/src/main/webapp/static/img/jianhao.png
Binary files differ
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
index ee9f4c6..6f6d33a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
@@ -69,6 +69,7 @@
return;
}
var re = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
+ var re1 = /^\d+(\.\d{1,2})?$/;
if (!re.test($("#num2").val())) {
Feng.error("请输入正确金额数!");
return;
@@ -82,7 +83,7 @@
Feng.error("请输入正确金额数!");
return;
}
- if (!re.test($("#num12").val())) {
+ if (!re1.test($("#num12").val())) {
Feng.error("请输入正确小时数!");
return;
}
@@ -99,7 +100,7 @@
return;
}
- if (!/^[1-9]\d*$/.test($("#num4").val())) {
+ if (!re1.test($("#num4").val())) {
Feng.error("请输入正确小时数!");
return;
}
@@ -196,6 +197,7 @@
return;
}
var re = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
+ var re1 = /^\d+(\.\d{1,2})?$/;
if (!re.test($("#num2").val())) {
Feng.error("请输入正确金额数!");
return;
@@ -209,7 +211,9 @@
Feng.error("请输入正确金额数!");
return;
}
- if (!re.test($("#num12").val())) {
+ if (!re1.test($("#num12").val())) {
+ console.log("11111")
+ console.log($("#num12").val())
Feng.error("请输入正确小时数!");
return;
}
@@ -226,7 +230,9 @@
return;
}
- if (!/^[1-9]\d*$/.test($("#num4").val())) {
+ if (!re1.test($("#num4").val())) {
+ console.log("2222")
+ console.log($("#num4").val())
Feng.error("请输入正确小时数!");
return;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
index 34c54e6..187d1ca 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
@@ -237,7 +237,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("");
+ $("#time").val("1");
$("#insertTime").val("");
$("#state").val("");
TUser.search();
@@ -251,7 +251,17 @@
table.setPaginationType("client");
TUser.table = table.init();
});
+TUser.tradeYse = function () {
+ var time =document.getElementById("insertTime");
+ if ("" == $("#time").val()){
+ time.value="";
+ time.disabled = true;
+ }else{
+ bTime.value="";
+ bTime.disabled = false;
+ }
+};
TUser.sendAjaxRequest = function(url,type,data){
$.ajax({
url : url,
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
index 33879c8..622b38f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
@@ -229,7 +229,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("");
+ $("#time").val("1");
$("#insertTime").val("");
$("#type").val("");
$("#payType").val("");
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/settlementAllocation/settlementAllocation.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/settlementAllocation/settlementAllocation.js
index 00dcfbe..7b45044 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/settlementAllocation/settlementAllocation.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/settlementAllocation/settlementAllocation.js
@@ -72,10 +72,10 @@
return
}
let maxPrice = $('#maxPrice').val();
- if('' == maxPrice || null == maxPrice){
- Feng.error("请输入每日结算金额")
- return
- }
+ // if('' == maxPrice || null == maxPrice){
+ // Feng.error("请输入每日结算金额")
+ // return
+ // }
let json = {
type: $(type).val(),
day: day,
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
index 4ff9f88..3a73cdf 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
@@ -212,7 +212,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("");
+ $("#time").val("1");
$("#insertTime").val("");
$("#type").val("");
TUser.search();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
index 0cc5b03..64b7301 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
@@ -23,7 +23,7 @@
{field: 'selectItem', radio: true},
{title: '领取时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '补贴类型', field: 'type', visible: true, align: 'center', valign: 'middle'},
- {title: '金额', field: 'amount', visible: false, align: 'center', valign: 'middle'},
+ {title: '金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
{title: '领取用户id', field: 'name', visible: true, align: 'center', valign: 'middle',},
{title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle',},
];
@@ -216,7 +216,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("");
+ $("#time").val("1");
$("#insertTime").val("");
$("#type").val("");
TUser.search();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js
index 29a9b55..5e68afa 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js
@@ -84,6 +84,20 @@
this.layerIndex = index;
};
+SysRedPacketRecord.userCouponRecord= function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/sysRedPacketRecord/redRecord?activityType=1&couponActivityId='+ SysRedPacketRecord.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
/**
* 打开查看详情
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js
index 0bc4999..6ab052b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js
@@ -158,10 +158,10 @@
return;
}
}
- if (!/^[1-9]\d*$/.test($("#effective").val())) {
- Feng.error("请输入正确天数!");
- return;
- }
+ // if (!/^[1-9]\d*$/.test($("#effective").val())) {
+ // Feng.error("请输入正确天数!");
+ // return;
+ // }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/sysRedPacketRecord/add", function(data){
Feng.success("添加成功!");
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
index b60a349..bafd08f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
@@ -263,8 +263,14 @@
// TUser.close();
var ajax = new $ax(Feng.ctxPath + "/sysRedPacketRecord/direct", function(data){
- Feng.success("派发成功!");
+
+ if (data.code!=500){
+
+ Feng.success(data.msg);
TUser.close();
+ }else {
+ Feng.error(data.msg);
+ }
},function(data){
Feng.error("派发失败!" + data.responseJSON.message + "!");
});
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/userRedRecord.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/userRedRecord.js
new file mode 100644
index 0000000..9ae4a5b
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/userRedRecord.js
@@ -0,0 +1,146 @@
+/**
+ * 管理初始化
+ */
+var UserCouponRecord = {
+ id: "UserCouponRecordTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1
+};
+
+/**
+ * 初始化表格的列
+ */
+UserCouponRecord.initColumn = function () {
+ return [
+ {title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '领取时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '领取人', field: 'nickName', visible: true, align: 'center', valign: 'middle'},
+ {title: '领取人电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
+ {title: '领取金额', field: 'money', visible: true, align: 'center', valign: 'middle'},
+ // {title: '领取类型', field: 'couponUseType', visible: true, align: 'center', valign: 'middle',
+ // formatter: function (value, row) {
+ // if(value==0){
+ // return "通用优惠券";
+ // }else if(value==1){
+ // return "打车优惠券";
+ // }else if(value==2){
+ // return "出租券";
+ // }else if(value==4){
+ // return "包裹优惠券";
+ // }else{
+ // return "";
+ // }
+ // }
+ // } ,
+ {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if(value==1){
+ return "未使用";
+ }else if(value==2){
+ return "已使用";
+ }else if(value==3){
+ return "已过期";
+ }else{
+ return "";
+ }
+ }
+ }
+ // ,
+ // {title: '使用时间', field: 'useTime', visible: true, align: 'center', valign: 'middle'}
+ ];
+};
+
+/**
+ * 检查是否选中
+ */
+UserCouponRecord.check = function () {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length == 0){
+ Feng.info("请先选中表格中的某一记录！");
+ return false;
+ }else{
+ UserCouponRecord.seItem = selected[0];
+ return true;
+ }
+};
+
+/**
+ * 点击添加
+ */
+UserCouponRecord.openAddUserCouponRecord = function () {
+ var index = layer.open({
+ type: 2,
+ title: '添加',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord/userCouponRecord_add'
+ });
+ this.layerIndex = index;
+};
+
+/**
+ * 打开查看详情
+ */
+UserCouponRecord.openUserCouponRecordDetail = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord/userCouponRecord_update/' + UserCouponRecord.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+/**
+ * 删除
+ */
+UserCouponRecord.delete = function () {
+ if (this.check()) {
+ var ajax = new $ax(Feng.ctxPath + "/userCouponRecord/delete", function (data) {
+ Feng.success("删除成功!");
+ UserCouponRecord.table.refresh();
+ }, function (data) {
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("userCouponRecordId",this.seItem.id);
+ ajax.start();
+ }
+};
+
+/**
+ * 查询列表
+ */
+UserCouponRecord.search = function () {
+ var queryData = {};
+ queryData['createTime'] = $("#createTime").val();
+ queryData['activityType'] = $("#activityType").val();
+ queryData['couponActivityId'] = $("#couponActivityId").val();
+ queryData['userName'] = $("#userName").val();
+ queryData['userPhone'] = $("#userPhone").val();
+ queryData['state'] = $("#state").val();
+ UserCouponRecord.table.refresh({query: queryData});
+};
+UserCouponRecord.resetSearch = function () {
+ $("#createTime").val("");
+ $("#userName").val("");
+ $("#userPhone").val("");
+ $("#state").val("");
+ UserCouponRecord.search();
+};
+$(function () {
+ var defaultColunms = UserCouponRecord.initColumn();
+ var table = new BSTable(UserCouponRecord.id, "/sysRedPacketRecord/user/list", defaultColunms);
+ table.setPaginationType("server");
+ var queryData = {};
+ queryData['createTime'] = $("#createTime").val();
+ queryData['activityType'] = $("#activityType").val();
+ queryData['couponActivityId'] = $("#couponActivityId").val();
+ table.setQueryParams(queryData);
+ UserCouponRecord.table = table.init();
+});
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
index b87a3fe..c0e3745 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
@@ -374,6 +374,7 @@
ajax.set(this.tCarInfoData);
ajax.set("serverBox",serverBox.toString());
ajax.set("zcModel",$("#zcModel").val());
+ ajax.set("xjModel",$("#xjModel").val());
ajax.set("kcModel",$("#kcModel").val());
ajax.set("roleType",roleType);
if (1 == roleType){
@@ -446,6 +447,7 @@
ajax.set("serverBox",serverBox.toString());
ajax.set("zcModel",$("#zcModel").val());
ajax.set("kcModel",$("#kcModel").val());
+ ajax.set("xjModel",$("#xjModel").val());
ajax.set("roleType",roleType);
if (1 == roleType){
ajax.set("companyType",companyType);
@@ -566,6 +568,17 @@
$("#zcModelDiv").hide();
}
}
+/**
+ * 小件物流服务被点击
+ */
+TCarInfoDlg.xjServerClick = function () {
+ var serverBox1 = $('#serverBox4').prop('checked');
+ if (serverBox1){
+ $("#xjModelDiv").show();
+ } else {
+ $("#xjModelDiv").hide();
+ }
+}
/**
* 跨城服务被点击
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
index 6b48130..df5ad1e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
@@ -339,8 +339,8 @@
}
TOrderPrivateCar.frozenOrder = function(){
if (this.check()) {
- if (TOrderPrivateCar.seItem.state != 8 && TOrderPrivateCar.seItem.state != 9 ) {
- swal("操作失败", "【已完成】状态下才能执行此操作", "warning");
+ if (TOrderPrivateCar.seItem.state != 5 ) {
+ swal("操作失败", "【服务中】状态下才能执行此操作", "warning");
return;
}else{
var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/frozenOrder", function (data) {
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js
index 178d026..353db6c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js
@@ -80,7 +80,7 @@
TServerCarmodel.openAddTServerCarmodel = function () {
var index = layer.open({
type: 2,
- title: '添加专车车型设置',
+ title: '添加车型设置',
area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -93,7 +93,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: '修改专车车型设置',
+ title: '修改车型设置',
area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js
index 6386169..d3a042d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js
@@ -85,15 +85,24 @@
if(!this.validate()){
return ;
}
- var checkbox1 = $('#checkbox1').prop('checked');
- var checkbox4 = $('#checkbox4').prop('checked');
- var temp = 0;
- var temp1 = 0;
- if (checkbox1){
- temp = 1;
+ var temp =1;
+ var radioButtons = document.getElementsByName('radio1');
+ // 遍历单选按钮
+ for (var i = 0; i < radioButtons.length; i++) {
+ // 检查哪个单选按钮被选中
+ if (radioButtons[i].checked) {
+ // 输出选中的单选按钮的值
+ console.log("选中的值是: " + radioButtons[i].value);
+ // 或者做其他处理，比如将选中的值赋给一个变量
+ var selectedValue = radioButtons[i].value;
+ temp = radioButtons[i].value;
+ }
}
- if (checkbox4){
- temp1 = 1;
+ console.log("车型图片")
+ console.log($("#img").val())
+ if ("" == $("#img").val()){
+ Feng.error("请上传车型图片");
+ return;
}
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tServerCarmodel/add", function(data){
@@ -109,8 +118,8 @@
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.tServerCarmodelInfoData);
- ajax.set("isPrivateCar",temp1);
- ajax.set("isPackage",temp);
+
+ ajax.set("isPrivateCar",temp);
ajax.start();
}
@@ -121,16 +130,20 @@
this.clearData();
this.collectData();
- var checkbox1 = $('#checkbox1').prop('checked');
- var checkbox4 = $('#checkbox4').prop('checked');
- var temp = 0;
- var temp1 = 0;
- if (checkbox1){
- temp = 1;
+ var temp =1;
+ var radioButtons = document.getElementsByName('radio1');
+ // 遍历单选按钮
+ for (var i = 0; i < radioButtons.length; i++) {
+ // 检查哪个单选按钮被选中
+ if (radioButtons[i].checked) {
+ // 输出选中的单选按钮的值
+ console.log("选中的值是: " + radioButtons[i].value);
+ // 或者做其他处理，比如将选中的值赋给一个变量
+ var selectedValue = radioButtons[i].value;
+ temp = radioButtons[i].value;
+ }
}
- if (checkbox4){
- temp1 = 1;
- }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tServerCarmodel/update", function(data){
Feng.success("修改成功!");
@@ -140,8 +153,8 @@
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(this.tServerCarmodelInfoData);
- ajax.set("isPrivateCar",temp1);
- ajax.set("isPackage",temp);
+ ajax.set("isPrivateCar",temp);
+
ajax.start();
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
index ea7f157..ee4a82d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
@@ -66,7 +66,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: '编辑跨城站点',
+ title: '编辑红包支付设置',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSetInfo.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSetInfo.js
index f8a962a..584d803 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSetInfo.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSetInfo.js
@@ -14,6 +14,10 @@
Feng.info("请输入可红包抵扣比例");
return;
}
+ if (proportion>100){
+ Feng.info("红包抵扣比例不能大于100");
+ return;
+ }
var startTime = $("#startTime").val();
if ("" == startTime){
Feng.info("请选择生效时间");
@@ -23,6 +27,10 @@
console.log("startTime:"+startTime)
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tSysReformist/redSet/add", function(data){
+ if (data == "501"){
+ Feng.error("红包折扣生效时间不能晚于当前时间！");
+ return;
+ }
Feng.success("添加成功!");
window.parent.TSite.table.refresh();
TSiteInfo.close();
@@ -39,6 +47,10 @@
Feng.info("请输入可红包抵扣比例");
return;
}
+ if (proportion>100){
+ Feng.info("红包抵扣比例不能大于100");
+ return;
+ }
var startTime = $("#startTime").val();
var id = $("#id").val();
if ("" == startTime){
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js
index dd8ef03..8f9fe9a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js
@@ -86,7 +86,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: '专车价格设置详情',
+ title: '小件物流价格设置详情',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js
index e935096..a8a2391 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js
@@ -79,6 +79,19 @@
this.layerIndex = index;
};
+TSystemPrice.addSpecial1 = function () {
+ var index = layer.open({
+ type: 2,
+ title: '添加专车价格设置',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tSystemPrice/tSystemPrice_add'
+ });
+ this.layerIndex = index;
+};
+
+
/**
* 打开查看专车价格设置详情
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
index 57999ba..fd14e01 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
@@ -460,7 +460,6 @@
UserActivityInfoDlg.selectRedOpt=function(id,type,totalMoney,money,startMoney,endMoney,effective){
$("#content6Num1").val(type==1?"固定金额":"随机金额");
$("#content6Num3").val(type==1?money:startMoney+"-"+endMoney);
- $("#content6Num4").val(effective);
$("#content6RedId").val(id);
$("#content6Num2").val(totalMoney);
}
--
Gitblit v1.7.1