From 13af2bc11b551befd11accfd66e601a013b57c6f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 22 七月 2024 14:25:54 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js | 1
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html | 4
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html | 9 ++
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html | 9 ++
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 86 +++++++++++-----------------
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html | 9 ---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html | 9 ++
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html | 11 ++-
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 6 +-
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html | 9 ---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 18 +++--
12 files changed, 79 insertions(+), 94 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 b280578..b369640 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
@@ -176,7 +176,7 @@
.ne("type", 1)
.isNotNull("orderType"));
}else{
- if (time == 5){
+ if (time == 5 && insertTime==null){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
@@ -304,7 +304,9 @@
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (time!=null && time!=5 ){
+ if (time == 5 && insertTime==null){
+
+ }else{
settlementDetailEntityWrapper.between("createTime", start, end);
}
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
@@ -493,7 +495,7 @@
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
- if (time!=null && time == 5){
+ if (time == 5 && insertTime==null){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
@@ -995,7 +997,7 @@
EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
// 司机手动结算金额
Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
- if (time!=null && time == 5){
+ if (time == 5 && insertTime==null){
// 余额充值wrapper
orderType = new EntityWrapper<TPubTransactionDetails>()
.eq("userType",1)
@@ -1446,7 +1448,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
@@ -1498,7 +1500,7 @@
.ne("type", 1)
.isNotNull("orderType"));
}else{
- if (time == 5){
+ if (time == 5 && insertTime==null){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
.eq("objectId",1)
@@ -1514,7 +1516,9 @@
}
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- if (time!=null && time!=5){
+ if (time == 5 && insertTime==null){
+
+ }else{
settlementDetailEntityWrapper.between("createTime", start, end);
}
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
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 da058c3..337033c 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
@@ -181,7 +181,7 @@
// 司机消费
List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
// 司机提现
- List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
+ List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();
Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
;
@@ -204,10 +204,7 @@
// 司机已消费金额
Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
;
- // 司机提现
- Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
- ;
- if (time!=null && time == 5){
+ if (time == 5 && insertTime==null){
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("userType", 2)
@@ -238,13 +235,15 @@
between4 = new EntityWrapper<BalanceUsageRecord>()
.ne("purpose", 6);
// 司机提现
- between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6);
+ driverWrapper = new EntityWrapper<TPubWithdrawal>()
+ .eq("state", 2)
+ .eq("userType", 2)
+ ;
}else{
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("userType", 2)
- .between("handleTime", start, end);
+ .between("insertTime", start, end);
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
@@ -278,9 +277,7 @@
.ne("purpose", 6)
.between("createTime", start, end);
// 司机提现
- between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6)
- .between("createTime", start, end);
+
}
// 司机提现wrapper
if (type!=null){
@@ -298,8 +295,7 @@
case 3:
// 司机消费记录
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
-
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
break;
case 4:
// 专车订单
@@ -322,7 +318,7 @@
// 消费
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
// 提现
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
}
// 已发放补贴总额
@@ -410,7 +406,7 @@
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());
@@ -423,7 +419,7 @@
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());
@@ -468,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);
}
@@ -570,7 +562,7 @@
// 司机消费
List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
// 司机提现
- List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
+ List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();
Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
;
// 专车wrapper
@@ -593,9 +585,9 @@
Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
;
// 司机提现
- Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
+ Wrapper<TPubWithdrawal> between44 = new EntityWrapper<TPubWithdrawal>()
;
- if (time!=null && time == 5){
+ if (time == 5 && insertTime==null){
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("userType", 2)
@@ -625,14 +617,12 @@
// 司机已消费金额
between4 = new EntityWrapper<BalanceUsageRecord>()
.ne("purpose", 6);
- // 司机提现
- between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6);
+
}else{
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
.eq("userType", 2)
- .between("handleTime", start, end);
+ .between("insertTime", start, end);
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
@@ -665,10 +655,6 @@
between4 = new EntityWrapper<BalanceUsageRecord>()
.ne("purpose", 6)
.between("createTime", start, end);
- // 司机提现
- between44 = new EntityWrapper<BalanceUsageRecord>()
- .eq("purpose", 6)
- .between("createTime", start, end);
}
if (type!=null){
@@ -687,7 +673,7 @@
// 司机消费记录
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
break;
case 4:
// 专车订单
@@ -710,7 +696,7 @@
// 消费
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
// 提现
- driverWithdrawal = balanceUsageRecordService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(between44);
}
// 已发放补贴总额
@@ -813,7 +799,7 @@
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());
@@ -829,7 +815,7 @@
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());
@@ -875,24 +861,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);
// 已使用司机奖励合计
@@ -905,7 +886,6 @@
useMoneyVO.setDriver(driver);
useMoneyVO.setDriverWithdrawal(driverWithdrawal1);
useMoneyVO.setDriverConsume(driverConsume);
-
return useMoneyVO;
}
@@ -1005,7 +985,7 @@
// 司机奖励
Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
;
- if (time == 5){
+ if (time == 5 && insertTime==null){
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("discountMoney")
@@ -1098,7 +1078,7 @@
BigDecimal driver = new BigDecimal("0");
// 查询已使用折扣总额
for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
- if (tOrderPrivateCar.getDiscountMoney()==null){
+ if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
continue;
}
discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
@@ -1120,7 +1100,7 @@
res.add(grantVO);
}
for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
- if (tOrderPrivateCar.getDiscountMoney()==null){
+ if (tOrderPrivateCar.getDiscountMoney()==null || tOrderPrivateCar.getDiscountMoney() == 0){
continue;
}
@@ -1306,7 +1286,7 @@
// 司机奖励
Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
;
- if (time == 5){
+ if (time == 5 && insertTime==null){
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("discountMoney")
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 b6c58d3..43c6ae1 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
@@ -56,11 +56,11 @@
<br/>
<br/>
连续在线 <input type="text" @if(isNotEmpty(online1.offlineTime)){
- value="${item.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 fbcb784..8f1cfb6 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.offlineTime)){
- value="${item.offlineTime}"
+ 连续在线 <input type="text" @if(isNotEmpty(online1.offlineTime)){
+ value="${online1.offlineTime}"
@}else{
value=""
@}
- name="num12" class="form-control newWidth"/> 小时奖励
+ name="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 c948609..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
@@ -128,12 +128,17 @@
if ("5" == $("#time").val()){
time.value="";
- time.disabled = true;
+ time.disabled = false;
}else{
time.value="";
- time.disabled = false;
+ 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 7c266f0..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
@@ -155,11 +155,16 @@
if ("5" == $("#time").val()){
time.value="";
- time.disabled = true;
+ time.disabled = false;
}else{
time.value="";
- time.disabled = false;
+ 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/grant.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
index cacaef2..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
@@ -143,11 +143,16 @@
if ("5" == $("#time").val()){
time.value="";
- time.disabled = true;
+ time.disabled = false;
}else{
time.value="";
- time.disabled = false;
+ 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 6bcab8f..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,7 +65,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">
@@ -162,11 +162,16 @@
if ("5" == $("#time").val()){
time.value="";
- time.disabled = true;
+ time.disabled = false;
}else{
time.value="";
- time.disabled = false;
+ 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/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..454763e 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}"
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..8fc4863 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',},
];
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