From 7157373c20c4016f6a10c0d6a90852ec00c26f2e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 15 十二月 2024 01:34:55 +0800
Subject: [PATCH] 新增加功能
---
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html | 2
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/freezingAmountOfWithdrawalSet.html | 38 ++++
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html | 2
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html | 2
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html | 4
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html | 2
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html | 6
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_add.html | 2
ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/driverCommissionSetting.js | 86 +++++++++
ManagementAHTravel/guns-admin/src/main/resources/application.yml | 30 --
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/driverCommissionSetting.html | 58 ++++++
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html | 2
ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js | 64 +++++-
ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 70 +++++++
ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/freezingAmountOfWithdrawalSet.js | 48 +++++
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html | 2
ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html | 4
ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 74 +++++++
ManagementAHTravel/pom.xml | 1
19 files changed, 440 insertions(+), 57 deletions(-)
diff --git a/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 6f2a6a1..8b736a4 100644
--- a/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -259,8 +259,38 @@
model.addAttribute("id", id);
return PREFIX + "training.html";
}
-
-
+
+
+ /**
+ * 跳转到司机佣金设置页面
+ * @param id
+ * @param model
+ * @return
+ */
+ @RequestMapping("/driverCommissionSetting")
+ public String driverCommissionSetting(Integer id, Model model){
+ TDriver tDriver = tDriverService.selectById(id);
+ model.addAttribute("item", tDriver);
+ return PREFIX + "driverCommissionSetting.html";
+ }
+
+
+ /**
+ * 跳转到提现冻结额度设置
+ * @param id
+ * @param model
+ * @return
+ */
+ @RequestMapping("/freezingAmountOfWithdrawalSet")
+ public String freezingAmountOfWithdrawalSet(Integer id, Model model){
+ TDriver tDriver = tDriverService.selectById(id);
+ model.addAttribute("item", tDriver);
+ return PREFIX + "freezingAmountOfWithdrawalSet.html";
+ }
+
+
+
+
/**
* 保存培训数据
* @param train
@@ -1909,5 +1939,43 @@
e.printStackTrace();
}
}
-
+
+
+ /**
+ * 设置司机抽成方式
+ * @param id
+ * @param zc
+ * @param zc_cc
+ * @param cjpc
+ * @param cjpc_cc
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/setDriverCommissionSetting")
+ public ResultUtil setDriverCommissionSetting(Integer id, Integer zc, Double zc_cc, Integer cjpc, Double cjpc_cc){
+ TDriver tDriver = tDriverService.selectById(id);
+ tDriver.setSpecialCarCommissionType(zc);
+ tDriver.setSpecialCarCommission(zc_cc);
+ tDriver.setIntercityCommissionType(cjpc);
+ tDriver.setIntercityCommission(cjpc_cc);
+ tDriverService.updateById(tDriver);
+ return ResultUtil.success();
+ }
+
+
+ /**
+ * 设置提现冻结金额额度
+ * @param id
+ * @param withdrawFrozenAmount
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/setFreezingAmountOfWithdrawalSet")
+ public ResultUtil setFreezingAmountOfWithdrawalSet(Integer id, Double withdrawFrozenAmount){
+ TDriver tDriver = tDriverService.selectById(id);
+ tDriver.setWithdrawFrozenAmount(withdrawFrozenAmount);
+ tDriverService.updateById(tDriver);
+ return ResultUtil.success();
+ }
+
}
diff --git a/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 794ec3f..ff3b3e3 100644
--- a/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -295,6 +295,26 @@
* 上次人脸识别时间
*/
private Date lastFacialTime;
+ /**
+ * 专车抽成方式（1=比例，2=固定金额）
+ */
+ private Integer specialCarCommissionType;
+ /**
+ * 专车抽成金额
+ */
+ private Double specialCarCommission;
+ /**
+ * 城际抽成方式（1=比例，2=固定金额）
+ */
+ private Integer intercityCommissionType;
+ /**
+ * 城际抽成金额
+ */
+ private Double intercityCommission;
+ /**
+ * 提现冻结金额
+ */
+ private Double withdrawFrozenAmount;
public Integer getFailCount() {
return failCount;
@@ -839,7 +859,55 @@
public void setBusinessMoney(Double businessMoney) {
this.businessMoney = businessMoney;
}
-
+
+ public Double getLaveActivityMoney() {
+ return laveActivityMoney;
+ }
+
+ public void setLaveActivityMoney(Double laveActivityMoney) {
+ this.laveActivityMoney = laveActivityMoney;
+ }
+
+ public Integer getSpecialCarCommissionType() {
+ return specialCarCommissionType;
+ }
+
+ public void setSpecialCarCommissionType(Integer specialCarCommissionType) {
+ this.specialCarCommissionType = specialCarCommissionType;
+ }
+
+ public Double getSpecialCarCommission() {
+ return specialCarCommission;
+ }
+
+ public void setSpecialCarCommission(Double specialCarCommission) {
+ this.specialCarCommission = specialCarCommission;
+ }
+
+ public Integer getIntercityCommissionType() {
+ return intercityCommissionType;
+ }
+
+ public void setIntercityCommissionType(Integer intercityCommissionType) {
+ this.intercityCommissionType = intercityCommissionType;
+ }
+
+ public Double getIntercityCommission() {
+ return intercityCommission;
+ }
+
+ public void setIntercityCommission(Double intercityCommission) {
+ this.intercityCommission = intercityCommission;
+ }
+
+ public Double getWithdrawFrozenAmount() {
+ return withdrawFrozenAmount;
+ }
+
+ public void setWithdrawFrozenAmount(Double withdrawFrozenAmount) {
+ this.withdrawFrozenAmount = withdrawFrozenAmount;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ManagementAHTravel/guns-admin/src/main/resources/application.yml b/ManagementAHTravel/guns-admin/src/main/resources/application.yml
index a6a390d..f4be9fc 100644
--- a/ManagementAHTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementAHTravel/guns-admin/src/main/resources/application.yml
@@ -2,7 +2,7 @@
port: 8010
guns:
- swagger-open: true #是否开启swagger (true/false)
+ swagger-open: false #是否开启swagger (true/false)
kaptcha-open: false #是否开启登录时验证码 (true/false)
spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
@@ -55,38 +55,21 @@
---
-#spring:
-# datasource:
-# url: jdbc:mysql://127.0.0.1:10633/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: WeiLaiChuXing@2024!
-# db-name: guns #用来搜集数据库的所有表
-# filters: wall,mergeStat
-
spring:
datasource:
- url: jdbc:mysql://1.95.6.206:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://127.0.0.1:3306/ahtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: Xiwang2024!
+ password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
#spring:
# datasource:
-# url: jdbc:mysql://120.27.134.189:10633/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-# username: weilai
-# password: WeiLaiChuXing@2024!
+# url: jdbc:mysql://1.95.6.206:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+# username: root
+# password: Xiwang2024!
# db-name: guns #用来搜集数据库的所有表
# filters: wall,mergeStat
-
-#spring:
-# datasource:
-# url: jdbc:mysql://127.0.0.1:3306/fbtravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-# username: root
-# password: 123456
-# db-name: oktravel #用来搜集数据库的所有表
-# filters: wall,mergeStat
-
#多数据源情况的配置
@@ -122,7 +105,6 @@
---
filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
-#filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html
index aa6777d..282af4f 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html
@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>环球出行 - 404 页面</title>
+ <title>安合出行 - 404 页面</title>
<link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico"> <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
<link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
<link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
index 8343716..a27048b 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
@@ -4,7 +4,7 @@
<div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
<form role="search" class="navbar-form-custom" method="post" action="search_results.html">
<div class="form-group">
- <input type="text" placeholder="环球出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="环球出行后台管理系统" disabled>
+ <input type="text" placeholder="安合出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="安合出行后台管理系统" disabled>
</div>
</form>
<h3 style="float: right;line-height: 50px;color: red;">${passwordHint}</h3>
@@ -53,7 +53,7 @@
<iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctxPath}/blackboard?type=${type}" frameborder="0" data-id="${ctxPath}/blackboard" seamless></iframe>
</div>
<div class="footer">
- <div class="pull-right">© 2023-2023 <a href="#" onclick="return false" target="_blank">环球出行</a>
+ <div class="pull-right">© 2023-2024 <a href="#" onclick="return false" target="_blank">安合出行</a>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html
index 5b35199..f0b63be 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
- <title>环球出行 - 主页</title>
+ <title>安合出行 - 主页</title>
<link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
<link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
<link href="${ctxPath}/static/css/font-awesome.min.css?v=4.4.0" rel="stylesheet">
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
index 711c5ea..5429e25 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>环球出行 - 登录</title>
+ <title>安合出行 - 登录</title>
<link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
<link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
@@ -58,7 +58,7 @@
<img src="${ctxPath}/static/img/index4.png" style="width: 300px;height: 400px;z-index: 1000">
<div style="position: relative;left: -30px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
<div style="max-height: 100%">
- <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/> 环球出行管理后台</h3>
+ <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/> 安合出行管理后台</h3>
<br/>
<h4 style="color: red;">${tips!}</h4>
<form class="m-t" role="form" action="${ctxPath}/login" method="post">
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/driverCommissionSetting.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/driverCommissionSetting.html
new file mode 100644
index 0000000..0f6758d
--- /dev/null
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/driverCommissionSetting.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-1">
+ </div>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label> 专车 </label>
+ <div class="row">
+ <div class="col-sm-1">
+ </div>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <input type="radio" value="1" name="zc" ${item.specialCarCommissionType == 1 ? 'checked' : ''}>
+ 按比例抽成，每笔订单抽取 <input type="number" min="0" max="100" id="zc_cc1" value="${item.specialCarCommissionType == 1 ? item.specialCarCommission : ''}"/> %
+ </div>
+ <div class="form-group">
+ <input type="radio" value="2" name="zc" ${item.specialCarCommissionType == 2 ? 'checked' : ''}>
+ 按固定金额抽成，每笔订单抽取 <input type="number" min="0" id="zc_cc2" value="${item.specialCarCommissionType == 2 ? item.specialCarCommission : ''}"/> 元
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label> 城际拼车 </label>
+ <div class="row">
+ <div class="col-sm-1">
+ </div>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <input type="radio" value="1" name="cjpc" ${item.intercityCommissionType == 1 ? 'checked' : ''}>
+ 按比例抽成，每笔订单抽取 <input type="number" min="0" max="100" id="cjpc_cc1" value="${item.intercityCommissionType == 1 ? item.intercityCommission : ''}"/> %
+ </div>
+ <div class="form-group">
+ <input type="radio" value="2" name="cjpc" ${item.intercityCommissionType == 2 ? 'checked' : ''}>
+ 按固定金额抽成，每笔订单抽取 <input type="number" min="0" id="cjpc_cc2" value="${item.intercityCommissionType == 2 ? item.intercityCommission : ''}"/> 元
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <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="addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="closePage()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/driverCommissionSetting.js"></script>
+@}
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/freezingAmountOfWithdrawalSet.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/freezingAmountOfWithdrawalSet.html
new file mode 100644
index 0000000..53a5223
--- /dev/null
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/freezingAmountOfWithdrawalSet.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-1">
+ </div>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <div class="row">
+ <div class="col-sm-1">
+ </div>
+ <div class="col-sm-10">
+ <div class="form-group">
+ 提现冻结金额额度 <input type="number" min="0" id="withdrawFrozenAmount" value="${item.withdrawFrozenAmount}"/> 元
+ </div>
+ <div class="form-group">
+ <span style="color: red;">注意：司机提现时，系统自动验证待提现余额是都大于冻结金额，若大于则司机可提现金额为余额-冻结金额，若下雨则直接提示不能提现</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <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="addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="closePage()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/freezingAmountOfWithdrawalSet.js"></script>
+@}
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
index 7e280e5..a7d0c2e 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
@@ -77,6 +77,12 @@
@if(shiro.hasPermission("/tDriver/changeCar")){
<#button name="更换/绑定车辆" icon="fa-remove" clickFun="YesDriver.changeCar()" space="true"/>
@}
+ @if(shiro.hasPermission("/tDriver/driverCommissionSetting")){
+ <#button name="司机佣金设置" icon="fa-remove" clickFun="YesDriver.driverCommissionSetting()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/freezingAmountOfWithdrawalSet")){
+ <#button name="提现冻结额度设置" icon="fa-remove" clickFun="YesDriver.freezingAmountOfWithdrawalSet()" space="true"/>
+ @}
</div>
<#table id="YesDriverTable"/>
</div>
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html
index 6e26319..e85a803 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html
@@ -37,7 +37,7 @@
</div>
<div class="col-sm-6">
- <#input id="payManner" name="支付方式（1=未来平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payManner" name="支付方式（1=安合平台支付，2=其他方式支付）" underline="true"/>
<#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
<#input id="orderMoney" name="订单金额" underline="true"/>
<#input id="travelMoney" name="行程费" underline="true"/>
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html
index dcec1fd..193d997 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html
@@ -37,7 +37,7 @@
</div>
<div class="col-sm-6">
- <#input id="payManner" name="支付方式（1=未来平台支付，2=其他方式支付）" value="${item.payManner}" underline="true"/>
+ <#input id="payManner" name="支付方式（1=安合平台支付，2=其他方式支付）" value="${item.payManner}" underline="true"/>
<#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" value="${item.payType}" underline="true"/>
<#input id="orderMoney" name="订单金额" value="${item.orderMoney}" underline="true"/>
<#input id="travelMoney" name="行程费" value="${item.travelMoney}" underline="true"/>
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
index 2f9ee59..5e53551 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
@@ -29,7 +29,7 @@
<#input id="getoffAddress" name="下车地点" underline="true"/>
<#input id="getoffTime" name="下车时间" underline="true"/>
<#input id="mileage" name="行驶里程数（米）" underline="true"/>
- <#input id="payManner" name="支付方式（1=未来平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payManner" name="支付方式（1=安合平台支付，2=其他方式支付）" underline="true"/>
<#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
<#input id="orderMoney" name="订单金额" underline="true"/>
<#input id="startMoney" name="起步价" underline="true"/>
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
index 685053d..75e7c87 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
@@ -28,7 +28,7 @@
<#input id="getoffAddress" name="下车地点" underline="true"/>
<#input id="getoffTime" name="下车时间" underline="true"/>
<#input id="mileage" name="行驶里程数（米）" underline="true"/>
- <#input id="payManner" name="支付方式（1=未来平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payManner" name="支付方式（1=安合平台支付，2=其他方式支付）" underline="true"/>
<#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
<#input id="orderMoney" name="订单金额"/>
</div>
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_add.html b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_add.html
index 25a08ee..4663feb 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_add.html
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_add.html
@@ -29,7 +29,7 @@
<#input id="getoffAddress" name="下车地点" underline="true"/>
<#input id="getoffTime" name="下车时间" underline="true"/>
<#input id="mileage" name="行驶里程数（米）" underline="true"/>
- <#input id="payManner" name="支付方式（1=未来平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payManner" name="支付方式（1=安合平台支付，2=其他方式支付）" underline="true"/>
<#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
<#input id="orderMoney" name="订单金额" underline="true"/>
<#input id="startMoney" name="起步价" underline="true"/>
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/driverCommissionSetting.js b/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/driverCommissionSetting.js
new file mode 100644
index 0000000..9510bc6
--- /dev/null
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/driverCommissionSetting.js
@@ -0,0 +1,86 @@
+
+/**
+ * 关闭此对话框
+ */
+function closePage () {
+ parent.layer.close(window.parent.YesDriver.layerIndex);
+}
+
+
+
+/**
+ * 保存数据
+ */
+function addSubmit() {
+ var id = $('#id').val();
+ var zc = $('input[name="zc"]:checked').val();
+ var zc_cc = "";
+ if(1 == zc){
+ zc_cc = $('#zc_cc1').val();
+ }
+ if(2 == zc){
+ zc_cc = $('#zc_cc2').val();
+ }
+ if(null == zc_cc || '' == zc_cc){
+ Feng.error("专车抽成设置不能为空");
+ return
+ }
+ if(1 == zc && (0 > zc_cc || 100 < zc_cc)){
+ Feng.error("专车抽成设置只能在0-100之间");
+ return
+ }
+ if(2 == zc && 0 > zc_cc){
+ Feng.error("专车抽成设置不能小于0");
+ return
+ }
+ if(zc_cc.split(".").length == 2 && zc_cc.split(".")[1].length > 2){
+ Feng.error("专车抽成设置请保留两位小数");
+ return;
+ }
+
+ var cjpc = $('input[name="cjpc"]:checked').val();
+ var cjpc_cc = "";
+ if(1 == cjpc){
+ cjpc_cc = $('#cjpc_cc1').val();
+ }
+ if(2 == cjpc){
+ cjpc_cc = $('#cjpc_cc2').val();
+ }
+ if(null == cjpc_cc || '' == cjpc_cc){
+ Feng.error("城际拼车抽成设置不能为空");
+ return
+ }
+ if(1 == cjpc && (0 > cjpc_cc || 100 < cjpc_cc)){
+ Feng.error("城际拼车抽成设置只能在0-100之间");
+ return
+ }
+ if(2 == cjpc && 0 > cjpc_cc){
+ Feng.error("城际拼车抽成设置不能小于0");
+ return
+ }
+ if(cjpc_cc.split(".").length == 2 && cjpc_cc.split(".")[1].length > 2){
+ Feng.error("城际拼车抽成设置请保留两位小数");
+ return;
+ }
+
+ $.ajax({
+ url: Feng.ctxPath + "/tDriver/setDriverCommissionSetting",
+ type: 'POST',
+ data: {
+ id: id,
+ zc: zc,
+ zc_cc: zc_cc,
+ cjpc: cjpc,
+ cjpc_cc: cjpc_cc
+ },
+ success: function (res) {
+ if(res.status == 200){
+ Feng.success("设置成功");
+ closePage();
+ window.parent.YesDriver.table.refresh();//刷新表格数据
+ }else{
+ Feng.error(res.msg)
+ }
+ }
+ });
+}
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/freezingAmountOfWithdrawalSet.js b/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/freezingAmountOfWithdrawalSet.js
new file mode 100644
index 0000000..560e7ad
--- /dev/null
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/freezingAmountOfWithdrawalSet.js
@@ -0,0 +1,48 @@
+
+/**
+ * 关闭此对话框
+ */
+function closePage () {
+ parent.layer.close(window.parent.YesDriver.layerIndex);
+}
+
+
+
+/**
+ * 保存数据
+ */
+function addSubmit() {
+ var id = $('#id').val();
+ var withdrawFrozenAmount = $('#withdrawFrozenAmount').val();
+ if(null == withdrawFrozenAmount || '' == withdrawFrozenAmount){
+ Feng.error("提现冻结金额额度不能为空");
+ return
+ }
+ if(0 > withdrawFrozenAmount){
+ Feng.error("提现冻结金额额度不能小于0");
+ return
+ }
+ if(withdrawFrozenAmount.split(".").length == 2 && withdrawFrozenAmount.split(".")[1].length > 2){
+ Feng.error("提现冻结金额额度请保留两位小数");
+ return;
+ }
+
+
+ $.ajax({
+ url: Feng.ctxPath + "/tDriver/setFreezingAmountOfWithdrawalSet",
+ type: 'POST',
+ data: {
+ id: id,
+ withdrawFrozenAmount: withdrawFrozenAmount
+ },
+ success: function (res) {
+ if(res.status == 200){
+ Feng.success("设置成功");
+ closePage();
+ window.parent.YesDriver.table.refresh();//刷新表格数据
+ }else{
+ Feng.error(res.msg)
+ }
+ }
+ });
+}
diff --git a/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js b/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
index 4b847e2..1af6d57 100644
--- a/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
+++ b/ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
@@ -499,9 +499,9 @@
window.location.href = Feng.ctxPath + "/tDriver/uploadDriverModel";
}
-var agreement = function(){
- this.init = function(){
- //模拟上传excel
+var agreement = function(){
+ this.init = function(){
+ //模拟上传excel
$("#uploadEventBtn").unbind("click").bind("click",function(){
$("#uploadEventFile").click();
});
@@ -511,10 +511,10 @@
* 导入合同
*/
YesDriver.exportDriver = function () {
- var uploadEventFile = $("#uploadEventFile").val();
- if(uploadEventFile == ''){
+ var uploadEventFile = $("#uploadEventFile").val();
+ if(uploadEventFile == ''){
Feng.info("请选择Excel,再上传");
- }else if(uploadEventFile.lastIndexOf(".xls")<0){//可判断以.xls和.xlsx结尾的excel
+ }else if(uploadEventFile.lastIndexOf(".xls")<0){//可判断以.xls和.xlsx结尾的excel
Feng.info("只能上传Excel文件");
}else{
var url = Feng.ctxPath + '/tDriver/exportDriver';
@@ -527,12 +527,12 @@
}
}
}
-YesDriver.sendAjaxRequest = function(url,type,data){
+YesDriver.sendAjaxRequest = function(url,type,data){
$.ajax({
- url : url,
- type : type,
- data : data,
- success : function(result) {
+ url : url,
+ type : type,
+ data : data,
+ success : function(result) {
if(result.code==500) {
Feng.info(result.message);
$('input[name=file]').val('');
@@ -541,18 +541,18 @@
}
YesDriver.table.refresh();
},
- error : function() {
+ error : function() {
Feng.error("excel上传失败!");
},
- cache : false,
- contentType : false,
- processData : false
+ cache : false,
+ contentType : false,
+ processData : false
});
};
-var agreement;
+var agreement;
$(function(){
- agreement = new agreement();
+ agreement = new agreement();
agreement.init();
});
@@ -565,3 +565,33 @@
};
Feng.confirm("是否确认导出司机信息?", operation);
}
+
+
+YesDriver.driverCommissionSetting = function (){
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '司机佣金设置',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tDriver/driverCommissionSetting?id=' + YesDriver.seItem.id
+ });
+ this.layerIndex = index;
+ }
+}
+
+
+YesDriver.freezingAmountOfWithdrawalSet = function (){
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '提现冻结额度设置',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tDriver/freezingAmountOfWithdrawalSet?id=' + YesDriver.seItem.id
+ });
+ this.layerIndex = index;
+ }
+}
\ No newline at end of file
diff --git a/ManagementAHTravel/pom.xml b/ManagementAHTravel/pom.xml
index bbae030..121e0c3 100644
--- a/ManagementAHTravel/pom.xml
+++ b/ManagementAHTravel/pom.xml
@@ -11,7 +11,6 @@
<modules>
<module>guns-admin</module>
<module>guns-core</module>
- <module>guns-rest</module>
<module>guns-generator</module>
</modules>
--
Gitblit v1.7.1