From 67ac6f18da66cc5b703e1ec849e96bdac586d6d1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 10 五月 2023 18:16:26 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 50 +++++++-----
management/guns-admin/src/main/webapp/static/modular/system/role/role.js | 8 ++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBillMapper.xml | 2
management/guns-admin/src/main/resources/application.yml | 14 +-
management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html | 6
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js | 10 +-
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java | 2
management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js | 31 ++++++-
management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js | 4 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderRefusalController.java | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml | 3
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 5 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 7 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetail.html | 7 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java | 17 +++
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js | 8 ++
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html | 1
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java | 2
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js | 4 +
20 files changed, 132 insertions(+), 53 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
index d6a3819..25e4ecc 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -158,7 +158,11 @@
int count = tAgentService.selectCount(new EntityWrapper<TAgent>().eq("provinceName", split1[0]).eq("cityName",split1[1]));
if(count>0){
return new SuccessTip(500,"该代理商已存在!");
+
}
+
+ tAgent.setPrincipal(tAgent.getPrincipal().replace(" ",""));
+
String[] split = tAgent.getAreaId().split("/");
// 查询省市
@@ -219,6 +223,7 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TAgent tAgent) {
+ tAgent.setPrincipal(tAgent.getPrincipal().replace(" ",""));
tAgentService.updateById(tAgent);
return SUCCESS_TIP;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
index 170c2b7..22915a7 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -273,6 +273,7 @@
if(Objects.nonNull(o)){
return o;
}
+ tBranchOffice.setPrincipal(tBranchOffice.getPrincipal().replace(" ",""));
tBranchOffice.setStatus(StatusEnum.NORMAL.getCode());
tBranchOfficeService.insert(tBranchOffice);
@@ -308,6 +309,7 @@
if(Objects.nonNull(o)){
return o;
}
+ tBranchOffice.setPrincipal(tBranchOffice.getPrincipal().replace(" ",""));
tBranchOfficeService.updateById(tBranchOffice);
return SUCCESS_TIP;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 85ce7e6..2ed33c1 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -191,8 +191,7 @@
* @return
*/
@RequestMapping("/auditPage")
- public String auditPage( Integer id,
- Model model) {
+ public String auditPage( Integer id,Model model) {
tDriverService.auditPage(id,model);
return PREFIX + "tDriverAudit.html";
}
@@ -430,6 +429,8 @@
return o;
}
// 默认值板块
+ tDriver.setName(tDriver.getName().replace(" ",""));
+ tDriver.setEmergencyContact(tDriver.getEmergencyContact().replace(" ",""));
tDriver.setCode(UUIDUtil.getNumberRandom(16));
tDriver.setBalance(BigDecimal.ZERO);
tDriver.setBackgroundBalance(BigDecimal.ZERO);
@@ -511,6 +512,8 @@
if(Objects.nonNull(o)){
return o;
}
+ tDriver.setName(tDriver.getName().replace(" ",""));
+ tDriver.setEmergencyContact(tDriver.getEmergencyContact().replace(" ",""));
tDriverService.updateById(tDriver);
return SUCCESS_TIP;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
index 0033e18..f72a8aa 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
@@ -140,9 +140,22 @@
.eq("agentId", agentId)
.eq("serverStatus", 2));
map.put("onLineDriverCount",onLineDriver.size());
- tOrderService.getDataStatisticsCountGetMap(agentId,map);
+// tOrderService.getDataStatisticsCountGetMap(agentId,map);
+// // 查询服务中的订单列表
+// List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerList(agentId);
+// // 查询司机
+// for (TOrderServerResp tOrderServerResp : orderServerRespList) {
+// TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
+// tOrderServerResp.setAvatar(tDriver.getAvatar());
+// tOrderServerResp.setDriverName(tDriver.getName());
+// }
+// map.put("serverList",orderServerRespList);
+ List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
+ List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
+ tOrderService.getDataStatisticsCountByIdsGetMap(allIds,map);
+
// 查询服务中的订单列表
- List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerList(agentId);
+ List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
index dd26dcb..c8adb8c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
@@ -198,7 +198,7 @@
EntityWrapper<TOrder> wrapper = new EntityWrapper<>();
if(Objects.nonNull(userId)){
- wrapper.eq("user_id",userId);
+ wrapper.eq("userId",userId);
}
List<TOrder> tOrders = tOrderService.selectList(wrapper);
for (TOrder tOrder : tOrders) {
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderRefusalController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderRefusalController.java
index 54abb53..6342b9e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderRefusalController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderRefusalController.java
@@ -64,7 +64,7 @@
public Object list(String condition) {
EntityWrapper<TOrderRefusal> wrapper = new EntityWrapper<>();
if(StringUtils.hasLength(condition)){
- wrapper.eq("order_id",condition);
+ wrapper.eq("driver_id",condition);
}
return tOrderRefusalService.selectList(wrapper);
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBillMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBillMapper.xml
index ef6f6e9..6eb09f4 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBillMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBillMapper.xml
@@ -43,7 +43,7 @@
AND b.billType = #{billType}
</if>
<if test="billHeaderType != null">
- AND b.billHeaderType = #{addresseePhone}
+ AND b.billHeaderType = #{billHeaderType}
</if>
<if test="roleType != null and roleType == 2">
AND o.branchOfficeId = #{objectId}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
index 45529a0..b5fbc23 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
@@ -99,9 +99,6 @@
<if test="driverName != null and driverName != ''">
AND d.name LIKE concat('%',#{driverName},'%')
</if>
- <if test="isException != null">
- AND a.is_exception = #{isException}
- </if>
<if test="roleType != null and roleType == 2">
AND o.branchOfficeId = #{objectId}
</if>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index b44288e..9adcdc1 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -70,6 +70,8 @@
@Autowired
private TRegionMapper tRegionMapper;
@Autowired
+ private TRevenueMapper tRevenueMapper;
+ @Autowired
private ITRegionService itRegionService;
@Autowired
private HttpUtils httpUtils;
@@ -140,11 +142,11 @@
}
//累计订单量
List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
tDriverResp.setCumulativeOrderCount(cumulativeOrderCount.size());
//当月订单量
List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))
&& new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
tDriverResp.setMonthOrderCount(monthOrderCount.size());
// 拒单次数
@@ -248,11 +250,11 @@
if(!CollectionUtils.isEmpty(tOrders)){
//累计订单量
List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
model.addAttribute("cumulativeOrderCount",cumulativeOrderCount.size());
//当月订单量
List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))
&& new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
model.addAttribute("monthOrderCount",monthOrderCount.size());
// 拒单次数
@@ -264,25 +266,29 @@
.eq("userDriverId", tDriver.getId())
.eq("state", 2));
BigDecimal balance = tDriver.getBalance();
- if(!CollectionUtils.isEmpty(tCashWithdrawals)){
- Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
- if(reduce.isPresent()){
- balance = balance.add(reduce.get());
- }
- }
- List<TRechargeRecord> tRechargeRecords = tRechargeRecordMapper.selectList(new EntityWrapper<TRechargeRecord>()
- .eq("type", UserTypeEnum.DRIVER.getCode())
- .eq("userId", tDriver.getId())
- .eq("payType", 1)
- .eq("payStatus", PayStatusEnum.FINISH.getCode()));
- if(!CollectionUtils.isEmpty(tRechargeRecords)){
- Optional<BigDecimal> reduce = tRechargeRecords.stream().map(TRechargeRecord::getAmount).reduce(BigDecimal::add);
- if(reduce.isPresent()){
- balance = balance.subtract(reduce.get());
- }
- }
+// if(!CollectionUtils.isEmpty(tCashWithdrawals)){
+// Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
+// if(reduce.isPresent()){
+// balance = balance.add(reduce.get());
+// }
+// }
+// List<TRechargeRecord> tRechargeRecords = tRechargeRecordMapper.selectList(new EntityWrapper<TRechargeRecord>()
+// .eq("type", UserTypeEnum.DRIVER.getCode())
+// .eq("userId", tDriver.getId())
+// .eq("payType", 1)
+// .eq("payStatus", PayStatusEnum.FINISH.getCode()));
+// if(!CollectionUtils.isEmpty(tRechargeRecords)){
+// Optional<BigDecimal> reduce = tRechargeRecords.stream().map(TRechargeRecord::getAmount).reduce(BigDecimal::add);
+// if(reduce.isPresent()){
+// balance = balance.subtract(reduce.get());
+// }
+// }
+ List<TRevenue> tRevenues = tRevenueMapper.selectList(new EntityWrapper<TRevenue>()
+ .eq("userType", 2)
+ .eq("userId", tDriver.getId()));
+ Optional<BigDecimal> reduce = tRevenues.stream().map(TRevenue::getAmount).reduce(BigDecimal::add);
// 减去充值金额
- model.addAttribute("cumulativeIncome",balance);
+ reduce.ifPresent(bigDecimal -> model.addAttribute("cumulativeIncome", bigDecimal));
}else {
model.addAttribute("cumulativeOrderCount",0);
model.addAttribute("monthOrderCount",0);
diff --git a/management/guns-admin/src/main/resources/application.yml b/management/guns-admin/src/main/resources/application.yml
index ff217c0..d6dc1df 100644
--- a/management/guns-admin/src/main/resources/application.yml
+++ b/management/guns-admin/src/main/resources/application.yml
@@ -15,7 +15,7 @@
spring:
profiles:
- active: local
+ active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -62,10 +62,10 @@
spring:
profiles: local
datasource:
- url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.110.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
username: root
- password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
-# password: 123456
+# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+ password: 123456
db-name: super_save_driving #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -87,10 +87,10 @@
spring:
profiles: produce
datasource:
- url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
username: root
- password: Root2020!
- db-name: mask #用来搜集数据库的所有表
+ password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+ db-name: super_save_driving #用来搜集数据库的所有表
filters: wall,mergeStat
---
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
index 316cf85..31b0863 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
@@ -14,6 +14,7 @@
</div>
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="Role.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="Role.resetSearch()" space="true"/>
</div>
</div>
<div class="hidden-xs" id="roleTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetail.html
index 2fa1341..db67408 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetail.html
@@ -8,6 +8,7 @@
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
+ <input hidden id="id" value="${id}">
<hr/>
<div class="initialLevel col-sm-12 control-label form-group" >
<div style="background-color: gray;height: 35px;line-height: 35px">
@@ -173,5 +174,11 @@
type: 'date',
range: true
});
+ $(function (){
+ var queryData = {};
+ queryData['condition'] = $("#condition").val();
+ queryData['userId'] = $("#id").val();
+ TAppUserDetailOrderTable.table.refresh({query: queryData});
+ })
</script>
@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html
index 30d59d9..ec6aa84 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html
@@ -156,7 +156,7 @@
<script type="text/javascript">
$(function () {
var queryData = {};
- queryData['condition'] = $("#driverId").val();;
+ queryData['condition'] = $("#driverId").val();
TOrderRefusal.table.refresh({query: queryData});
});
laydate.render({
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html
index 5cc6243..4f13788 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html
@@ -38,12 +38,12 @@
<#button name="重置" icon="fa-trash" clickFun="TEvaluate.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
- @if(shiro.hasPermission("/tEvaluate/export")){
- <#button name="导出" icon="" clickFun="TEvaluate.export()"/>
- @}
</div>
</div>
<div class="hidden-xs" id="TEvaluateTableToolbar" role="group">
+ @if(shiro.hasPermission("/tEvaluate/export")){
+ <#button name="导出" icon="" clickFun="TEvaluate.export()"/>
+ @}
@if(shiro.hasPermission("/tEvaluate/add")){
<#button name="添加" icon="fa-plus" clickFun="TEvaluate.openAddTEvaluate()"/>
@}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/role/role.js b/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
index c595da2..fa1bbca 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
@@ -125,6 +125,14 @@
Role.table.refresh({query: queryData});
}
+/**
+ * 重置
+ */
+Role.resetSearch = function (){
+ $("#roleName").val('');
+ Role.search();
+}
+
$(function () {
var defaultColunms = Role.initColumn();
var table = new BSTable(Role.id, "/role/list", defaultColunms);
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
index b0c4ab7..af14472 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
@@ -8,6 +8,10 @@
validators: {
notEmpty: {
message: '负责人姓名不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js
index 45518a3..297f7d8 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js
@@ -94,11 +94,11 @@
/**
* 查询列表
*/
-TAppUserDetailOrderTable.search = function () {
- var queryData = {};
- queryData['condition'] = $("#condition").val();
- TAppUserDetailOrderTable.table.refresh({query: queryData});
-};
+// TAppUserDetailOrderTable.search = function () {
+// var queryData = {};
+// queryData['condition'] = $("#condition").val();
+// TAppUserDetailOrderTable.table.refresh({query: queryData});
+// };
$(function () {
var defaultColunms = TAppUserDetailOrderTable.initColumn();
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
index 6eb829c..a51016d 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
@@ -15,6 +15,10 @@
validators: {
notEmpty: {
message: '负责人姓名不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
index 460e601..76187a7 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
@@ -8,6 +8,10 @@
validators: {
notEmpty: {
message: '姓名不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
@@ -26,6 +30,10 @@
validators: {
notEmpty: {
message: '紧急联系人姓名不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js b/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js
index 6db31dc..bd90b98 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js
@@ -50,8 +50,28 @@
}
}
},
- {title: '金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
- {title: '佣金提成', field: 'commissionAmount', visible: true, align: 'center', valign: 'middle'},
+ {title: '金额', field: 'amount', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.businessType === 1){
+ return '+'+row.amount
+ }else{
+ return '-'+row.amount
+ }
+ }
+ },
+ {title: '佣金抽成', field: 'commissionAmount', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.businessType === 1){
+ if(row.commissionAmount !== 0){
+ return '-'+row.commissionAmount
+ }else {
+ return 0
+ }
+ }else {
+ return ''
+ }
+ }
+ },
{title: '优惠券', field: 'discountedPrice', visible: true, align: 'center', valign: 'middle'},
{title: '余额', field: 'accountBalance', visible: true, align: 'center', valign: 'middle'},
{title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
@@ -68,11 +88,11 @@
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
if (row.businessType === 1){
- return '<a href="#" onclick="TRevenue.searchTRevenueOrderDetail('+row.code+')" style="color:blue">详情</a>'
+ return '<a href="#" onclick="TRevenue.searchTRevenueOrderDetail('+row.code.toString()+')" style="color:blue">详情</a>'
}else if (row.businessType === 11){
- return '<a href="#" onclick="TRevenue.searchTRevenueCommissionDetail('+row.code+')" style="color:blue">详情</a>'
+ return '<a href="#" onclick="TRevenue.searchTRevenueCommissionDetail('+row.code.toString()+')" style="color:blue">详情</a>'
}else if (row.businessType === 12){
- return '<a href="#" onclick="TRevenue.searchTRevenueBalanceDetail('+row.code+')" style="color:blue">详情</a>'
+ return '<a href="#" onclick="TRevenue.searchTRevenueBalanceDetail('+row.code.toString()+')" style="color:blue">详情</a>'
}
}
}
@@ -159,6 +179,7 @@
* 打开查看支付订单详情(使用中)
*/
TRevenue.searchTRevenueOrderDetail = function (code) {
+ console.log(code)
var index = layer.open({
type: 2,
title: '支付订单详情',
--
Gitblit v1.7.1