From a60d75099a66f1d142e3532c8c61460e03cc093e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 03 三月 2023 17:07:12 +0800
Subject: [PATCH] 系统管理
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigServiceMgmt.html | 34 ++
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html | 57 ++++
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html | 40 +-
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 172 +++++++++++++
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html | 10
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html | 30 +-
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 90 ++++++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 7
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigIntegralRules.html | 101 +++++++
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html | 116 ++++++++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java | 12
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html | 55 ++++
12 files changed, 688 insertions(+), 36 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
index fae454e..3242865 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
@@ -13,6 +14,10 @@
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TSystemConfig;
import com.stylefeng.guns.modular.system.service.ITSystemConfigService;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
/**
* 控制器
@@ -91,6 +96,89 @@
}
/**
+ * 跳转到抽成规则
+ */
+ @RequestMapping("/extractionRules")
+ public String extractionRules(Model model) {
+ TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 3)
+ .last("LIMIT 1"));
+ JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
+ model.addAttribute("num1",jsonObject.getInteger("num1"));
+ model.addAttribute("num2",jsonObject.getInteger("num2"));
+ model.addAttribute("num3",jsonObject.getInteger("num3"));
+ return PREFIX + "tSystemConfigExtractionRules.html";
+ }
+ /**
+ * 跳转到积分规则
+ */
+ @RequestMapping("/integralRules")
+ public String integralRules(Model model) {
+ TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 4)
+ .last("LIMIT 1"));
+ JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
+ model.addAttribute("num1",jsonObject.getString("num1"));
+ model.addAttribute("num2",jsonObject.getString("num2"));
+ model.addAttribute("num3",jsonObject.getInteger("num3"));
+ model.addAttribute("num4",jsonObject.getInteger("num4"));
+ model.addAttribute("num5",jsonObject.getInteger("num5"));
+ model.addAttribute("num6",jsonObject.getInteger("num6"));
+ model.addAttribute("num7",jsonObject.getInteger("num7"));
+ model.addAttribute("num8",jsonObject.getInteger("num8"));
+ model.addAttribute("num9",jsonObject.getInteger("num9"));
+ model.addAttribute("num10",jsonObject.getInteger("num10"));
+ return PREFIX + "tSystemConfigIntegralRules.html";
+ }
+
+ /**
+ * 跳转到价格规则
+ */
+ @RequestMapping("/priceRules")
+ public String priceRules(Model model) {
+ TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 5)
+ .last("LIMIT 1"));
+ JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
+ JSONArray array = jsonObject.getJSONArray("ChargeStandard");
+ JSONArray objects = new JSONArray();
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject jsonObject1 = JSONObject.parseObject(JSONObject.toJSONString(array.get(i)));
+ if(i == 0){
+ jsonObject1.put("key",0);
+ }else {
+ jsonObject1.put("key",1);
+ }
+ objects.add(jsonObject1);
+ }
+ model.addAttribute("array",objects);
+ JSONObject extraCost = JSONObject.parseObject(jsonObject.getString("ExtraCost"));
+ model.addAttribute("ExtraCost",extraCost);
+ return PREFIX + "tSystemConfigPriceRules.html";
+ }
+ /**
+ * 跳转到余额规则
+ */
+ @RequestMapping("/balanceRules")
+ public String balanceRules(Model model) {
+ TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 6)
+ .last("LIMIT 1"));
+ JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
+ model.addAttribute("num1",jsonObject.getInteger("num1"));
+ model.addAttribute("num2",jsonObject.getInteger("num2"));
+ return PREFIX + "tSystemConfigBalanceRules.html";
+ }
+ /**
+ * 跳转到客服管理
+ */
+ @RequestMapping("/serviceMgmt")
+ public String serviceMgmt(Model model) {
+ TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 7)
+ .last("LIMIT 1"));
+ JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
+ model.addAttribute("num1",jsonObject.getString("num1"));
+ return PREFIX + "tSystemConfigServiceMgmt.html";
+ }
+
+
+ /**
* 获取列表
*/
@RequestMapping(value = "/systemConfigSubmit")
@@ -100,6 +188,8 @@
TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", type)
.last("LIMIT 1"));
+ System.err.println(content);
+
tSystemConfig.setContent(content);
return tSystemConfigService.updateById(tSystemConfig);
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
index 67d6940..3074beb 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
@@ -95,6 +95,10 @@
@TableField(value = "cancelCount")
private Integer cancelCount;
+ @ApiModelProperty(value = "是否拥有9折优惠 1是 0否")
+ @TableField(value = "havDiscount")
+ private Integer havDiscount;
+
@TableField(exist = false)
@ApiModelProperty(value = "注册开始时间")
private Date startTime;
@@ -103,6 +107,14 @@
@ApiModelProperty(value = "注册结束时间")
private Date endTime;
+ public Integer getHavDiscount() {
+ return havDiscount;
+ }
+
+ public void setHavDiscount(Integer havDiscount) {
+ this.havDiscount = havDiscount;
+ }
+
public Integer getCancelCount() {
return cancelCount;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 0cb939b..8396d4b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -83,6 +84,12 @@
TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
model.addAttribute("userName",tAppUser.getNickname());
model.addAttribute("userPhone",tAppUser.getPhone());
+ model.addAttribute("havDiscount",tAppUser.getHavDiscount());
+ if(1 == tAppUser.getHavDiscount()){
+ // 计算9折优惠金额
+ BigDecimal multiply = tOrder.getOrderMoney().multiply(new BigDecimal("0.1")).setScale(2);
+ model.addAttribute("multiply",multiply);
+ }
// 查询司机
TDriver tDriver = tDriverMapper.selectById(tOrder.getDriverId());
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
index 137a268..7320bcd 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
@@ -164,6 +164,16 @@
</div>
</div>
+ @if(havDiscount == 1){
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <label class="control-label" >9折优惠:</label>
+ <label>${multiply}</label>
+ <label>元</label>
+ </div>
+ </div>
+ @}
+
<div class="hidden-xs" id="TDriverTableToolbar" role="group" style="text-align: center">
<#button name="取消" icon="fa-plus" clickFun="TOrderInfoDlg.close()" />
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html
new file mode 100644
index 0000000..95026ce
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html
@@ -0,0 +1,55 @@
+@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">
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >司机余额规则:</label>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <span class="control-label" >余额低于</span>
+ <input class="control-label" id="num1" name="num1" value="${num1}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元,停止接单</span>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >用户充值规则:</label>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >余额充值满</span>
+ <input class="control-label" id="num2" name="num2" value="${num2}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元,获得9折优惠权限</span>
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10" style="text-align: center">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemConfig.balanceRulesSubmit()"/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html
index 992ac90..02b4f47 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html
@@ -10,43 +10,43 @@
<div class="col-sm-12">
<div class="initialLevel col-sm-12 control-label form-group" >
- <div class="initialLevel col-sm-3 control-label form-group" >
+ <div class="initialLevel col-sm-12 control-label form-group" >
<label class="control-label" >佣金分成规则:</label>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
- <div class="initialLevel col-sm-3 control-label form-group" >
- <label class="control-label" >司机邀请1名用户,下单后完成订单后获得</label>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >司机邀请1名用户,下单后完成订单后获得</span>
<input class="control-label" id="num1" name="num1" value="${num1}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >元/单</label>
+ <span class="control-label" >元/单</span>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
- <div class="initialLevel col-sm-3 control-label form-group" >
- <label class="control-label" >司机A邀请1名司机B,完成有效单后获得</label>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >司机A邀请1名司机B,完成有效单后获得</span>
<input class="control-label" id="num2" name="num2" value="${num2}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >元/单</label>
+ <span class="control-label" >元/单</span>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
- <div class="initialLevel col-sm-4 control-label form-group" >
- <label class="control-label" >司机B邀请1名司机C,完成有效单后B获得</label>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >司机B邀请1名司机C,完成有效单后B获得</span>
<input class="control-label" id="num3" name="num3" value="${num3}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >元/单+' '+司机A获得</label>
+ <span class="control-label" >元/单 司机A获得</span>
<input class="control-label" id="num4" name="num4" value="${num4}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >元/单</label>
+ <span class="control-label" >元/单</span>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
- <div class="initialLevel col-sm-5 control-label form-group" >
- <label class="control-label" >司机C邀请1名司机D,完成有效单后C获得</label>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >司机C邀请1名司机D,完成有效单后C获得</span>
<input class="control-label" id="num5" name="num5" value="${num5}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >元/单+' '+司机B获得</label>
+ <span class="control-label" >元/单 司机B获得</span>
<input class="control-label" id="num6" name="num6" value="${num6}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >元/单+' '+司机A获得</label>
+ <span class="control-label" >元/单 司机A获得</span>
<input class="control-label" id="num7" name="num7" value="${num7}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >元/单</label>
+ <span class="control-label" >元/单</span>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
index 3eddf96..df577a6 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
@@ -15,25 +15,25 @@
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >派单距离第一轮</label>
+ <span class="control-label" >派单距离第一轮</span>
<input class="control-label" id="num1" name="num1" value="${num1}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >米</label>
+ <span class="control-label" >米</span>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >派单距离第二轮</label>
+ <span class="control-label" >派单距离第二轮</span>
<input class="control-label" id="num2" name="num2" value="${num2}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >米</label>
+ <span class="control-label" >米</span>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >派单距离第三轮</label>
+ <span class="control-label" >派单距离第三轮</span>
<input class="control-label" id="num3" name="num3" value="${num3}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >米</label>
+ <span class="control-label" >米</span>
</div>
</div>
@@ -43,11 +43,11 @@
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >接单时间</label>
+ <span class="control-label" >接单时间</span>
<input class="control-label" id="num4" name="num4" value="${num4}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >秒</label>
+ <span class="control-label" >秒</span>
</div>
</div>
@@ -57,11 +57,11 @@
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: right" >
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >改派后暂停接单</label>
+ <span class="control-label" >改派后暂停接单</span>
<input class="control-label" id="num5" name="num5" value="${num5}" type="number" style="height: 30px;width: 80px">
- <label class="control-label" >分钟</label>
+ <span class="control-label" >分钟</span>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
new file mode 100644
index 0000000..8146d46
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
@@ -0,0 +1,57 @@
+@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">
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >平台抽成:</label>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >司机订单保险费,每天固定抽取</span>
+ <input class="control-label" id="num1" name="num1" value="${num1}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元/天</span>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >代理商抽成:</label>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >抽成,每笔订单满</span>
+ <input class="control-label" id="num2" name="num2" value="${num2}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元/单,抽取</span>
+ <input class="control-label" id="num3" name="num3" value="${num3}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10" style="text-align: center">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemConfig.extractionRulesSubmit()"/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigIntegralRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigIntegralRules.html
new file mode 100644
index 0000000..9f77639
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigIntegralRules.html
@@ -0,0 +1,101 @@
+@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">
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >积分获取:</label>
+ </div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-4 control-label form-group" >
+ <span class="control-label" >有效时长</span>
+ <input class="control-label" id="num1" name="num1" value="${num1}" type="text" style="height: 30px;width: 80px" placeholder="12:00">
+ <span class="control-label" >——</span>
+ <input class="control-label" id="num2" name="num2" value="${num2}" type="text" style="height: 30px;width: 80px" placeholder="23:00">
+ <span class="control-label" >每小时增加</span>
+ <input class="control-label" id="num3" name="num3" value="${num3}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >推荐用户首次下单,完成订单后</span>
+ <input class="control-label" id="num4" name="num4" value="${num4}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >司机完成订单,获得</span>
+ <input class="control-label" id="num5" name="num5" value="${num5}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >获得5星好评,获得</span>
+ <input class="control-label" id="num6" name="num6" value="${num6}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >邀请司机注册成功获得</span>
+ <input class="control-label" id="num7" name="num7" value="${num7}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >恶劣天气完成订单获得</span>
+ <input class="control-label" id="num8" name="num8" value="${num8}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >积分扣除:</label>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <span class="control-label" >差评扣除</span>
+ <input class="control-label" id="num9" name="num9" value="${num9}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <span class="control-label" >拒绝订单扣除</span>
+ <input class="control-label" id="num10" name="num10" value="${num10}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >积分</span>
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10" style="text-align: center">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemConfig.integralRulesSubmit()"/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
new file mode 100644
index 0000000..c26285f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
@@ -0,0 +1,116 @@
+@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">
+
+ <hr/>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div style="background-color: gray;height: 35px;line-height: 35px">
+ <label style="color: #0C0C0C">基础费用</label>
+ </div>
+ </div>
+ <hr/>
+
+ <input hidden id="array" value="${array}">
+
+ <div class="initialLevel col-sm-12 control-label form-group" id="rules" style="text-align: left" >
+ @for(ChargeStandard in array){
+ <div name="rulesForm">
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >时间段</span>
+ <input class="control-label" id="num1" name="num1" value="${ChargeStandard.num1}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <span class="control-label" >——</span>
+ <input class="control-label" id="num2" name="num2" value="${ChargeStandard.num2}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <span class="control-label" >代驾里程</span>
+ <input class="control-label" id="num3" name="num3" value="${ChargeStandard.num3}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >——</span>
+ <input class="control-label" id="num4" name="num4" value="${ChargeStandard.num4}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,起步价</span>
+ <input class="control-label" id="num5" name="num5" value="${ChargeStandard.num5}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出里程每</span>
+ <input class="control-label" id="num6" name="num6" value="${ChargeStandard.num6}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收费</span>
+ <input class="control-label" id="num7" name="num7" value="${ChargeStandard.num7}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+
+ @if(ChargeStandard.key == 0){
+ <span class="fa fa-plus" onclick="TSystemConfig.addBox()"></span>
+ @}
+ @if(ChargeStandard.key == 1){
+ <span class="fa fa-remove" onclick="TSystemConfig.delBox(this)"></span>
+ @}
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >代驾里程</span>
+ <input class="control-label" id="num8" name="num8" value="${ChargeStandard.num8}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >——</span>
+ <input class="control-label" id="num9" name="num9" value="${ChargeStandard.num9}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,起步价</span>
+ <input class="control-label" id="num10" name="num10" value="${ChargeStandard.num10}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出里程每</span>
+ <input class="control-label" id="num11" name="num11" value="${ChargeStandard.num11}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收费</span>
+ <input class="control-label" id="num12" name="num12" value="${ChargeStandard.num12}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
+ @}
+ </div>
+
+ <hr/>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div style="background-color: gray;height: 35px;line-height: 35px">
+ <label style="color: #0C0C0C">额外费用</label>
+ </div>
+ </div>
+ <hr/>
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >等待</span>
+ <input class="control-label" id="num13" name="num13" value="${ExtraCost.num1}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <span class="control-label" >分钟,收取</span>
+ <input class="control-label" id="num14" name="num14" value="${ExtraCost.num2}" type="text" placeholder="00:00" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出</span>
+ <input class="control-label" id="num15" name="num15" value="${ExtraCost.num3}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >分钟,收取</span>
+ <input class="control-label" id="num16" name="num16" value="${ExtraCost.num4}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元/分钟</span>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <span class="control-label" >恶劣天气</span>
+ <input class="control-label" id="num17" name="num17" value="${ExtraCost.num5}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >公里以内,加收</span>
+ <input class="control-label" id="num18" name="num18" value="${ExtraCost.num6}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元,超出</span>
+ <input class="control-label" id="num19" name="num19" value="${ExtraCost.num7}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >公里,收取订单的</span>
+ <input class="control-label" id="num20" name="num20" value="${ExtraCost.num8}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >倍计费,最高收取</span>
+ <input class="control-label" id="num21" name="num21" value="${ExtraCost.num9}" type="number" style="height: 30px;width: 80px">
+ <span class="control-label" >元</span>
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10" style="text-align: center">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemConfig.priceRulesSubmit()"/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigServiceMgmt.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigServiceMgmt.html
new file mode 100644
index 0000000..debdc4e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigServiceMgmt.html
@@ -0,0 +1,34 @@
+@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">
+
+
+ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <span class="control-label" >客服电话</span>
+ <input class="control-label" id="num1" name="num1" value="${num1}" type="number" style="height: 30px;width: 160px">
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10" style="text-align: center">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemConfig.serviceMgmtSubmit()"/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
+<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
index 50e2d17..808eb76 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
@@ -122,9 +122,179 @@
reqData['num6'] = Number($("#num6").val());
reqData['num7'] = Number($("#num7").val());
ajax.set("content",JSON.stringify(reqData));
- ajax.set("type",1);
+ ajax.set("type",2);
ajax.start();
};
+/**
+ * 抽成规则
+ */
+TSystemConfig.extractionRulesSubmit = function () {
+ var ajax = new $ax(Feng.ctxPath + "/tSystemConfig/systemConfigSubmit", function (data) {
+ Feng.success("保存成功!");
+ TSystemConfig.table.refresh();
+ }, function (data) {
+ Feng.error("保存失败!" + data.responseJSON.message + "!");
+ });
+ var reqData = {};
+ reqData['num1'] = Number($("#num1").val());
+ reqData['num2'] = Number($("#num2").val());
+ reqData['num3'] = Number($("#num3").val());
+ ajax.set("content",JSON.stringify(reqData));
+ ajax.set("type",3);
+ ajax.start();
+};
+
+/**
+ * 积分规则
+ */
+TSystemConfig.integralRulesSubmit = function () {
+ var ajax = new $ax(Feng.ctxPath + "/tSystemConfig/systemConfigSubmit", function (data) {
+ Feng.success("保存成功!");
+ TSystemConfig.table.refresh();
+ }, function (data) {
+ Feng.error("保存失败!" + data.responseJSON.message + "!");
+ });
+ var reqData = {};
+ reqData['num1'] = $("#num1").val();
+ reqData['num2'] = $("#num2").val();
+ reqData['num3'] = Number($("#num3").val());
+ reqData['num4'] = Number($("#num4").val());
+ reqData['num5'] = Number($("#num5").val());
+ reqData['num6'] = Number($("#num6").val());
+ reqData['num7'] = Number($("#num7").val());
+ reqData['num8'] = Number($("#num8").val());
+ reqData['num9'] = Number($("#num9").val());
+ reqData['num10'] = Number($("#num10").val());
+ ajax.set("content",JSON.stringify(reqData));
+ ajax.set("type",4);
+ ajax.start();
+};
+
+/**
+ * 价格规则
+ */
+TSystemConfig.priceRulesSubmit = function () {
+ var ajax = new $ax(Feng.ctxPath + "/tSystemConfig/systemConfigSubmit", function (data) {
+ Feng.success("保存成功!");
+ TSystemConfig.table.refresh();
+ }, function (data) {
+ Feng.error("保存失败!" + data.responseJSON.message + "!");
+ });
+
+ var json1=[];
+ for (let i = 0; i < $('input[name="num1"]').length; i++) {
+ var arr = {}
+ arr['num1'] = $($('input[name="num1"]')[i]).val();
+ arr['num2'] = $($('input[name="num2"]')[i]).val();
+ arr['num3'] = Number($($('input[name="num3"]')[i]).val());
+ arr['num4'] = Number($($('input[name="num4"]')[i]).val());
+ arr['num5'] = Number($($('input[name="num5"]')[i]).val());
+ arr['num6'] = Number($($('input[name="num6"]')[i]).val());
+ arr['num7'] = Number($($('input[name="num7"]')[i]).val());
+ arr['num8'] = Number($($('input[name="num8"]')[i]).val());
+ arr['num9'] = Number($($('input[name="num9"]')[i]).val());
+ arr['num10'] = Number($($('input[name="num10"]')[i]).val());
+ arr['num11'] = Number($($('input[name="num11"]')[i]).val());
+ arr['num12'] = Number($($('input[name="num12"]')[i]).val());
+ json1.push(arr)
+ }
+
+ var ExtraCost = {};
+ ExtraCost['num1'] = Number($('#num13').val());
+ ExtraCost['num2'] = Number($('#num14').val());
+ ExtraCost['num3'] = Number($('#num15').val());
+ ExtraCost['num4'] = Number($('#num16').val());
+ ExtraCost['num5'] = Number($('#num17').val());
+ ExtraCost['num6'] = Number($('#num18').val());
+ ExtraCost['num7'] = Number($('#num19').val());
+ ExtraCost['num8'] = Number($('#num20').val());
+ ExtraCost['num9'] = Number($('#num21').val());
+
+ var reqData = {};
+ reqData['ChargeStandard'] = json1;
+ reqData['ExtraCost'] = ExtraCost;
+ ajax.set("content",JSON.stringify(reqData));
+ ajax.set("type",5);
+ ajax.start();
+};
+
+/**
+ * 余额规则
+ */
+TSystemConfig.balanceRulesSubmit = function () {
+ var ajax = new $ax(Feng.ctxPath + "/tSystemConfig/systemConfigSubmit", function (data) {
+ Feng.success("保存成功!");
+ TSystemConfig.table.refresh();
+ }, function (data) {
+ Feng.error("保存失败!" + data.responseJSON.message + "!");
+ });
+ var reqData = {};
+ reqData['num1'] = Number($("#num1").val());
+ reqData['num2'] = Number($("#num2").val());
+ ajax.set("content",JSON.stringify(reqData));
+ ajax.set("type",6);
+ ajax.start();
+};
+
+/**
+ * 客服管理
+ */
+TSystemConfig.serviceMgmtSubmit = function () {
+ var ajax = new $ax(Feng.ctxPath + "/tSystemConfig/systemConfigSubmit", function (data) {
+ Feng.success("保存成功!");
+ TSystemConfig.table.refresh();
+ }, function (data) {
+ Feng.error("保存失败!" + data.responseJSON.message + "!");
+ });
+ var reqData = {};
+ reqData['num1'] = $("#num1").val();
+ ajax.set("content",JSON.stringify(reqData));
+ ajax.set("type",7);
+ ajax.start();
+};
+
+TSystemConfig.addBox = function (){
+ var i = $('input[name="num1"]').length + 1;
+ var a ="<div>\n" +
+ " <div class=\"initialLevel col-sm-12 control-label form-group\" >\n" +
+ " <span class=\"control-label\" >时间段</span>\n" +
+ " <input class=\"control-label\" id=\"num1-"+i+"\" name=\"num1\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >——</span>\n" +
+ " <input class=\"control-label\" id=\"num2-"+i+"\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >代驾里程</span>\n" +
+ " <input class=\"control-label\" id=\"num3-"+i+"\" name=\"num3\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >——</span>\n" +
+ " <input class=\"control-label\" id=\"num4-"+i+"\" name=\"num4\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里,起步价</span>\n" +
+ " <input class=\"control-label\" id=\"num5-"+i+"\" name=\"num5\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >元,超出里程每</span>\n" +
+ " <input class=\"control-label\" id=\"num6-"+i+"\" name=\"num6\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里,收费</span>\n" +
+ " <input class=\"control-label\" id=\"num7-"+i+"\" name=\"num7\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >元</span>\n" +
+ " <span class=\"fa fa-remove\" onclick=\"TSystemConfig.delBox(this)\"></span>\n" +
+ " </div>\n" +
+ " <div class=\"initialLevel col-sm-12 control-label form-group\" >\n" +
+ " <span class=\"control-label\" >代驾里程</span>\n" +
+ " <input class=\"control-label\" id=\"num8-"+i+"\" name=\"num8\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >——</span>\n" +
+ " <input class=\"control-label\" id=\"num9-"+i+"\" name=\"num9\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里,起步价</span>\n" +
+ " <input class=\"control-label\" id=\"num10-"+i+"\" name=\"num10\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >元,超出里程每</span>\n" +
+ " <input class=\"control-label\" id=\"num11-"+i+"\" name=\"num11\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里,收费</span>\n" +
+ " <input class=\"control-label\" id=\"num12-"+i+"\" name=\"num12\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >元</span>\n" +
+ " </div>\n" +
+ " </div>"
+
+ $("#rules").append($(a))
+}
+
+TSystemConfig.delBox = function (o) {
+ $(o).parent("div").parent("div").remove()
+};
/**
* 查询列表
--
Gitblit v1.7.1