From d3f42e78332d6192f457c29d4cb46789d2f1d975 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 28 十一月 2024 15:46:31 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 19 ++++--
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js | 7 ++
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html | 23 ++++---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html | 4
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html | 54 ++++++++++++------
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml | 18 +++++
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetAdd.html | 4
12 files changed, 95 insertions(+), 44 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
index ffd7ae9..7fa75e0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
@@ -135,16 +135,32 @@
when ot.payType = 2 then '银行卡支付'
when ot.payType = 3 then '余额支付' else '现金支付' end as payTypeStr,
ui.nickName as userName,ui.phone as userPhone,
+ case when income1.type = 1 then income1.money else 0 end as platIncome,
+ case when income1.type = 2 then income1.money else 0 end as companyIncome,
+ case when income1.type = 3 then income1.money else 0 end as franchiseeIncome,
+ IFNULL(income2.money,0) as driverIncome,
CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
'市内小件物流' as typeStr,
dd.name as companyName,
- ot.* FROM t_order_logistics as ot
+ ot.*,
+ oc.money as cancelMoney,
+ case when oc.payType = 1 then '手机支付'
+ when oc.payType = 2 then '银行卡支付'
+ when oc.payType = 3 then '余额支付' else '现金支付' end as cancelPayTypeStr
+ FROM t_order_logistics as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
LEFT JOIN t_car as ci on ci.id= ot.carId
LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
LEFT JOIN t_company as cc on cc.id = ot.companyId
LEFT JOIN t_company as dd on dd.id = ci.companyId
+ LEFT JOIN t_order_cancel as oc on ot.id = oc.orderId and oc.orderType = 4
+ LEFT JOIN (
+ SELECT ii.money,ii.incomeId,cc.type FROM t_income as ii
+ LEFT JOIN t_company as cc on ii.objectId = cc.id
+ where ii.userType = 1 and ii.type != 1 and ii.orderType = 4
+ ) as income1 on income1.incomeId = ot.id
+ LEFT JOIN (SELECT incomeId, money FROM t_income where userType = 2 and type != 1 and orderType = 4) as income2 on income2.incomeId = ot.id
where ot.id = #{orderId}
</select>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index 4c14672..f7aed42 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -158,18 +158,25 @@
IFNULL(income2.money,0) as driverIncome,
CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,
CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
- cc.`name` as companyName,ot.*
- FROM t_order_private_car as ot
+ cc.`name` as companyName,ot.*,
+ oc.money as cancelMoney,
+ case when oc.payType = 1 then '手机支付'
+ when oc.payType = 2 then '银行卡支付'
+ when oc.payType = 3 then '余额支付' else '现金支付' end as cancelPayTypeStr
+ FROM t_order_private_car as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
LEFT JOIN t_car as ci on ci.id= ot.carId
LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
LEFT JOIN t_company as cc on cc.id = ot.companyId
LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
- LEFT JOIN (SELECT ii.money,ii.incomeId,cc.type FROM t_income as ii
- LEFT JOIN t_company as cc on ii.objectId = cc.id
- where ii.userType = 1 and ii.type = 2 and ii.orderType = 1) as income1 on income1.incomeId = ot.id
- LEFT JOIN (SELECT incomeId, money FROM t_income where userType = 2 and type = 2 and orderType = 1) as income2 on income2.incomeId = ot.id
+ LEFT JOIN t_order_cancel as oc on ot.id = oc.orderId and oc.orderType = 1
+ LEFT JOIN (
+ SELECT ii.money,ii.incomeId,cc.type FROM t_income as ii
+ LEFT JOIN t_company as cc on ii.objectId = cc.id
+ where ii.userType = 1 and ii.type != 1 and ii.orderType = 1
+ ) as income1 on income1.incomeId = ot.id
+ LEFT JOIN (SELECT incomeId, money FROM t_income where userType = 2 and type != 1 and orderType = 1) as income2 on income2.incomeId = ot.id
where ot.id = #{orderId}
</select>
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 3408304..2d28991 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
@@ -19,7 +19,7 @@
<br/>
<br/>
- 司机注册既赠送 <input type="text" id="num2" class="form-control newWidth" /> GHS
+ 司机注册即赠送 <input type="text" id="num2" class="form-control newWidth" /> GHS
<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 a2aecb7..e1c3b15 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
@@ -19,7 +19,7 @@
<br/>
<br/>
- 司机注册既赠送 <input type="text" @if(isNotEmpty(regist1)){
+ 司机注册即赠送 <input type="text" @if(isNotEmpty(regist1)){
value="${regist1.money}"
@}else{
value=""
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 51f0366..509f3f8 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
@@ -20,7 +20,7 @@
<br/>
<br/>
- 司机注册既赠送 <input type="text" @if(isNotEmpty(regist1)){
+ 司机注册即赠送 <input type="text" @if(isNotEmpty(regist1)){
value="${regist1.money}"
@}else{
value=""
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html
index 906ce24..be7d08d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html
@@ -6,7 +6,7 @@
<div class="row">
<div class="col-sm-11">
<div class="form-group">
- <label class="col-sm-3 control-label">填写备注：</label>
+ <label class="col-sm-3 control-label">回复内容：</label>
<div class="col-sm-9">
<textarea type="text/plain" class="form-control" name="handleResult" id="handleResult" placeholder="多行输入,最多500字" style="width:100%;height:150px;"></textarea>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html
index a902b13..a53fcd6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html
@@ -7,7 +7,7 @@
<div class="row">
<div class="col-sm-11">
<div class="form-group">
- <label class="col-sm-2 control-label">备注：</label>
+ <label class="col-sm-2 control-label">回复内容：</label>
<div class="col-sm-9">
<textarea type="text/plain" class="form-control" name="remark" id="remark" placeholder="多行输入,最多500字" style="width:100%;height:150px;"></textarea>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
index 5813f2b..7921446 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
@@ -36,27 +36,45 @@
<div class="row">
@if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
<div class="col-sm-6 b-r">
- <#label id="orderMoney" name="订单总价" value="${item.orderMoney}GHS"/>
- @if(isNotEmpty(item.payMoney)){
- <#label id="payMoney" name="实际支付费用" value="${item.payMoney}GHS"/>
- @}else{
- <#label id="payMoney" name="实际支付费用" value="0.00GHS"/>
- @}
- @if(isNotEmpty(item.couponMoney)){
- <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}GHS"/>
- @}else{
- <#label id="couponMoney" name="优惠券抵扣费用" value="0.00GHS"/>
- @}
- @if(isNotEmpty(item.redPacketMoney)){
- <#label id="redPacketMoney" name="红包抵扣费用" value="${item.redPacketMoney}GHS"/>
- @}else{
- <#label id="redPacketMoney" name="红包抵扣费用" value="0.00GHS"/>
- @}
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}GHS"/>
+ <#label id="abnormalMoney" name="异常金额" value="${item.abnormalMoney}GHS"/>
+ <#label id="travelMoney" name="起步价" value="${item.startMoney}GHS------起步里程(${item.startMileage})公里"/>
+ <#label id="travelMoney" name="里程费" value="${item.mileageMoney}GHS------里程公里(${item.mileageKilometers})公里"/>
+ <#label id="durationMoney" name="时长费" value="${item.durationMoney}GHS------时长分钟(${item.duration})分钟"/>
+ <#label id="waitMoney" name="等待费" value="${item.waitMoney}GHS------等待分钟（${item.wait}）分钟"/>
+ <#label id="parkMoney" name="停车费" value="${item.parkMoney}GHS"/>
+ <#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}GHS"/>
+ <#label id="longDistanceMoney" name="远途费" value="${item.longDistanceMoney}GHS------远途（${item.longDistance}）公里"/>
+ <#label id="tipMoney" name="首单免费" value="${item.freeMoney1}GHS"/>
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}GHS"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00GHS"/>
+ @}
+
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}GHS"/>
+ <#label id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}GHS"/>
+ <#label id="discountMoney" name="折扣优惠金额" value="${item.discountMoney}GHS------折扣(${item.discount}折)"/>
</div>
<div class="col-sm-6">
- <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ <#label id="platIncome" name="平台收益" value="${item.platIncome}GHS"/>
+ <#label id="companyIncome" name="分公司收益" value="${item.companyIncome}GHS"/>
+ <#label id="franchiseeIncome" name="加盟商收益" value="${item.franchiseeIncome}GHS"/>
+ <#label id="driverIncome" name="司机收益" value="${item.driverIncome}GHS"/>
</div>
- @}else{
+ @}else if(isNotEmpty(item.cancelMoney) && item.cancelMoney > 0){
+ <div class="col-sm-6">
+ <#label id="cancelPayTypeStr" name="支付方式" value="${item.cancelPayTypeStr}"/>
+ <#label id="cancelMoney" name="取消金额" value="${item.cancelMoney}GHS"/>
+ </div>
+ <div class="col-sm-6">
+ <#label id="platIncome" name="平台收益" value="${item.platIncome}GHS"/>
+ <#label id="companyIncome" name="分公司收益" value="${item.companyIncome}GHS"/>
+ <#label id="franchiseeIncome" name="加盟商收益" value="${item.franchiseeIncome}GHS"/>
+ <#label id="driverIncome" name="司机收益" value="${item.driverIncome}GHS"/>
+ </div>
+ @}else{
<h4 style="margin-left: 10%">暂无费用明细</h4>
@}
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
index 5311b1d..984a1f8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -66,31 +66,34 @@
<#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}GHS"/>
<#label id="longDistanceMoney" name="远途费" value="${item.longDistanceMoney}GHS------远途（${item.longDistance}）公里"/>
<#label id="tipMoney" name="首单免费" value="${item.freeMoney1}GHS"/>
- @if(isNotEmpty(item.discountMoney)){
- <#label id="discountMoney" name="折扣优惠金额" value="${item.discountMoney}GHS------折扣(${item.discount}折)"/>
- @}
@if(isNotEmpty(item.payMoney)){
<#label id="payMoney" name="实际支付费用" value="${item.payMoney}GHS"/>
@}else{
<#label id="payMoney" name="实际支付费用" value="0.00GHS"/>
@}
-
<#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
<#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}GHS"/>
<#label id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}GHS"/>
+ <#label id="discountMoney" name="折扣优惠金额" value="${item.discountMoney}GHS------折扣(${item.discount}折)"/>
</div>
- <!--<div class="col-sm-3">
- <#label id="startMileage" name="起步里程" value="${item.startMileage}"/>
- <#label id="mileageKilometers" name="公里数" value="${item.mileageKilometers}"/>
-
- </div>-->
<div class="col-sm-6">
<#label id="platIncome" name="平台收益" value="${item.platIncome}GHS"/>
<#label id="companyIncome" name="分公司收益" value="${item.companyIncome}GHS"/>
<#label id="franchiseeIncome" name="加盟商收益" value="${item.franchiseeIncome}GHS"/>
<#label id="driverIncome" name="司机收益" value="${item.driverIncome}GHS"/>
</div>
- @}else{
+ @}else if(isNotEmpty(item.cancelMoney) && item.cancelMoney > 0){
+ <div class="col-sm-6">
+ <#label id="cancelPayTypeStr" name="支付方式" value="${item.cancelPayTypeStr}"/>
+ <#label id="cancelMoney" name="取消金额" value="${item.cancelMoney}GHS"/>
+ </div>
+ <div class="col-sm-6">
+ <#label id="platIncome" name="平台收益" value="${item.platIncome}GHS"/>
+ <#label id="companyIncome" name="分公司收益" value="${item.companyIncome}GHS"/>
+ <#label id="franchiseeIncome" name="加盟商收益" value="${item.franchiseeIncome}GHS"/>
+ <#label id="driverIncome" name="司机收益" value="${item.driverIncome}GHS"/>
+ </div>
+ @}else {
<h4 style="margin-left: 10%">暂无费用明细</h4>
@}
</div>
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 24ca245..4a122d2 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
@@ -7,11 +7,11 @@
<div class="">
<h2 style="margin-left: 200px;">红包支付设置</h2>
</div>
- <h3 style="color: red;margin-left: 200px;">【当前已生效折扣比例：${new}%】</h3>
+ <h3 style="color: red;margin-left: 200px;">【当前已生效支付比例：${new}%】</h3>
<br>
<br>
<div class="form-group" >
- <label class="col-sm-3 control-label">红包可抵扣比例：</label>
+ <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="number">
<span id="priceLabel1" style="margin-left: 5px;margin-top: 5px">%</span>
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 71d4bb6..de17233 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
@@ -8,11 +8,11 @@
<div class="">
<h2 style="margin-left: 200px;">红包支付设置</h2>
</div>
- <h3 style="color: red;margin-left: 200px;">【当前已生效折扣比例：${new}%】</h3>
+ <h3 style="color: red;margin-left: 200px;">【当前已生效支付比例：${new}%】</h3>
<br>
<br>
<div class="form-group" >
- <label class="col-sm-3 control-label">红包可抵扣比例：</label>
+ <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="number">
<span id="priceLabel1" style="margin-left: 5px;margin-top: 5px">%</span>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
index d6cf004..d45ddb4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
@@ -694,4 +694,11 @@
function deleteSub(e) {
$(e).parent().parent().remove();
+ var subArr=[];
+ $(".timeClass").each(function () {
+ subArr.push({
+ recordId:$(this).find("input[name*='recordId']").val(),
+ cityId:$(this).find("input[name*='cityId']").val()
+ })
+ });
}
\ No newline at end of file
--
Gitblit v1.7.1