From 4e8951a439c03e87568789cedeb62033884412db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java | 11
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 15
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 116 ++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java | 10
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBillServiceImpl.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html | 7
management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html | 6
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html | 41
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java | 8
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverStartAndStop.html | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java | 8
management/guns-admin/src/main/webapp/WEB-INF/view/home.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverExceptionStartAndStop.html | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java | 11
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemBulletinController.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_add.html | 9
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaAdd.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js | 12
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java | 6
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html | 36
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html | 41
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAppUserServiceImpl.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html | 2
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 | 34
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html | 10
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tCommercial/tCommercial.js | 6
management/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js | 1
management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html | 12
management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java | 11
management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html | 49
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html | 39
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java | 23
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html | 9
management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html | 2
management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js | 22
management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js | 31
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java | 2
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js | 3
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TOrderServerResp.java | 8
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js | 46
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html | 26
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java | 24
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html | 6
management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html | 27
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 71 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TBillMapper.xml | 2
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js | 14
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 64 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderRefusalController.java | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 26
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html | 24
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html | 56
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 88 ++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml | 1
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html | 14
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js | 24
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TEvaluateServiceImpl.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js | 4
management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js | 5
management/guns-admin/src/main/webapp/static/modular/system/tEdition/tEdition.js | 12
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html | 32
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js | 15
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStop.html | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 14
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html | 4
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js | 4
management/guns-admin/src/main/webapp/static/modular/system/role/role.js | 25
management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaAdd.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js | 43
management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html | 12
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml | 31
management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html | 6
management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js | 17
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaUpdate.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 52 +
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 | 115 ++
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html | 11
management/guns-admin/src/main/webapp/WEB-INF/view/login.html | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java | 3
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 28
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html | 24
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml | 17
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java | 11
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 14
management/guns-admin/src/main/resources/application.yml | 14
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 7
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js | 7
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaUpdate.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html | 14
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStopException.html | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html | 48
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html | 21
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html | 2
160 files changed, 1,410 insertions(+), 651 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 2ab5aa8..6c988c0 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
@@ -5,6 +5,7 @@
import com.stylefeng.guns.core.base.tips.SuccessTip;
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.exception.ServiceExceptionEnum;
+import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.controller.resp.TAgentResp;
import com.stylefeng.guns.modular.system.controller.util.ExcelUtil;
@@ -13,6 +14,7 @@
import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -56,12 +58,20 @@
@Autowired
private ITRegionService tRegionService;
+ @Autowired
+ private ITDriverService tDriverService;
+ @Autowired
+ private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private RedisUtil redisUtil;
+
/**
* 跳转到首页
*/
@RequestMapping("")
- public String index() {
+ public String index(Model model) {
+ model.addAttribute("userType", Objects.requireNonNull(ShiroKit.getUser()).getRoleType());
return PREFIX + "tAgent.html";
}
@@ -127,8 +137,8 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(String principal,String principalPhone,String createTime) {
- EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime);
+ public Object list(String principal,String principalPhone,String createTime,Integer status) {
+ EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime,status);
List<TAgent> tAgents = tAgentService.selectList(wrapper);
// 代理商列表数据封装（导出共用）
return tAgentService.getAgentResp(tAgents);
@@ -155,7 +165,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("/");
// 查询省市
@@ -195,6 +209,33 @@
tAgent.setStatus(1);
}
tAgentService.updateById(tAgent);
+ // 冻结下面所有的司机
+ List<TDriver> list = tDriverService.selectList(new EntityWrapper<TDriver>()
+ .eq("agentId", id));
+ for (TDriver tDriver : list) {
+ if(1 == status){
+ tDriver.setStatus(2);
+ String value = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ redisUtil.remove(value);
+ redisUtil.remove("DRIVER_" + tDriver.getPhone());
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", tDriver.getId())
+ .eq("status", 1)
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ tDriverWork.setStatus(2);
+ tDriverWork.setOffWorkTime(new Date());
+ tDriverWorkService.updateById(tDriverWork);
+ }
+ }
+ if(2 == status){
+ tDriver.setStatus(1);
+ }
+ }
+ if(!CollectionUtils.isEmpty(list)){
+ tDriverService.updateBatchById(list);
+ }
return SUCCESS_TIP;
}
@@ -204,6 +245,7 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TAgent tAgent) {
+ tAgent.setPrincipal(tAgent.getPrincipal().replace(" ",""));
tAgentService.updateById(tAgent);
return SUCCESS_TIP;
}
@@ -243,7 +285,7 @@
@ApiOperation(value = "导出代理商列表",notes="导出代理商列表")
@RequestMapping(value = "/export")
@ResponseBody
- public void export(String principal,String principalPhone,String createTime, HttpServletResponse response) {
+ public void export(String principal,String principalPhone,Integer status,String createTime, HttpServletResponse response) {
try {
Date date = new Date();
DateFormat format = new SimpleDateFormat("yyyyMMdd");
@@ -251,7 +293,7 @@
String fileName = "Agent"+time1+".xls";
String[] title = new String[] {"时间","姓名","联系电话","代理区域","客服电话","订单数量",
"有效订单","已发放优惠券","已使用优惠券","累计优惠券金额","司机充值","司机数","状态"};
- EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime);
+ EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime,status);
// 是否异常
List<TAgent> list = tAgentService.selectList(wrapper);
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
index 7b9c86e..0894c4a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
@@ -313,7 +313,7 @@
values[i][7] = d.getEmergencyContact();
values[i][8] = d.getEmergencyPhone();
values[i][9] = String.valueOf(d.getAccountBalance());
- values[i][10] = String.valueOf(d.getUserTagId());
+ values[i][10] = String.valueOf(Objects.nonNull(d.getUserTagId())?d.getUserTagId():"");
Integer status1 = d.getStatus();
if(1 == status1){
values[i][11] = "正常";
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..ad11034 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
@@ -9,8 +9,8 @@
import com.stylefeng.guns.modular.system.controller.resp.TDriverResp;
import com.stylefeng.guns.modular.system.enums.StatusEnum;
import com.stylefeng.guns.modular.system.model.*;
-import com.stylefeng.guns.modular.system.service.ITRegionService;
-import com.stylefeng.guns.modular.system.service.ITSystemConfigService;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
@@ -23,8 +23,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.service.ITBranchOfficeService;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -48,12 +48,19 @@
@Autowired
private ITRegionService tRegionService;
+ @Autowired
+ private ITDriverService tDriverService;
+ @Autowired
+ private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private RedisUtil redisUtil;
/**
* 跳转到首页
*/
@RequestMapping("")
- public String index() {
+ public String index(Model model) {
+ model.addAttribute("userType", Objects.requireNonNull(ShiroKit.getUser()).getRoleType());
return PREFIX + "tBranchOffice.html";
}
@@ -246,6 +253,23 @@
TBranchOffice tBranchOffice = tBranchOfficeService.selectById(id);
tBranchOffice.setStatus(StatusEnum.FREEZE.getCode());
tBranchOfficeService.updateById(tBranchOffice);
+ List<TDriver> list = tDriverService.selectList(new EntityWrapper<TDriver>()
+ .eq("branchOfficeId", tBranchOffice.getId()));
+ for (TDriver tDriver : list) {
+ String value = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ redisUtil.remove(value);
+ redisUtil.remove("DRIVER_" + tDriver.getPhone());
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", tDriver.getId())
+ .eq("status", 1)
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ tDriverWork.setStatus(2);
+ tDriverWork.setOffWorkTime(new Date());
+ tDriverWorkService.updateById(tDriverWork);
+ }
+ }
return SUCCESS_TIP;
}
@@ -273,6 +297,7 @@
if(Objects.nonNull(o)){
return o;
}
+ tBranchOffice.setPrincipal(tBranchOffice.getPrincipal().replace(" ",""));
tBranchOffice.setStatus(StatusEnum.NORMAL.getCode());
tBranchOfficeService.insert(tBranchOffice);
@@ -308,6 +333,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/TBroadcastController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java
index e1daf8e..c22b732 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java
@@ -76,8 +76,8 @@
}
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
wrapper.ne("status", StatusEnum.DELETE.getCode());
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
index 9af2f0c..f815215 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -91,8 +91,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("create_time",startTime,endTime);
}
wrapper.ne("status", StatusEnum.DELETE.getCode());
@@ -136,6 +136,16 @@
if(isExit){
return new SuccessTip(500,"该优惠券名称与类型已存在!");
}
+ // 如果是新人优惠券，查询是否存在已启用的新人优惠券
+ if(tCoupon.getCouponType() == 2){
+ int count = tCouponService.selectCount(new EntityWrapper<TCoupon>()
+ .eq("coupon_type", 2)
+ .eq("coupon_state", 1)
+ .eq("status", true));
+ if(count>0){
+ return new SuccessTip(500,"已存在已启用的新人优惠券!");
+ }
+ }
tCouponService.insert(tCoupon);
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..0a5f6f0 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
import com.stylefeng.guns.core.log.LogObjectHolder;
@@ -15,9 +16,12 @@
import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TDriverWork;
import com.stylefeng.guns.modular.system.model.TRechargeRecord;
import com.stylefeng.guns.modular.system.model.TRegion;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.DateUtil;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -45,6 +49,8 @@
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -79,6 +85,10 @@
private HttpUtils httpUtils;
@Autowired
private TokenUtils tokenUtils;
+ @Autowired
+ private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private RedisUtil redisUtil;
@Autowired
private ITRechargeRecordService tRechargeRecordService;
@@ -191,8 +201,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";
}
@@ -303,10 +312,33 @@
@ResponseBody
public Object list(String createTime,String phone,Integer status) {
EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
- wrapper.ne("isException",2);
wrapper.orderBy("createTime",false);
List<TDriver> tDrivers = tDriverService.selectList(wrapper);
- return tDriverService.getTDriverResp(tDrivers);
+ List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
+ for (TDriverResp driverResp : tDriverResp) {
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", driverResp.getId())
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
+ if(tDriverWork.getStatus() == 1){
+ driverResp.setNotOnlineCount(0);
+ }else {
+ Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }
+ }else {
+ if(Objects.nonNull(driverResp.getApprovalTime())){
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }else {
+ driverResp.setNotOnlineCount(0);
+ }
+ }
+ }
+ return tDriverResp;
}
/**
* 获取佣金列表
@@ -352,6 +384,18 @@
if(Objects.nonNull(tDriver)){
tDriverCommissionResp.setInviterName(tDriver.getName());
tDriverCommissionResp.setInviterPhone(tDriver.getPhone());
+
+ if(Objects.nonNull(tDriver.getInviterId())){
+ TDriver driver = tDriverService.selectById(tDriver.getInviterId());
+ if(Objects.nonNull(driver.getInviterId())){
+ tDriverCommissionResp.setLevel("三级");
+ }else {
+ tDriverCommissionResp.setLevel("二级");
+ }
+ }else {
+ tDriverCommissionResp.setLevel("一级");
+ }
+
}
}
return commissionResp;
@@ -430,6 +474,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);
@@ -458,6 +504,19 @@
TDriver tDriver = tDriverService.selectById(id);
if(1 == status){
tDriver.setStatus(2);
+ String value = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ redisUtil.remove(value);
+ redisUtil.remove("DRIVER_" + tDriver.getPhone());
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", tDriver.getId())
+ .eq("status", 1)
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ tDriverWork.setStatus(2);
+ tDriverWork.setOffWorkTime(new Date());
+ tDriverWorkService.updateById(tDriverWork);
+ }
}
if(2 == status){
tDriver.setStatus(1);
@@ -511,6 +570,8 @@
if(Objects.nonNull(o)){
return o;
}
+ tDriver.setName(tDriver.getName().replace(" ",""));
+ tDriver.setEmergencyContact(tDriver.getEmergencyContact().replace(" ",""));
tDriverService.updateById(tDriver);
return SUCCESS_TIP;
}
@@ -555,12 +616,11 @@
String time1 = format.format(date);
String fileName = "DriverInfo"+time1+".xls";
String[] title = new String[] {"编号","姓名","手机号","性别","驾驶证号码","身份证号码",
- "身份证","所属代理商","所属分公司","钱包余额","累计订单量","当月订单量","积分","拒单次数","状态","添加时间"};
+ "身份证","所属代理商","所属分公司","钱包余额","累计订单量","当月订单量","积分","拒单次数","状态","审核状态","添加时间"};
EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
- // 是否异常
- List<TDriver> list = tDriverService.selectList(wrapper);
-
- List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(list);
+ wrapper.orderBy("createTime",false);
+ List<TDriver> tDrivers = tDriverService.selectList(wrapper);
+ List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
String[][] values = new String[tDriverResp.size()][];
for (int i = 0; i < tDriverResp.size(); i++) {
@@ -599,7 +659,15 @@
}else {
values[i][14] = "删除";
}
- values[i][15] = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(d.getCreateTime());
+ Integer approvalStatus = d.getApprovalStatus();
+ if(1 == approvalStatus){
+ values[i][15] = "待审核";
+ }else if(2 == approvalStatus){
+ values[i][15] = "已同意";
+ }else {
+ values[i][15] = "已拒绝";
+ }
+ values[i][16] = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(d.getCreateTime());
}
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook("Variance"+time1, title, values, null);
ExcelUtil.setResponseHeader(response, fileName);
@@ -628,10 +696,28 @@
"身份证","累计订单量","当月订单量","积分","连续未上线（天）","状态","添加时间"};
EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
wrapper.eq("isException",2);
- // 是否异常
- List<TDriver> list = tDriverService.selectList(wrapper);
-
- List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(list);
+ wrapper.orderBy("createTime",false);
+ List<TDriver> tDrivers = tDriverService.selectList(wrapper);
+ List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
+ for (TDriverResp driverResp : tDriverResp) {
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", driverResp.getId())
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
+ if(tDriverWork.getStatus() == 1){
+ driverResp.setNotOnlineCount(0);
+ }else {
+ Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }
+ }else {
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ }
+ }
String[][] values = new String[tDriverResp.size()][];
for (int i = 0; i < tDriverResp.size(); i++) {
@@ -672,7 +758,7 @@
e.printStackTrace();
}
}
- @ApiOperation(value = "导出司机异常列表",notes="导出司机异常列表")
+ @ApiOperation(value = "导出司机佣金列表",notes="导出司机佣金列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java
index e14e2ac..04ab48e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java
@@ -69,8 +69,8 @@
EntityWrapper<TEdition> wrapper = new EntityWrapper<>();
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
if(StringUtils.hasLength(editionNo)){
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..fce3673 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
@@ -10,6 +10,7 @@
import com.stylefeng.guns.modular.system.enums.StatusEnum;
import com.stylefeng.guns.modular.system.model.TAgent;
import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TDriverWork;
import com.stylefeng.guns.modular.system.model.TOrder;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
@@ -23,7 +24,9 @@
import org.springframework.web.bind.annotation.ResponseBody;
import java.text.SimpleDateFormat;
+import java.time.Duration;
import java.time.LocalDate;
+import java.time.Period;
import java.util.*;
import java.util.stream.Collectors;
@@ -77,18 +80,42 @@
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
- .in("agentId", ids)
- .eq("serverStatus", 2));
+ .in("agentId", ids));
+ List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
+ List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
+ tOrderService.getDataStatisticsCountByIds(allIds,model);
- model.addAttribute("onLineDriverCount",onLineDriver.size());
- tOrderService.getDataStatisticsCountByIds(ids,model);
// 查询服务中的订单列表
- List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
+ List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
+ List<TOrder> orderList = tOrderService.selectList(new EntityWrapper<TOrder>());
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
tOrderServerResp.setAvatar(tDriver.getAvatar());
tOrderServerResp.setDriverName(tDriver.getName());
+ List<TOrder> collect = orderList.stream().filter(order -> tDriver.getId().equals(order.getDriverId()) &&
+ (order.getState().equals(OrderStateEnum.WAIT_PAY.getCode())
+ || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode())
+ || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
+ // 驾龄
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ // 代驾次数
+ tOrderServerResp.setValetDrivingCount(collect.size());
+ // 行驶时间
+ long goTime = 0;
+ for (TOrder tOrder : collect) {
+ // 下车时间
+ Date getoffTime = tOrder.getGetoffTime();
+ // 上车时间
+ Date boardingTime = tOrder.getBoardingTime();
+ long minutes = Duration.between(DateUtil.dateToLocalDate(getoffTime), DateUtil.dateToLocalDate(boardingTime)).toMinutes();
+ goTime += Math.abs(minutes);
+ }
+ tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+ // 行驶里程
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
}
model.addAttribute("serverList",orderServerRespList);
// 查询今天所有订单
@@ -102,7 +129,7 @@
list.add(obj);
}
model.addAttribute("allList",list);
- List<List<String>> list1 = new ArrayList<>(allList.size());
+ List<List<String>> list1 = new ArrayList<>();
for (TDriver tDriver : onLineDriver) {
List<String> obj = new ArrayList<>(3);
String value = redisUtil.getValue("DRIVER" + tDriver.getId());
@@ -114,6 +141,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
+ model.addAttribute("onLineDriverCount",list1.size());
// 拿到所有在线司机地址
model.addAttribute("onLineDriver",list1);
return PREFIX + "tHomePageMap.html";
@@ -137,17 +165,42 @@
if(Objects.nonNull(agentId)){
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
- .eq("agentId", agentId)
- .eq("serverStatus", 2));
- map.put("onLineDriverCount",onLineDriver.size());
- tOrderService.getDataStatisticsCountGetMap(agentId,map);
+ .eq("agentId", agentId));
+ 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);
+ List<TOrder> orderList = tOrderService.selectList(new EntityWrapper<TOrder>());
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
tOrderServerResp.setAvatar(tDriver.getAvatar());
tOrderServerResp.setDriverName(tDriver.getName());
+ List<TOrder> collect = orderList.stream().filter(order -> tDriver.getId().equals(order.getDriverId()) &&
+ (order.getState().equals(OrderStateEnum.WAIT_PAY.getCode())
+ || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode())
+ || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
+ // 驾龄
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ // 代驾次数
+ tOrderServerResp.setValetDrivingCount(collect.size());
+ // 行驶时间
+ long goTime = 0;
+ for (TOrder tOrder : collect) {
+ // 下车时间
+ Date getoffTime = tOrder.getGetoffTime();
+ // 上车时间
+ Date boardingTime = tOrder.getBoardingTime();
+ long minutes = Duration.between(DateUtil.dateToLocalDateTime(getoffTime), DateUtil.dateToLocalDateTime(boardingTime)).toMinutes();
+ goTime += Math.abs(minutes);
+ }
+ tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+ // 行驶里程
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
}
map.put("serverList",orderServerRespList);
// 查询今天所有订单
@@ -161,7 +214,7 @@
list.add(obj);
}
map.put("allList",list);
- List<List<String>> list1 = new ArrayList<>(allList.size());
+ List<List<String>> list1 = new ArrayList<>();
for (TDriver tDriver : onLineDriver) {
List<String> obj = new ArrayList<>(3);
String value = redisUtil.getValue("DRIVER" + tDriver.getId());
@@ -173,6 +226,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
+ map.put("onLineDriverCount",list1.size());
// 拿到所有在线司机地址
map.put("onLineDriver",list1);
}else {
@@ -181,10 +235,7 @@
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
- .in("agentId", ids)
- .eq("serverStatus", 2));
-
- map.put("onLineDriverCount",onLineDriver.size());
+ .in("agentId", ids));
List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
@@ -192,13 +243,38 @@
// 查询服务中的订单列表
List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
+ List<TOrder> orderList = tOrderService.selectList(new EntityWrapper<TOrder>());
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
tOrderServerResp.setAvatar(tDriver.getAvatar());
tOrderServerResp.setDriverName(tDriver.getName());
+ List<TOrder> collect = orderList.stream().filter(order -> tDriver.getId().equals(order.getDriverId()) &&
+ (order.getState().equals(OrderStateEnum.WAIT_PAY.getCode())
+ || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode())
+ || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
+ // 驾龄
+ Period period = Period.between(LocalDate.now(), DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ tOrderServerResp.setDrivingExperience(Math.max(Math.abs(period.getYears()), 1));
+ // 代驾次数
+ tOrderServerResp.setValetDrivingCount(collect.size());
+ // 行驶时间
+ long goTime = 0;
+ for (TOrder tOrder : collect) {
+ // 下车时间
+ Date getoffTime = tOrder.getGetoffTime();
+ // 上车时间
+ Date boardingTime = tOrder.getBoardingTime();
+ long minutes = Duration.between(DateUtil.dateToLocalDateTime(getoffTime), DateUtil.dateToLocalDateTime(boardingTime)).toMinutes();
+ goTime += Math.abs(minutes);
+ }
+ tOrderServerResp.setGoTime(Long.valueOf(goTime).intValue());
+ // 行驶里程
+ int sum = collect.stream().mapToInt(TOrder::getActualMileage).sum();
+ tOrderServerResp.setMileageTraveled(sum/1000);
}
map.put("serverList",orderServerRespList);
+
// 查询今天所有订单
List<TOrder> allList = tOrderService.getDataStatisticsAllListByIds(allIds,type);
List<List<String>> list = new ArrayList<>(allList.size());
@@ -210,7 +286,7 @@
list.add(obj);
}
map.put("allList",list);
- List<List<String>> list1 = new ArrayList<>(allList.size());
+ List<List<String>> list1 = new ArrayList<>();
for (TDriver tDriver : onLineDriver) {
List<String> obj = new ArrayList<>(3);
String value = redisUtil.getValue("DRIVER" + tDriver.getId());
@@ -222,6 +298,7 @@
obj.add(String.valueOf(tDriver.getServerStatus()));// 服务状态
list1.add(obj);
}
+ map.put("onLineDriverCount",list1.size());
// 拿到所有在线司机地址
map.put("onLineDriver",list1);
}
@@ -238,8 +315,10 @@
}
HashMap<String, Object> map = new HashMap<>();
if(Objects.nonNull(agentId)){
+ List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>());
+ List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询服务中的订单列表
- List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerList(agentId);
+ List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
// 查询司机
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..5887e8b 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
@@ -14,6 +14,7 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TOrder;
import com.stylefeng.guns.modular.system.service.ITAppUserService;
+import com.stylefeng.guns.modular.system.service.ITCancelOrderService;
import com.stylefeng.guns.modular.system.service.ITOrderService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -54,6 +55,8 @@
private ITOrderService tOrderService;
@Autowired
private ITAppUserService tAppUserService;
+ @Autowired
+ private ITCancelOrderService tCancelOrderService;
/**
* 跳转到首页
@@ -183,7 +186,8 @@
String userPhone,
Integer state,
String driverName) {
- return tOrderService.getOrderList(createTime, code, source, userName, userPhone, state, driverName,2);
+// return tOrderService.getOrderList(createTime, code, source, userName, userPhone, state, driverName,2);
+ return tCancelOrderService.getCancelOrderList(createTime, code, source, userName, userPhone, state, driverName);
}
/**
@@ -198,7 +202,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/controller/general/TSystemBulletinController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemBulletinController.java
index 96717de..cab36c6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemBulletinController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemBulletinController.java
@@ -85,8 +85,8 @@
}
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
wrapper.ne("status",3);
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 4599961..86ffb3a 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
@@ -85,13 +85,13 @@
TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 2)
.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"));
- 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("num1",jsonObject.getString("num1"));
+ model.addAttribute("num2",jsonObject.getString("num2"));
+ model.addAttribute("num3",jsonObject.getString("num3"));
+ model.addAttribute("num4",jsonObject.getString("num4"));
+ model.addAttribute("num5",jsonObject.getString("num5"));
+ model.addAttribute("num6",jsonObject.getString("num6"));
+ model.addAttribute("num7",jsonObject.getString("num7"));
return PREFIX + "tSystemConfigCommissionShareRules.html";
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
index 37d17bb..815c3ad 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
@@ -78,8 +78,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
wrapper.ne("status", StatusEnum.DELETE.getCode());
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java
index b15b8d6..ddf5e84 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java
@@ -7,6 +7,9 @@
public class TDriverCommissionResp extends TDriver {
+ @ApiModelProperty(value = "层级")
+ private String level;
+
// 所属代理商
@ApiModelProperty(value = "所属代理商")
private String agentName;
@@ -29,6 +32,14 @@
@ApiModelProperty(value = "邀约人电话")
private String inviterPhone;
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
@Override
public String getInviterName() {
return inviterName;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TOrderServerResp.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TOrderServerResp.java
index d40672f..48c5001 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TOrderServerResp.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TOrderServerResp.java
@@ -10,14 +10,14 @@
@ApiModelProperty(value = "司机头像")
private String avatar;
@ApiModelProperty(value = "驾龄")
- private Integer drivingExperience = 105;
+ private Integer drivingExperience;
@ApiModelProperty(value = "代驾次数")
- private Integer valetDrivingCount = 105;
+ private Integer valetDrivingCount ;
@ApiModelProperty(value = "行驶时间")
- private Integer goTime = 105;
+ private Integer goTime ;
@ApiModelProperty(value = "行驶里程")
- private Integer mileageTraveled = 105;
+ private Integer mileageTraveled ;
public Integer getMileageTraveled() {
return mileageTraveled;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
index 63fdeb0..c28a53c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -19,6 +19,7 @@
import com.stylefeng.guns.modular.system.service.IMenuService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.AESUtils;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
@@ -49,6 +50,8 @@
@Autowired
private IUserService userService;
+ @Autowired
+ private RedisUtil redisUtil;
private Map<String, Integer> loginFailures = new HashMap<>();
@@ -117,7 +120,7 @@
* 点击登录执行的动作
*/
@RequestMapping(value = "/login", method = RequestMethod.POST)
- public String loginVali(String username, String password, String remember, Model model, HttpServletRequest request) {
+ public String loginVali(String username, String password,String sms_code, String remember, Model model, HttpServletRequest request) {
Integer f = loginFailures.get(username);
f = f == null ? 0 : f;
// 校验账号，密码是否正确，如果错误，对次数进行加1
@@ -144,6 +147,25 @@
return "/login.html";
}
}
+
+// if(!"aaaa".equals(sms_code)){
+// String value = redisUtil.getValue(user.getPhone());
+// if(ToolUtil.isEmpty(value) || !sms_code.equals(value)){
+// model.addAttribute("tips", "无效的验证码");
+// return "/login.html";
+// }
+// }
+
+
+ //验证验证码是否正确
+ if (KaptchaUtil.getKaptchaOnOff()) {
+ String kaptcha = super.getPara("kaptcha").trim();
+ String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
+ if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
+ throw new InvalidKaptchaException();
+ }
+ }
+
model.addAttribute("number", "3");
Subject currentUser = ShiroKit.getSubject();
UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
index 287755f..d518886 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
@@ -105,8 +105,10 @@
@Permission
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestParam(required = false) String roleName) {
- List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"));
+ public Object list(@RequestParam(required = false) String roleName,
+ @RequestParam(required = false) String headName,
+ @RequestParam(required = false) String headPhone) {
+ List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"),super.getPara("headName"),super.getPara("headPhone"));
return super.warpObject(new RoleWarpper(roles));
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
index d95d87f..1cf3c9a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
@@ -24,7 +24,9 @@
* @return
* @date 2017年2月12日 下午9:14:34
*/
- List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition,
+ @Param("headName") String headName,
+ @Param("headPhone") String headPhone);
/**
* 删除某个角色的所有权限
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java
index 2017470..c8d56b5 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java
@@ -9,7 +9,9 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
/**
@@ -152,4 +154,13 @@
* @return
*/
List<DataStatisticsOrderYearResp> getStatisticsOrderByMonthIds(@Param("ids")List<Integer> ids, @Param("dayDate")String dayDate);
+
+ /**
+ * 查询司机当月有效订单数量
+ * @param driverId
+ * @param orderMoney
+ * @param month
+ * @return
+ */
+ Integer getValidOrderCount(@Param("driverId") Integer driverId,@Param("orderMoney") BigDecimal orderMoney, @Param("month")String month);
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
index c0afcd5..2209457 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
@@ -11,6 +11,8 @@
<result column="deptid" property="deptid" />
<result column="tips" property="tips" />
<result column="version" property="version" />
+ <result column="headName" property="headName" />
+ <result column="headPhone" property="headPhone" />
</resultMap>
<sql id="Base_Column_List">
@@ -20,9 +22,18 @@
<select id="selectRoles" resultType="map">
select rr.*,(SELECT COUNT(id) from sys_user where FIND_IN_SET(rr.id,roleid)) as userCount
from sys_role as rr
- <if test="condition != null">
- where rr.name like CONCAT('%',#{condition},'%')
- </if>
+ <where>
+ <if test="condition != null and condition != ''">
+ and rr.name like CONCAT('%',#{condition},'%')
+ </if>
+ <if test="headName != null and headName != ''">
+ and rr.headName like CONCAT('%',#{headName},'%')
+ </if>
+ <if test="headPhone != null and headPhone != ''">
+ and rr.headPhone like CONCAT('%',#{headPhone},'%')
+ </if>
+ </where>
+ ORDER BY rr.num
</select>
<delete id="deleteRolesById">
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/TCancelOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
index 25e999b..50230c6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
@@ -57,7 +57,6 @@
<if test="roleType != null and roleType == 3">
AND o.agentId = #{objectId}
</if>
- AND co.userType = 1
</where>
ORDER BY co.createTime
</select>
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..63e4003 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>
@@ -239,8 +236,16 @@
#{id}
</foreach>
</if>
- <if test="type != null">
- AND `state` = #{type}
+ <if test="type == 1">
+ AND `state` = 101
+ </if>
+ <if test="type == 2">
+ AND (`state` = 107
+ OR `state` = 108
+ OR `state` = 109)
+ </if>
+ <if test="type == 3">
+ AND `state` = 301
</if>
<if test="localDate != null">
AND date_format(createTime, '%Y-%m-%d') LIKE concat('',#{localDate},'%')
@@ -394,5 +399,21 @@
</where>
GROUP BY `month`
</select>
+ <select id="getValidOrderCount" resultType="java.lang.Integer">
+ select count(id)
+ from t_order
+ <where>
+ <if test="driverId != null">
+ AND driverId = #{driverId}
+ </if>
+ <if test="orderMoney != null">
+ AND orderMoney > #{orderMoney}
+ </if>
+ <if test="month != null">
+ AND DATE_FORMAT(createTime, '%Y-%m') = #{month}
+ </if>
+ AND (`state` = 107 OR `state` = 108 OR `state` = 109)
+ </where>
+ </select>
</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
index 70ae563..5b4a45f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
@@ -49,7 +49,30 @@
* 保留字段(暂时没用）
*/
private Integer version;
+ /**
+ * 负责人姓名
+ */
+ private String headName;
+ /**
+ * 负责人电话
+ */
+ private String headPhone;
+ public String getHeadName() {
+ return headName;
+ }
+
+ public void setHeadName(String headName) {
+ this.headName = headName;
+ }
+
+ public String getHeadPhone() {
+ return headPhone;
+ }
+
+ public void setHeadPhone(String headPhone) {
+ this.headPhone = headPhone;
+ }
public Integer getId() {
return id;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java
index 3378d21..2eedbb7 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java
@@ -62,10 +62,21 @@
private Date createTime;
@ApiModelProperty(value = "优推距离")
private Integer distance;
+ @ApiModelProperty(value = "图片")
+ @TableField(value = "picture")
+ private String picture;
@TableField(exist = false)
private String serviceContent;
+ public String getPicture() {
+ return picture;
+ }
+
+ public void setPicture(String picture) {
+ this.picture = picture;
+ }
+
public String getServiceContent() {
return serviceContent;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
index cc7332d..e26abbb 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
@@ -39,7 +39,9 @@
* @return
* @date 2017年2月12日 下午9:14:34
*/
- List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition,
+ @Param("headName") String headName,
+ @Param("headPhone") String headPhone);
/**
* 删除某个角色的所有权限
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
index d670151..a5efeaf 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
@@ -26,7 +26,7 @@
* @param createTime
* @return
*/
- EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime);
+ EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime,Integer status);
/**
* 代理商查看详情
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
index 87bb841..ae9138f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.service.IService;
import org.springframework.ui.Model;
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -154,4 +156,13 @@
* @param map
*/
void getStatisticsOrderByMonthIds(List<Integer> ids, String dayDate, Model model, Map<String, Object> map);
+
+ /**
+ * 查询司机当月有效订单数量
+ * @param driverId
+ * @param orderMoney
+ * @param month
+ * @return
+ */
+ Integer getValidOrderCount(Integer driverId, BigDecimal orderMoney, String month);
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
index 34a0875..12209f4 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
@@ -53,8 +53,8 @@
}
@Override
- public List<Map<String, Object>> selectRoles(String condition) {
- return this.baseMapper.selectRoles(condition);
+ public List<Map<String, Object>> selectRoles(String condition,String headName,String headPhone) {
+ return this.baseMapper.selectRoles(condition,headName,headPhone);
}
@Override
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
index 3a4712f..b1cfe52 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
@@ -55,7 +55,7 @@
private TUserToCouponMapper tUserToCouponMapper;
@Override
- public EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime) {
+ public EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime,Integer status) {
EntityWrapper<TAgent> wrapper = new EntityWrapper<>();
// 昵称
if(StringUtils.hasLength(principal)){
@@ -68,14 +68,18 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
// 判断是否为代理商
if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
wrapper.eq("id",ShiroKit.getUser().getObjectId());
}
+ // 状态
+ if(Objects.nonNull(status)){
+ wrapper.eq("status",status);
+ }
wrapper.ne("status", StatusEnum.DELETE.getCode());
wrapper.orderBy("createTime",false);
return wrapper;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAppUserServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAppUserServiceImpl.java
index 632cd90..12e6fac 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAppUserServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAppUserServiceImpl.java
@@ -140,8 +140,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createtime",startTime,endTime);
}
// if(Objects.nonNull(startTime) && Objects.nonNull(endTime)){
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBillServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBillServiceImpl.java
index c1ebb08..2aec94b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBillServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBillServiceImpl.java
@@ -63,8 +63,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java
index a5a56be..bc26094 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java
@@ -36,8 +36,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
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..5deea73 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;
@@ -94,8 +96,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
wrapper.orderBy(true,"approvalStatus");
@@ -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());
// 拒单次数
@@ -183,11 +185,8 @@
// 计算驾龄
if(Objects.nonNull(tDriver.getFirstCertificateTime())){
- ZoneId zoneId = ZoneId.systemDefault();
- LocalDate firstTime = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
- LocalDate now = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
- Period period = Period.between(firstTime, now);
- model.addAttribute("drivingExperience",period.getYears());
+ Period period = Period.between(LocalDate.now(), com.stylefeng.guns.modular.system.util.DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ model.addAttribute("drivingExperience",Math.max(Math.abs(period.getYears()), 1));
}else {
model.addAttribute("drivingExperience",0);
}
@@ -229,10 +228,10 @@
TDriver tDriver1 = tDriverMapper.selectById(tDriver.getInviterId());
model.addAttribute("inviterName",tDriver1.getName());
model.addAttribute("inviterPhone",tDriver1.getPhone());
- }else {
- model.addAttribute("inviterName","");
- model.addAttribute("inviterPhone","");
}
+ }else {
+ model.addAttribute("inviterName","");
+ model.addAttribute("inviterPhone","");
}
// 查询当前用户邀请了哪些人
@@ -248,11 +247,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 +263,33 @@
.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);
+ if(reduce.isPresent()){
+ model.addAttribute("cumulativeIncome", reduce.get());
+ }else {
+ model.addAttribute("cumulativeIncome",0);
+ }
}else {
model.addAttribute("cumulativeOrderCount",0);
model.addAttribute("monthOrderCount",0);
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TEvaluateServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TEvaluateServiceImpl.java
index d796a6c..d49a1f5 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TEvaluateServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TEvaluateServiceImpl.java
@@ -46,8 +46,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
List<TEvaluateResp> list = tEvaluateMapper.selectPageList(startTime, endTime, userName, driverName, orderType, score);
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
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 5d1b79f..dd68d6a 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
@@ -1,6 +1,6 @@
package com.stylefeng.guns.modular.system.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.modular.system.controller.resp.DataStatisticsOrderYearResp;
import com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp;
@@ -9,14 +9,13 @@
import com.stylefeng.guns.modular.system.dao.TAppUserMapper;
import com.stylefeng.guns.modular.system.dao.TBranchOfficeMapper;
import com.stylefeng.guns.modular.system.dao.TDriverMapper;
+import com.stylefeng.guns.modular.system.dao.TOrderMapper;
import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
import com.stylefeng.guns.modular.system.model.TAppUser;
import com.stylefeng.guns.modular.system.model.TBranchOffice;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TOrder;
-import com.stylefeng.guns.modular.system.dao.TOrderMapper;
import com.stylefeng.guns.modular.system.service.ITOrderService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -56,8 +55,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
@@ -204,9 +203,9 @@
@Override
public void getDataStatisticsCountByIds(List<Integer> ids, Model model) {
- Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.PENDING_ORDER.getCode(), LocalDate.now());
- Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.FINISH.getCode(),LocalDate.now());
- Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.CANCELED.getCode(),LocalDate.now());
+ Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, 1, LocalDate.now());
+ Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, 2,LocalDate.now());
+ Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, 3,LocalDate.now());
Integer serverCount = tOrderMapper.getDataStatisticsServerCountByIds(ids, LocalDate.now());
model.addAttribute("pendingOrderCount",pendingOrderCount);
@@ -241,9 +240,9 @@
@Override
public void getDataStatisticsCountByIdsGetMap(List<Integer> ids, HashMap<String, Object> map) {
- Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.PENDING_ORDER.getCode(), LocalDate.now());
- Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.FINISH.getCode(),LocalDate.now());
- Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.CANCELED.getCode(),LocalDate.now());
+ Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, 1, LocalDate.now());
+ Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, 2,LocalDate.now());
+ Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, 3,LocalDate.now());
Integer serverCount = tOrderMapper.getDataStatisticsServerCountByIds(ids, LocalDate.now());
map.put("pendingOrderCount",pendingOrderCount);
@@ -345,4 +344,11 @@
model.addAttribute("monthResp",resps);
map.put("monthResp",resps);
}
+
+
+ @Override
+ public Integer getValidOrderCount(Integer driverId, BigDecimal orderMoney, String month) {
+ // 查询司机当月有效订单数量
+ return tOrderMapper.getValidOrderCount(driverId,orderMoney,month);
+ }
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
index c839d3c..34b328d 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
@@ -36,8 +36,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
@@ -58,8 +58,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
index 653f8fb..a21e4bd 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
@@ -54,8 +54,8 @@
// 开始，结束时间
if(StringUtils.hasLength(businessTime)){
String[] split = businessTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
index 775e25a..e217bb5 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -5,6 +5,10 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -1168,6 +1172,28 @@
return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
}
+ /**
+ * date转localdate
+ * @param date
+ * @return
+ */
+ public static LocalDate dateToLocalDate(Date date){
+ ZoneId zoneId = ZoneId.systemDefault();
+ Instant instant = date.toInstant();
+ return instant.atZone(zoneId).toLocalDate();
+ }
+
+ /**
+ * date转localdatetime
+ * @param date
+ * @return
+ */
+ public static LocalDateTime dateToLocalDateTime(Date date){
+ ZoneId zoneId = ZoneId.systemDefault();
+ Instant instant = date.toInstant();
+ return instant.atZone(zoneId).toLocalDateTime();
+ }
+
public static void main(String[] args) throws ParseException {
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
index e2fa3af..fac63ae 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -1,7 +1,8 @@
package com.stylefeng.guns.modular.system.util;
public class PushURL {
- public static String zull_user_url = "http://127.0.0.1:81";
+// public static String zull_user_url = "http://127.0.0.1:81";
+ public static String zull_user_url = "https://okyueche.com:443";
public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderState";
public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms";
public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index cccc60c..414ffe2 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -2,16 +2,23 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
+import com.stylefeng.guns.modular.system.model.TAppUser;
import com.stylefeng.guns.modular.system.model.TDriver;
-import com.stylefeng.guns.modular.system.service.ITDriverService;
-import com.stylefeng.guns.modular.system.service.ITLocationService;
-import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
+import com.stylefeng.guns.modular.system.model.TDriverWork;
+import com.stylefeng.guns.modular.system.model.TOrder;
+import com.stylefeng.guns.modular.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
@@ -22,9 +29,14 @@
@Autowired
private ITLocationService locationService;
-
@Autowired
private ITDriverService driverService;
+ @Autowired
+ private ITAppUserService appUserService;
+ @Autowired
+ private ITOrderService orderService;
+ @Autowired
+ private ITDriverWorkService tDriverWorkService;
@@ -51,4 +63,70 @@
e.printStackTrace();
}
}
+
+ /**
+ * 每半天检测用户是否有异常
+ */
+ @Scheduled(cron = "0 0 0,12 * * ? ")
+ public void queryUserIsException(){
+ try {
+ List<TAppUser> appUserList = appUserService.selectList(new EntityWrapper<TAppUser>().ne("status", 3));
+ for (TAppUser tAppUser : appUserList) {
+ TOrder tOrder = orderService.selectOne(new EntityWrapper<TOrder>()
+ .eq("userId", tAppUser.getId())
+ .last("LIMIT 1"));
+ // 客户一个月未下单，状态异常
+ Period period = Period.between(DateUtil.dateToLocalDate(tOrder.getCreateTime()), LocalDate.now());
+ int day = Math.abs(period.getDays());
+ if(day > 29){
+ tAppUser.setIsException(2);
+ }
+ }
+ appUserService.updateBatchById(appUserList);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 每半天检测司机是否有异常
+ */
+ @Scheduled(cron = "0 0 9,21 * * ? ")
+ public void queryDriverIsException(){
+ try {
+ List<TDriver> driverList = driverService.selectList(new EntityWrapper<TDriver>().ne("status", 3));
+ for (TDriver driver : driverList) {
+ // 15天未上线异常，当月有效订单低于30单，异常
+ Integer count = orderService.getValidOrderCount(driver.getId(),new BigDecimal(14),new SimpleDateFormat("yyyy-MM").format(new Date()));
+ if(count < 30){
+ driver.setIsException(2);
+ }
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", driver.getId())
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
+ if(tDriverWork.getStatus() == 2){
+ Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
+ int day = Math.abs(period.getDays());
+ if(day>14){
+ driver.setIsException(2);
+ }
+ }
+ }else {
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driver.getApprovalTime()), LocalDate.now());
+ int day = Math.abs(period.getDays());
+ if(day>14){
+ driver.setIsException(2);
+ }
+ }
+ }
+ driverService.updateBatchById(driverList);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
}
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/blackboard.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
index f3710fe..67a4d27 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
@@ -105,7 +105,7 @@
<div id="noVipUnlockDiv" class="flex-div">
<div class="sp-hidden flex-div noVipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="noVipUnlockTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
</div>
<div class="noVipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -128,7 +128,7 @@
<div id="vipUnlockDiv" class="flex-div">
<div class="sp-hidden flex-div vipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="vipUnlockTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
</div>
<div class="vipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -151,7 +151,7 @@
<div id="allIncomeDiv" class="flex-div">
<div class="sp-hidden flex-div allIncomeTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="allIncomeTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
</div>
<div class="allIncomeTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -174,7 +174,7 @@
<div id="addVipDiv" class="flex-div">
<div class="sp-hidden flex-div addVipTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="addVipTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
</div>
<div class="addVipTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -197,7 +197,7 @@
<div id="sendActiveDiv" class="flex-div">
<div class="sp-hidden flex-div sendActiveTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="sendActiveTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
</div>
<div class="sendActiveTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -230,7 +230,7 @@
<div id="userDiv" class="flex-div">
<div class="sp-hidden flex-div userTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="userTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
</div>
<div class="userTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
index f79cdf6..0d33e83 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -139,7 +139,7 @@
</select>
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
- <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData()"/>
<#button name="重置" icon="fa-trash" clickFun="reset()" space="true"/>
</div>
</div>
@@ -174,7 +174,7 @@
</select>
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
- <#button name="搜索" icon="fa-search" clickFun="getDataOrder()"/>
+ <#button name="查询" icon="fa-search" clickFun="getDataOrder()"/>
<#button name="重置" icon="fa-trash" clickFun="resetOrder()" space="true"/>
</div>
</div>
@@ -860,11 +860,8 @@
var allList;
if(e==""){
allList = $('#allList').val();
- console.log(1111111111)
var list = JSON.stringify(allList)
- console.log(2222222222)
const jsonArray = JSON.parse(list)
- console.log(3333333333333)
const jsonArray1 = JSON.parse(jsonArray);
console.log(jsonArray1)
M = jsonArray1;
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
index 5d39d78..29d2403 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
@@ -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">© 2019-2021 <a href="#" onclick="return false" target="_blank">超省新代驾</a>
+ <div class="pull-right">© 2023 <a href="#" onclick="return false" target="_blank">超省新代驾</a>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html b/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
index 9299d76..d38cf42 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
@@ -16,7 +16,7 @@
<#NameCon id="phone" name="手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Home.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Home.search()"/>
<#button name="重置" icon="fa-trash" clickFun="Home.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/home.html b/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
index 07cce38..b9308a3 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -27,7 +27,7 @@
</div>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData()"/>
</div>
</div>
<div class="col-sm-3">
@@ -215,7 +215,7 @@
</div>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="getData1()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData1()"/>
</div>
</div>
<div class="form-group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/login.html b/management/guns-admin/src/main/webapp/WEB-INF/view/login.html
index 9c823f5..0b73180 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/login.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/login.html
@@ -64,7 +64,6 @@
<form class="m-t" role="form" action="${ctxPath}/login" method="post">
<div class="item">
<img src="${ctxPath}/static/img/account.png" />
- <input hidden id="number" value="${number}">
<input class="itemInput" type="text" name="username" id="username" placeholder="请输入您的账号" required="" value="">
</div>
<div class="item">
@@ -75,7 +74,7 @@
@if(kaptcha.getKaptchaOnOff() == true){
<div class="form-group" style="float: left;">
<div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
- <input class="form-control" type="text" name="kaptcha" id="verifyNumber" placeholder="验证码" >
+ <input class="form-control" type="text" name="kaptcha" id="verifyNumber" placeholder="验证码" required>
</div>
<div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
<img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>
@@ -103,13 +102,14 @@
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
$(function () {
- if($("#number").val()==5){
- document.getElementById("verifyNumber").setAttribute("required","")
- $("#verify").show()
- }else {
- $("#number").val(0)
- $("#verify").hide()
- }
+ // if($("#number").val()==5){
+ // document.getElementById("verifyNumber").setAttribute("required","")
+ // $("#verify").show()
+ // }else {
+ // $("#number").val(0)
+ // $("#verify").hide()
+ // }
+ $("#verify").show()
$("#kaptcha").on('click', function () {
$("#kaptcha").attr('src', '${ctxPath}/kaptcha?' + Math.floor(Math.random() * 100)).fadeIn();
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
index a0570a2..84fe526 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Dept.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Dept.search()"/>
</div>
</div>
<div class="hidden-xs" id="DeptTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
index 2bf81ee..daabbd2 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Dict.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Dict.search()"/>
</div>
</div>
<div class="hidden-xs" id="DictTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
index 5707610..970f094 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
@@ -16,7 +16,7 @@
<#NameCon id="name" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="DriverActivity.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="DriverActivity.search()"/>
<#button name="重置" icon="fa-trash" clickFun="DriverActivity.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
index a9b7f48..bae3fdb 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
@@ -19,7 +19,7 @@
<#NameCon id="logName" name="用户名称" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="OptLog.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="OptLog.search()"/>
<#button name="重置" icon="fa-trash" clickFun="OptLog.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
index 8d38ac9..122e277 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
@@ -19,7 +19,7 @@
<#NameCon id="logName" name="用户名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="LoginLog.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="LoginLog.search()"/>
<#button name="重置" icon="fa-trash" clickFun="LoginLog.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
index b0e89a7..63bd8fb 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
@@ -16,7 +16,7 @@
<#NameCon id="level" name="层级" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Menu.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Menu.search()"/>
</div>
</div>
<div class="hidden-xs" id="menuTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
index f373984..1a72544 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Notice.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Notice.search()"/>
</div>
</div>
<div class="hidden-xs" id="NoticeTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
index 1742b48..75e25af 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
@@ -34,7 +34,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search1()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search1()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch1()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel1()"/>
</div>
@@ -61,7 +61,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search2()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search2()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch2()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel2()"/>
</div>
@@ -88,7 +88,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search3()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search3()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch3()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel3()"/>
</div>
@@ -115,7 +115,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search4()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search4()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch4()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel4()"/>
</div>
@@ -142,7 +142,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search5()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search5()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch5()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel5()"/>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
index f98ec0f..1e6329f 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
@@ -22,7 +22,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatisticsInfo.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatisticsInfo.search()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatisticsInfo.resetSearch()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatisticsInfo.downloadExcel()"/>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
index 8cc397d..b4b50ae 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
@@ -29,7 +29,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="OperationalData.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="OperationalData.search()"/>
<#button name="重置" icon="fa-search" clickFun="OperationalData.resetSearch()"/>
<#button name="下载" icon="fa-download" clickFun="OperationalData.downloadExcel()"/>
</div>
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..5ca659f 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
@@ -13,7 +13,14 @@
<#NameCon id="roleName" name="角色名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Role.search()"/>
+ <#NameCon id="headName" name="负责人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="headPhone" name="负责人电话" />
+ </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">
@@ -21,7 +28,7 @@
<#button name="添加" icon="fa-plus" clickFun="Role.openAddRole()" />
@}
@if(shiro.hasPermission("/role/edit")){
- <#button name="修改" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
+ <#button name="编辑" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
@}
@if(shiro.hasPermission("/role/remove")){
<#button name="删除" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
index 1d576cc..137ea57 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
@@ -11,13 +11,15 @@
<#input id="pName" name="上级名称" underline="true" hidden="pid" readonly="readonly"
clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
+ <#input id="headName" name="负责人名称" underline="true"/>
<#input id="deptName" name="部门名称" hidden="deptid" readonly="readonly"
clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
</div>
<div class="col-sm-6">
<#input id="tips" name="别名" underline="true"/>
- <#input id="num" name="排序"/>
+ <#input id="num" name="排序" underline="true"/>
+ <#input id="headPhone" name="负责人电话" underline="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
index ae538ac..80d033a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
@@ -11,13 +11,15 @@
<#input id="pName" name="上级名称" underline="true" hidden="pid" hiddenValue="${role.pid}" readonly="readonly" value="${pName}"
clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
+ <#input id="headName" name="负责人名称" value="${role.headName}" underline="true"/>
<#input id="deptName" name="部门名称" hidden="deptid" hiddenValue="${role.deptid}" readonly="readonly" value="${deptName}"
clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
</div>
<div class="col-sm-6">
<#input id="tips" name="别名" underline="true" value="${role.tips}"/>
- <#input id="num" name="排序" value="${role.num}"/>
+ <#input id="num" name="排序" value="${role.num}" underline="true"/>
+ <#input id="headPhone" name="负责人电话" value="${role.headPhone}" underline="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html
index c2690a2..af13e11 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html
@@ -9,6 +9,7 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
+ <input hidden id="userType" value="${userType}">
<div class="col-sm-2">
<#NameCon id="principal" name="姓名" />
</div>
@@ -18,38 +19,26 @@
<div class="col-sm-3">
<#TimeCon id="createTime" name="时间" />
</div>
- <!--<div class="col-sm-1">
- <select class="input-group" id="status" style="width: 80px;height: 33px" name="status">
- <option value="">状态</option>
- <option value="1">正常</option>
- <option value="2">冻结</option>
- <option value="3">已删除</option>
- </select>
- </div>-->
+ <div class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TAgent.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TAgent.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TAgent.resetSearch()" space="true"/>
</div>
- <div class="col-sm-3">
- @if(shiro.hasPermission("/tAgent/export")){
- <#button name="导出" icon="" clickFun="TAgent.export()"/>
- @}
- @if(shiro.hasPermission("/tAgent/add")){
- <#button name="添加" icon="fa-plus" clickFun="TAgent.openAddTAgent()"/>
- @}
- </div>
</div>
- <!--<div class="hidden-xs" id="TAgentTableToolbar" role="group">
+ <div class="hidden-xs" id="TAgentTableToolbar" role="group">
+ @if(shiro.hasPermission("/tAgent/export")){
+ <#button name="导出" icon="" clickFun="TAgent.export()"/>
+ @}
@if(shiro.hasPermission("/tAgent/add")){
<#button name="添加" icon="fa-plus" clickFun="TAgent.openAddTAgent()"/>
@}
- @if(shiro.hasPermission("/tAgent/update")){
- <#button name="修改" icon="fa-edit" clickFun="TAgent.openTAgentDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/tAgent/delete")){
- <#button name="删除" icon="fa-remove" clickFun="TAgent.delete()" space="true"/>
- @}
- </div>-->
+ </div>
<#table id="TAgentTable"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
index d1c0757..0b857d5 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
@@ -21,40 +21,29 @@
<div class="col-sm-2">
<#NameCon id="phone" name="手机号" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="status" style="width: 80px;height: 33px" name="status">
- <option value="">状态</option>
- <option value="1">正常</option>
- <option value="2">冻结</option>
- </select>
+ <div class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TAppUser.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TAppUser.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TAppUser.resetSearch()" space="true"/>
</div>
- <div class="col-sm-3">
- @if(shiro.hasPermission("/tAppUser/export-userInfo")){
- <#button name="导出" icon="" clickFun="TAppUser.export()"/>
- @}
- @if(shiro.hasPermission("/tAppUser/tAppUser_exception")){
- <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/>
- @}
- @if(shiro.hasPermission("/tAppUser/sendCoupon")){
- <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/>
- @}
- </div>
</div>
- <!--<div class="hidden-xs" id="TAppUserTableToolbar" role="group">
- @if(shiro.hasPermission("/tAppUser/add")){
- <#button name="添加" icon="fa-plus" clickFun="TAppUser.openAddTAppUser()"/>
+ <div class="hidden-xs" id="TAppUserTableToolbar" role="group">
+ @if(shiro.hasPermission("/tAppUser/export-userInfo")){
+ <#button name="导出" icon="" clickFun="TAppUser.export()"/>
@}
- @if(shiro.hasPermission("/tAppUser/update")){
- <#button name="修改" icon="fa-edit" clickFun="TAppUser.openTAppUserDetail()" space="true"/>
+ @if(shiro.hasPermission("/tAppUser/tAppUser_exception")){
+ <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/>
@}
- @if(shiro.hasPermission("/tAppUser/delete")){
- <#button name="删除" icon="fa-remove" clickFun="TAppUser.delete()" space="true"/>
+ @if(shiro.hasPermission("/tAppUser/sendCoupon")){
+ <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/>
@}
- </div>-->
+ </div>
<#table id="TAppUserTable"/>
</div>
</div>
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/tAppUser/tAppUserException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
index a1e6517..ca0d780 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
@@ -29,7 +29,7 @@
</select>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TAppUserException.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TAppUserException.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TAppUserException.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStop.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStop.html
index a8b42b7..74e6a9b 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStop.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStop.html
@@ -7,18 +7,20 @@
<div class="col-sm-12">
<input hidden id="id" value="${id}">
<input hidden id="status" value="${status}">
- <div class="col-lg-3">
+ <div>
@if(status==1){
- 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>冻结理由:</label><br/><br/>
+ <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
@if(status==2){
- 启用理由:<textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>启用理由:</label><br/><br/>
+ <textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
</div>
- <div class="hidden-xs" id="TAppUserTableToolbar" role="group" style="margin-left:300px">
- <#button name="取消" icon="fa-plus" clickFun="TAppUserInfoDlg.close()" />
- <#button name="确定" icon="fa-plus" clickFun="TAppUser.updateStatus()"/>
- </div>
+ </div>
+ <div class="hidden-xs" id="TAppUserTableToolbar" role="group" style="text-align: center">
+ <#button name="取消" icon="fa-plus" clickFun="TAppUserInfoDlg.close()" />
+ <#button name="确定" icon="fa-plus" clickFun="TAppUser.updateStatus()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStopException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStopException.html
index c0480d6..c3628c1 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStopException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStopException.html
@@ -7,18 +7,20 @@
<div class="col-sm-12">
<input hidden id="id" value="${id}">
<input hidden id="status" value="${status}">
- <div class="col-lg-3">
+ <div>
@if(status==1){
- 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>冻结理由:</label><br/><br/>
+ <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
@if(status==2){
- 启用理由:<textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>启用理由:</label><br/><br/>
+ <textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
</div>
- <div class="hidden-xs" id="TAppUserTableToolbar" role="group" style="margin-left:300px">
- <#button name="取消" icon="fa-plus" clickFun="TAppUserInfoDlg.closeException()" />
- <#button name="确定" icon="fa-plus" clickFun="TAppUserException.updateStatus()"/>
- </div>
+ </div>
+ <div class="hidden-xs" id="TAppUserTableToolbar" role="group" style="text-align: center">
+ <#button name="取消" icon="fa-plus" clickFun="TAppUserInfoDlg.closeException()" />
+ <#button name="确定" icon="fa-plus" clickFun="TAppUserException.updateStatus()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html
index ced25a0..fe3820e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html
@@ -14,7 +14,7 @@
<#NameCon id="couponName" name="优惠券名称" placeholder="请输入优惠券名称"/>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCoupon.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCoupon.search()"/>
</div>
</div>
<#table id="TCouponTable"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html
index bc1891e..d6b7705 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html
@@ -14,7 +14,7 @@
<#NameCon id="couponName" name="优惠券名称" placeholder="请输入优惠券名称"/>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCoupon.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCoupon.search()"/>
</div>
</div>
<#table id="TCouponTable"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html
index 7a2ad09..61aad66 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html
@@ -16,28 +16,28 @@
<#NameCon id="addresseePhone" name="手机号" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="state" style="width: 180px;height: 33px" name="state">
- <option value="">状态</option>
- <option value="1">待开票</option>
- <option value="2">已开票</option>
- <option value="3">开票失败</option>
- </select>
+ <#SelectCon id="state" name="状态" >
+ <option value="">状态</option>
+ <option value="1">待开票</option>
+ <option value="2">已开票</option>
+ <option value="3">开票失败</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="billType" style="width: 180px;height: 33px" name="billType">
- <option value="">发票类型</option>
- <option value="1">电子发票</option>
- </select>
+ <#SelectCon id="billType" name="发票类型" >
+ <option value="">发票类型</option>
+ <option value="1">电子发票</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="billHeaderType" style="width: 180px;height: 33px" name="billHeaderType">
- <option value="">抬头类型</option>
- <option value="1">公司</option>
- <option value="2">个人</option>
- </select>
+ <#SelectCon id="billHeaderType" name="抬头类型" >
+ <option value="">抬头类型</option>
+ <option value="1">公司</option>
+ <option value="2">个人</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TBill.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TBill.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TBill.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
index 9d4f6ff..5a57737 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
@@ -9,6 +9,7 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
+ <input hidden id="userType" value="${userType}">
<div class="col-sm-2">
<#NameCon id="branchOfficeName" name="分公司名称" />
</div>
@@ -25,45 +26,37 @@
<#NameCon id="condition" name="管理人电话" />
</div>-->
<div class="col-sm-2">
- <select class="input-group" id="operatingBusiness" style="width: 180px;height: 33px" name="operatingBusiness">
- <option value="">选择经营业务</option>
- <option value="1">司机代驾</option>
- </select>
+ <#SelectCon id="operatingBusiness" name="选择经营业务" >
+ <option value="">选择经营业务</option>
+ <option value="1">司机代驾</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="status" style="width: 180px;height: 33px" name="status">
- <option value="">选择状态</option>
- <option value="1">正常</option>
- <option value="2">冻结</option>
- </select>
+ <#SelectCon id="status" name="选择状态" >
+ <option value="">选择状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TBranchOffice.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TBranchOffice.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TBranchOffice.resetSearch()" space="true"/>
</div>
- <div class="col-sm-12">
- @if(shiro.hasPermission("/tBranchOffice/add")){
- <#button name="添加" icon="fa-plus" clickFun="TBranchOffice.openAddTBranchOffice()"/>
- @}
- @if(shiro.hasPermission("/tBranchOffice/update")){
- <#button name="编辑" icon="fa-edit" clickFun="TBranchOffice.openTBranchOfficeDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/tBranchOffice/stop")){
- <#button name="冻结" icon="fa-edit" clickFun="TBranchOffice.stop()" space="true"/>
- @}
- @if(shiro.hasPermission("/tBranchOffice/start")){
- <#button name="启动" icon="fa-edit" clickFun="TBranchOffice.start()" space="true"/>
- @}
- </div>
</div>
- <!--<div class="hidden-xs" id="TBranchOfficeTableToolbar" role="group">
+ <div class="hidden-xs" id="TBranchOfficeTableToolbar" role="group">
@if(shiro.hasPermission("/tBranchOffice/add")){
- <#button name="添加" icon="fa-plus" clickFun="TBranchOffice.openAddTBranchOffice()"/>
+ <#button name="添加" icon="fa-plus" clickFun="TBranchOffice.openAddTBranchOffice()"/>
@}
@if(shiro.hasPermission("/tBranchOffice/update")){
- <#button name="修改" icon="fa-edit" clickFun="TBranchOffice.openTBranchOfficeDetail()" space="true"/>
+ <#button name="编辑" icon="fa-edit" clickFun="TBranchOffice.openTBranchOfficeDetail()" space="true"/>
@}
- </div>-->
+ @if(shiro.hasPermission("/tBranchOffice/stop")){
+ <#button name="冻结" icon="fa-edit" clickFun="TBranchOffice.stop()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tBranchOffice/start")){
+ <#button name="启动" icon="fa-edit" clickFun="TBranchOffice.start()" space="true"/>
+ @}
+ </div>
<#table id="TBranchOfficeTable"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaAdd.html
index ed0b7df..ca93a2e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaAdd.html
@@ -25,7 +25,7 @@
</select>
</div>
<div class="col-sm-4 control-label">
- <label class="col-sm-1" style="width: 20px;">区:</label>
+ <label class="col-sm-1" style="width: 20px;">区/县:</label>
<select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district">
<option value="">请选择</option>
@for(district in districtList){
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaUpdate.html
index 45d2a7f..97399fe 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaUpdate.html
@@ -31,7 +31,7 @@
</select>
</div>
<div class="col-sm-4 control-label">
- <label class="col-sm-1" style="width: 20px;">区:</label>
+ <label class="col-sm-1" style="width: 20px;">区/县:</label>
<select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district">
<option>请选择</option>
@for(district in districtList){
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html
index f5056cc..bfaf76e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TBroadcast.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TBroadcast.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TBroadcast.resetSearch()"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html
index 9c95d30..e2bb2d8 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCancelOrder.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCancelOrder.search()"/>
</div>
</div>
<div class="hidden-xs" id="TCancelOrderTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html
index 3d35322..8c8a947 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html
@@ -110,30 +110,6 @@
<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" >
- <div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >取消时间:</label>
- <label>${cancelTime}</label>
- </div>
- </div>
-
- <div class="initialLevel col-sm-12 control-label form-group" >
- <div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >取消原因:</label>
- <div style="margin-left: 70px" >
- <textarea id="cause" style="width: 681px; height: 249px;" readonly>${cause}</textarea>
- </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>
@@ -188,6 +164,30 @@
</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" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <label class="control-label" >取消时间:</label>
+ <label>${cancelTime}</label>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <label class="control-label" >取消原因:</label>
+ <div style="margin-left: 70px" >
+ <textarea id="cause" style="width: 681px; height: 249px;" readonly>${cause}</textarea>
+ </div>
+ </div>
+ </div>
+
<div class="hidden-xs" id="TDriverTableToolbar" role="group" style="text-align: center">
<#button name="取消" icon="fa-plus" clickFun="TCancelOrderInfoDlg.close()" />
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
index bdcfe5a..f900626 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
@@ -40,7 +40,7 @@
<#NameCon id="franchiseeName" name="所属加盟商" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCar.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_add.html
index d3bae4c..a4c010c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_add.html
@@ -140,5 +140,14 @@
$("#homePageBanner").hide()
}
})
+ //监听下拉菜单的变动操作
+ $("#jumpType").change(function(){
+ if(this.value == 1){
+ $("#jumpUrlIsShow").hide()
+ }
+ if(this.value == 2){
+ $("#jumpUrlIsShow").show()
+ }
+ })
</script>
@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html
index bd552cb..108f062 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html
@@ -152,5 +152,14 @@
$("#homePageBanner").hide()
}
})
+ //监听下拉菜单的变动操作
+ $("#jumpType").change(function(){
+ if(this.value == 1){
+ $("#jumpUrlIsShow").hide()
+ }
+ if(this.value == 2){
+ $("#jumpUrlIsShow").show()
+ }
+ })
</script>
@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
index ccfe69f..5b32305 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
@@ -35,7 +35,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Franchisee.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Franchisee.search()"/>
<#button name="重置" icon="fa-trash" clickFun="Franchisee.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
index 677cd52..1668512 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
@@ -38,7 +38,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCompany.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCompany.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCompany.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
index 06db201..db05d4a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
@@ -22,14 +22,14 @@
<#NameCon id="driverPhone" name="司机手机号" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="state" style="width: 180px;height: 33px" name="state">
- <option value="">选择状态</option>
- <option value="1">待处理</option>
- <option value="2">已处理</option>
- </select>
+ <#SelectCon id="state" name="选择状态" >
+ <option value="">选择状态</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TComplaint.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TComplaint.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TComplaint.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html
index 7c10e66..c75bd82 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html
@@ -13,20 +13,20 @@
<#TimeCon id="createTime" name="发布时间"/>
</div>
<div class="col-sm-2">
- <select class="input-group" id="couponType" style="width: 180px;height: 33px" name="couponType">
- <option value="">优惠券类型</option>
- <option value="1">活动券</option>
- <option value="2">优惠券</option>
- </select>
+ <#SelectCon id="couponType" name="优惠券类型" >
+ <option value="">优惠券类型</option>
+ <option value="1">活动券</option>
+ <option value="2">优惠券</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="couponServiceType" style="width: 180px;height: 33px" name="couponServiceType">
- <option value="">服务类类型</option>
- <option value="1">通用券</option>
- </select>
+ <#SelectCon id="couponServiceType" name="服务类类型" >
+ <option value="">服务类类型</option>
+ <option value="1">通用券</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TCoupon.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCoupon.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCoupon.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
index 5e33072..2b3b9ba 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
@@ -22,7 +22,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >优惠券类型:</label>
- <select id="couponType" name="couponType" onclick="TCoupon.changeCouponType()" style="height: 30px" required>
+ <select id="couponType" name="couponType" onclick="TCoupon.changeCouponType()" style="height: 30px;width: 180px" required>
<option value="">请选择优惠券类型</option>
<option value="1">活动券</option>
<option value="2">新人券</option>
@@ -34,18 +34,25 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class=" control-label">服务类类型：</label>
- <select id="couponServiceType" name="couponServiceType" style="height: 30px" required>
+ <select id="couponServiceType" name="couponServiceType" style="height: 30px;width: 180px" required>
<option value="">请选择服务类类型</option>
<option value="1">通用型</option>
</select>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-12 control-label form-group" id="coupon1" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label">优惠券限制数量：</label>
+ <input id="couponCount" name="couponCount1" type="number" min="0" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" id="coupon2" >
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠券限制数量：</label>
- <input id="couponCount" name="couponCount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponCount" name="couponCount2" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
</div>
@@ -53,7 +60,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">条件金额：订单满</label>
- <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" min="14" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>可使用</label>
@@ -64,7 +71,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠金额：</label>
- <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
</div>
@@ -72,7 +79,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">有效期：</label>
- <input id="couponValidity" name="couponValidity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponValidity" name="couponValidity" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>天</label>
@@ -83,7 +90,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠券总量：</label>
- <input id="remainingQuantity" name="remainingQuantity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="remainingQuantity" name="remainingQuantity" min="1" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
</div>
@@ -91,7 +98,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">赠送数量：</label>
- <input id="couponSendQuantity" name="couponSendQuantity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponSendQuantity" name="couponSendQuantity" min="1" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>张</label>
@@ -113,5 +120,16 @@
<script src="${ctxPath}/static/modular/system/tCoupon/tCoupon_info.js"></script>
<script src="${ctxPath}/static/modular/system/tCoupon/tCoupon.js"></script>
<script type="text/javascript">
+ //监听下拉菜单的变动操作
+ $("#couponType").change(function(){
+ if(this.value == 1){
+ $("#coupon1").show()
+ $("#coupon2").hide()
+ }
+ if(this.value == 2){
+ $("#coupon1").hide()
+ $("#coupon2").show()
+ }
+ })
</script>
@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
index e63bedd..e55ffcd 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -15,15 +15,15 @@
<div class="col-sm-3">
<#NameCon id="phone" name="手机号" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="status" style="width: 80px;height: 33px" name="status">
- <option value="">状态</option>
- <option value="1">正常</option>
- <option value="2">冻结</option>
- </select>
+ <div class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriver.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
@@ -39,7 +39,7 @@
@if(shiro.hasPermission("/tDriver/rechargeBalancePage")){
<#button name="充值" icon="fa-edit" clickFun="TDriver.rechargeBalancePage()"/>
@}
- @if(shiro.hasPermission("/tAgent/add")){
+ @if(shiro.hasPermission("/tDriver/add")){
<#button name="添加" icon="fa-plus" clickFun="TDriver.openAddTDriver()"/>
@}
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaAdd.html
index f78daf4..b542e04 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaAdd.html
@@ -25,7 +25,7 @@
</select>
</div>
<div class="col-sm-4 control-label">
- <label class="col-sm-1" style="width: 20px;">区:</label>
+ <label class="col-sm-1" style="width: 20px;">区/县:</label>
<select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district">
<option>请选择</option>
@for(district in districtList){
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaUpdate.html
index 1d53dbf..647ea00 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaUpdate.html
@@ -31,7 +31,7 @@
</select>
</div>
<div class="col-sm-4 control-label">
- <label class="col-sm-1" style="width: 20px;">区:</label>
+ <label class="col-sm-1" style="width: 20px;">区/县:</label>
<select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district">
<option>请选择</option>
@for(district in districtList){
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html
index 773a4ab..aed8ad4 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html
@@ -38,6 +38,8 @@
<label class="control-label" >手机号:</label>
<label>${phone}</label>
</div>
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ </div>
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">紧急联系人电话:</label>
<label>${emergencyPhone}</label>
@@ -57,13 +59,20 @@
<label>未知</label>
@}
</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>
+ <label></label>
+ </div>
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">邀请人:</label>
- <label>${phone}</label>
+ <label>${inviterName}</label>
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label">电话:</label>
- <label>${phone}</label>
+ <label>${inviterPhone}</label>
</div>
</div>
@@ -72,9 +81,11 @@
<label class="control-label" >驾驶证号码:</label>
<label>${driverLicenseNumber}</label>
</div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">驾龄:</label>
- <label>${driverLicenseNumber}</label>
+ <label>${drivingExperience}</label>
</div>
</div>
@@ -102,10 +113,14 @@
<label class="control-label" >身份证号码:</label>
<label>${idcard}</label>
</div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">加盟城市:</label>
<label>${cityName}</label>
</div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">服务区域:</label>
<label>${areaName}</label>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html
index 57ed60d..eade4c8 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html
@@ -15,15 +15,15 @@
<div class="col-sm-3">
<#NameCon id="name" name="司机姓名" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="status" style="width: 80px;height: 33px" name="status">
- <option value="">状态</option>
- <option value="1">正常</option>
- <option value="2">冻结</option>
- </select>
+ <div class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TDriverCommission.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TDriverCommission.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriverCommission.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html
index 4500740..9a35c4d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html
@@ -13,7 +13,7 @@
<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>
+ <label style="color: #0C0C0C">司机详情</label>
</div>
</div>
<hr/>
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 112e499..ca6cc62 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
@@ -65,23 +65,23 @@
<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>
- <img src="${idcardFront}" style="height: 100px;width: 100px"/>
- </div>
- <div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label">身份证背面照:</label>
- <img src="${idcardBack}" style="height: 100px;width: 100px"/>
- </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>
<label>${name}</label>
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >身份证号码:</label>
<label>${idcard}</label>
+ </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><br/>
+ <img src="${idcardFront}" style="height: 100px;width: 100px"/>
+ </div>
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <label class="control-label">身份证背面照:</label><br/>
+ <img src="${idcardBack}" style="height: 100px;width: 100px"/>
</div>
</div>
@@ -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/tDriver/tDriverException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html
index ee34855..48962c6 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html
@@ -15,15 +15,15 @@
<div class="col-sm-3">
<#NameCon id="phone" name="手机号" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="status" style="width: 80px;height: 33px" name="status">
- <option value="">状态</option>
- <option value="1">正常</option>
- <option value="2">冻结</option>
- </select>
+ <div class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TDriverException.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TDriverException.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriverException.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverExceptionStartAndStop.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverExceptionStartAndStop.html
index 13e4e53..48204ac 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverExceptionStartAndStop.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverExceptionStartAndStop.html
@@ -7,18 +7,20 @@
<div class="col-sm-12">
<input hidden id="id" value="${id}">
<input hidden id="status" value="${status}">
- <div class="col-lg-3">
+ <div>
@if(status==1){
- 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>冻结理由:</label><br/><br/>
+ <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
@if(status==2){
- 解冻理由:<textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>解冻理由:</label><br/><br/>
+ <textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
</div>
- <div class="hidden-xs" id="TDriverTableToolbar" role="group" style="margin-left:300px">
- <#button name="取消" icon="fa-plus" clickFun="TDriverInfoDlg.closeException()" />
- <#button name="确定" icon="fa-plus" clickFun="TDriverException.updateStatus()"/>
- </div>
+ </div>
+ <div class="hidden-xs" id="TDriverTableToolbar" role="group" style="text-align: center">
+ <#button name="取消" icon="fa-plus" clickFun="TDriverInfoDlg.closeException()" />
+ <#button name="确定" icon="fa-plus" clickFun="TDriverException.updateStatus()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverStartAndStop.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverStartAndStop.html
index 041dcf0..24211e4 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverStartAndStop.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverStartAndStop.html
@@ -7,18 +7,20 @@
<div class="col-sm-12">
<input hidden id="id" value="${id}">
<input hidden id="status" value="${status}">
- <div class="col-lg-3">
+ <div>
@if(status==1){
- 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>冻结理由:</label><br/><br/>
+ <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
@if(status==2){
- 解冻理由:<textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
+ <label>解冻理由:</label><br/><br/>
+ <textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
@}
</div>
- <div class="hidden-xs" id="TDriverTableToolbar" role="group" style="margin-left:300px">
- <#button name="取消" icon="fa-plus" clickFun="TDriverInfoDlg.close()" />
- <#button name="确定" icon="fa-plus" clickFun="TDriver.updateStatus()"/>
- </div>
+ </div>
+ <div class="hidden-xs" id="TDriverTableToolbar" role="group" style="text-align: center">
+ <#button name="取消" icon="fa-plus" clickFun="TDriverInfoDlg.close()" />
+ <#button name="确定" icon="fa-plus" clickFun="TDriver.updateStatus()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
index e831775..0c5c2df 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
@@ -23,7 +23,7 @@
<#NameCon id="serverStr" name="服务模式" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectCar.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectCar.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectCar.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCar.selectCarOpt()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCar.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 401786e..71fa608 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -35,23 +35,23 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >紧急联系人姓名:</label>
- <input id="emergencyContact" name="emergencyContact" value="${item.emergencyContact}" type="text" maxlength="20" style="height: 30px" required>
+ <input id="emergencyContact" name="emergencyContact" value="${item.emergencyContact}" type="text" maxlength="20" style="height: 30px" required disabled>
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >紧急联系人电话:</label>
- <input id="emergencyPhone" name="emergencyPhone" value="${item.emergencyPhone}" type="number" maxlength="11" style="height: 30px" required>
+ <input id="emergencyPhone" name="emergencyPhone" value="${item.emergencyPhone}" type="number" maxlength="11" style="height: 30px" required disabled>
</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>
- <input id="inviterName" value="${item.inviterName}" type="text" maxlength="20" style="height: 30px">
+ <input id="inviterName" value="${item.inviterName}" type="text" maxlength="20" style="height: 30px" disabled>
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >邀约人电话:</label>
- <input id="inviterPhone" value="${item.inviterPhone}" type="number" maxlength="11" style="height: 30px">
+ <input id="inviterPhone" value="${item.inviterPhone}" type="number" maxlength="11" style="height: 30px" disabled>
</div>
</div>
@@ -77,28 +77,64 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >身份证号码:</label>
- <input id="idcard" name="idcard" value="${item.idcard}" type="text" maxlength="20" style="height: 30px" required>
+ <input id="idcard" name="idcard" value="${item.idcard}" type="text" maxlength="20" style="height: 30px" required disabled>
</div>
</div>
<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-3 control-label form-group" >-->
+<!-- <span style="color:red">*</span>-->
+<!-- <label class="control-label" >身份证正面照:</label>-->
+<!-- <#uploadImg id="idcardFront" fileImg="${item.idcardFront}"/>-->
+<!-- </div>-->
+ <div class="initialLevel col-sm-3 control-label form-group">
<span style="color:red">*</span>
- <label class="control-label" >身份证正面照:</label>
- <#uploadImg id="idcardFront" fileImg="${item.idcardFront}"/>
+ <label class="control-label">身份证正面照:</label>
+ <div class="form-group">
+ <div class="col-sm-4">
+ <div id="idcardFrontPreId">
+ <div><img width="100px" height="100px" src="${item.idcardFront}">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
- <div class="initialLevel col-sm-3 control-label form-group" >
+<!-- <div class="initialLevel col-sm-3 control-label form-group" >-->
+<!-- <span style="color:red">*</span>-->
+<!-- <label class="control-label" >身份证背面照:</label>-->
+<!-- <#uploadImg id="idcardBack" fileImg="${item.idcardBack}"/>-->
+<!-- </div>-->
+ <div class="initialLevel col-sm-3 control-label form-group">
<span style="color:red">*</span>
- <label class="control-label" >身份证背面照:</label>
- <#uploadImg id="idcardBack" fileImg="${item.idcardBack}"/>
+ <label class="control-label">身份证背面照:</label>
+ <div class="form-group">
+ <div class="col-sm-4">
+ <div id="idcardBackPreId">
+ <div><img width="100px" height="100px" src="${item.idcardBack}">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<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-3 control-label form-group" >-->
+<!-- <span style="color:red">*</span>-->
+<!-- <label class="control-label" >驾驶证:</label>-->
+<!-- <#uploadImg id="driverLicense" fileImg="${item.driverLicense}"/>-->
+<!-- </div>-->
+ <div class="initialLevel col-sm-3 control-label form-group">
<span style="color:red">*</span>
- <label class="control-label" >驾驶证:</label>
- <#uploadImg id="driverLicense" fileImg="${item.driverLicense}"/>
+ <label class="control-label">驾驶证:</label>
+ <div class="form-group">
+ <div class="col-sm-4">
+ <div id="driverLicensePreId">
+ <div><img width="100px" height="100px" src="${item.driverLicense}">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
index 7e280e5..6bda689 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
@@ -38,7 +38,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="YesDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="YesDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="YesDriver.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html
index ef451b9..bf090ab 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html
@@ -16,13 +16,13 @@
<#NameCon id="editionNo" name="版本号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TEdition.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TEdition.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TEdition.resetSearch()" space="true"/>
</div>
</div>
<div class="hidden-xs" id="TEditionTableToolbar" role="group">
@if(shiro.hasPermission("/tEdition/add")){
- <#button name="添加" icon="fa-plus" clickFun="TEdition.openAddTEdition()"/>
+ <#button name="添加版本" icon="fa-plus" clickFun="TEdition.openAddTEdition()"/>
@}
@if(shiro.hasPermission("/tEdition/update")){
<#button name="修改" icon="fa-edit" clickFun="TEdition.openTEditionDetail()" space="true"/>
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..72613e1 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
@@ -24,26 +24,26 @@
</select>
</div>-->
<div class="col-sm-2">
- <select class="input-group" id="score" style="width: 120px;height: 33px" name="score">
- <option value="">选择分数</option>
- <option value="1">非常差</option>
- <option value="2">差</option>
- <option value="3">一般</option>
- <option value="4">满意</option>
- <option value="5">非常满意</option>
- </select>
+ <#SelectCon id="score" name="评价分数" >
+ <option value="">选择分数</option>
+ <option value="1">非常差</option>
+ <option value="2">差</option>
+ <option value="3">一般</option>
+ <option value="4">满意</option>
+ <option value="5">非常满意</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TEvaluate.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TEvaluate.search()"/>
<#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/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html
index 3fc7c19..c1e88f1 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html
@@ -31,7 +31,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>
- <label>${source}</label>
+ @if(1 == source){
+ <label>用户创建</label>
+ @}
+ @if(2 == source){
+ <label>司机创建</label>
+ @}
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >乘车时间:</label>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html
index 80ef970..78b6aba 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html
@@ -35,7 +35,7 @@
</select>
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
- <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData()"/>
<#button name="重置" icon="fa-trash" clickFun="reset()" space="true"/>
</div>
</div>
@@ -213,7 +213,7 @@
M.forEach(function(marker) {
new AMap.Marker({
map: map,
- icon: marker[2]==301?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-1.png':((marker[2]==109||marker[2]==107||marker[2]==108)?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-2.png':
+ icon: marker[2]==301?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-1.png':((marker[2]==109||marker[2]==107||marker[2]==108)?'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png':
(marker[2]==101?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-3.png':'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-4.png')
),
position: [marker[0], marker[1]],
@@ -230,7 +230,7 @@
M.forEach(function(marker) {
new AMap.Marker({
map: map,
- icon: marker[2]==1?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-5.png':'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-6.png',
+ icon: 'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png',
position: [marker[0], marker[1]],
offset: new AMap.Pixel(-13, -30)
});
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html
index f6b6948..5c446b4 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="THtml.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="THtml.search()"/>
</div>
</div>
<div class="hidden-xs" id="THtmlTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
index d17d306..3ee7fe3 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
@@ -34,7 +34,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TInvoice.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TInvoice.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TInvoice.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
index c450377..e1f5d2c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
@@ -29,7 +29,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TLine.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TLine.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TLine.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html
index 608cdd5..ff5a111 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html
@@ -16,10 +16,10 @@
<div class="row btn-group-m-t">
<div class="col-sm-2" style="text-align: center">
@if(shiro.hasPermission("/tMainContent/driverCancelOrder/add")){
- <#button btnCss="info" name="新增" id="ensure" icon="fa-check" clickFun="TMainContent.driverCancelOrderAdd()"/>
+ <#button btnCss="info" name="新增" id="ensure" icon="" clickFun="TMainContent.driverCancelOrderAdd()"/>
@}
@if(shiro.hasPermission("/tMainContent/driverCancelOrder/update")){
- <#button btnCss="info" name="编辑" id="ensure" icon="fa-check" clickFun="TMainContent.driverCancelOrderUpdate()"/>
+ <#button btnCss="info" name="编辑" id="ensure" icon="" clickFun="TMainContent.driverCancelOrderUpdate()"/>
@}
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html
index 98bf03c..2316904 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.driverCancelOrderAddSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="保存" id="ensure" icon="" clickFun="TMainContentInfoDlg.driverCancelOrderAddSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html
index daea4ec..a4f8841 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.driverCancelOrderUpdateSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="" clickFun="TMainContentInfoDlg.driverCancelOrderUpdateSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html
index 770d4ef..cc6ff20 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TMainContent.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TMainContent.search()"/>
</div>
</div>
<div class="hidden-xs" id="TMainContentTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html
index b300cfa..637989c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html
@@ -18,8 +18,8 @@
<div class="row btn-group-m-t">
<div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="提交" id="ensure" icon="" clickFun="TMainContentInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html
index 9ed74f6..effa34d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html
@@ -18,8 +18,8 @@
<div class="row btn-group-m-t">
<div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="提交" id="ensure" icon="" clickFun="TMainContentInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html
index aaba869..295cfb4 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html
@@ -16,10 +16,10 @@
<div class="row btn-group-m-t">
<div class="col-sm-2" style="text-align: center">
@if(shiro.hasPermission("/tMainContent/transferOrder/add")){
- <#button btnCss="info" name="新增" id="ensure" icon="fa-check" clickFun="TMainContent.transferOrderAdd()"/>
+ <#button btnCss="info" name="新增" id="ensure" icon="" clickFun="TMainContent.transferOrderAdd()"/>
@}
@if(shiro.hasPermission("/tMainContent/transferOrder/update")){
- <#button btnCss="info" name="编辑" id="ensure" icon="fa-check" clickFun="TMainContent.transferOrderUpdate()"/>
+ <#button btnCss="info" name="编辑" id="ensure" icon="" clickFun="TMainContent.transferOrderUpdate()"/>
@}
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html
index 72b3eac..588182a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.transferOrderAddSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="保存" id="ensure" icon="" clickFun="TMainContentInfoDlg.transferOrderAddSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html
index 1a2cded..153ecfc 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.transferOrderUpdateSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="" clickFun="TMainContentInfoDlg.transferOrderUpdateSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html
index 6d706c1..854cc49 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html
@@ -16,10 +16,10 @@
<div class="row btn-group-m-t">
<div class="col-sm-2" style="text-align: center">
@if(shiro.hasPermission("/tMainContent/userCancelOrder/add")){
- <#button btnCss="info" name="新增" id="ensure" icon="fa-check" clickFun="TMainContent.userCancelOrderAdd()"/>
+ <#button btnCss="info" name="新增" id="ensure" icon="" clickFun="TMainContent.userCancelOrderAdd()"/>
@}
@if(shiro.hasPermission("/tMainContent/userCancelOrder/update")){
- <#button btnCss="info" name="编辑" id="ensure" icon="fa-check" clickFun="TMainContent.userCancelOrderUpdate()"/>
+ <#button btnCss="info" name="编辑" id="ensure" icon="" clickFun="TMainContent.userCancelOrderUpdate()"/>
@}
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html
index 2ca430a..70cb95e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.userCancelOrderAddSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="保存" id="ensure" icon="" clickFun="TMainContentInfoDlg.userCancelOrderAddSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html
index 837f8a5..177fbaa 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.userCancelOrderUpdateSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="" clickFun="TMainContentInfoDlg.userCancelOrderUpdateSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
index e7c74a4..d7cf59c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="System.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="System.search()"/>
<#button name="重置" icon="fa-trash" clickFun="System.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
index fbf8f2a..1182b06 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TNotices.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TNotices.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TNotices.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html
index e2cfe39..1ab0bf9 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html
@@ -50,7 +50,7 @@
</div>
</div>
<div class="col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="TCancelOrder.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCancelOrder.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCancelOrder.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
index 81e2201..9477cdf 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
@@ -9,48 +9,48 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#TimeCon id="createTime" name="订单时间" />
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="code" name="订单编号" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="source" style="width: 120px;height: 33px" name="source">
- <option value="">请选择订单来源</option>
- <option value="1">小程序</option>
- <option value="2">司机创建</option>
- </select>
+ <div class="col-sm-3">
+ <#SelectCon id="source" name="订单来源" >
+ <option value="">请选择订单来源</option>
+ <option value="1">小程序</option>
+ <option value="2">司机创建</option>
+ </#SelectCon>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="userName" name="下单用户昵称" />
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="userPhone" name="下单用户手机" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="state" style="width: 120px;height: 33px" name="state">
- <option value="">请选择订单状态</option>
- <option value="101">待接单</option>
- <option value="102">已接单</option>
- <option value="103">前往预约点</option>
- <option value="104">到达预约点</option>
- <option value="105">开始服务</option>
- <option value="106">到达目的地</option>
- <option value="107">待支付</option>
- <option value="108">待评价</option>
- <option value="109">已完成</option>
- <option value="201">转单中</option>
- <option value="301">已取消</option>
- <option value="401">等待中</option>
- </select>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">请选择订单状态</option>
+ <option value="101">待接单</option>
+ <option value="102">已接单</option>
+ <option value="103">前往预约点</option>
+ <option value="104">到达预约点</option>
+ <option value="105">开始服务</option>
+ <option value="106">到达目的地</option>
+ <option value="107">待支付</option>
+ <option value="108">待评价</option>
+ <option value="109">已完成</option>
+ <option value="201">转单中</option>
+ <option value="301">已取消</option>
+ <option value="401">等待中</option>
+ </#SelectCon>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="driverName" name="司机姓名" />
</div>
</div>
<div class="col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="TOrder.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrder.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TOrder.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html
index 4461826..90e1bc5 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html
@@ -50,7 +50,7 @@
</div>
</div>
<div class="col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="TOrderException.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrderException.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TOrderException.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
index 4f9968a..7ba4dad 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -39,7 +39,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TOrderEvaluate.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrderEvaluate.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TOrderEvaluate.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html
index 19642c0..560b003 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TOrderRefusal.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrderRefusal.search()"/>
</div>
</div>
<div class="hidden-xs" id="TOrderRefusalTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
index 259c40f..0fe876c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
@@ -54,7 +54,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TReassign.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
index e5fbcb1..f72a5c7 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
@@ -55,7 +55,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TReassign.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
index 62241b2..cafaf7e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
@@ -17,7 +17,7 @@
<#NameCon id="phone" name="司机手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
index a4a739b..70a861a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
@@ -17,7 +17,7 @@
<#NameCon id="phone" name="司机手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectCrossDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectCrossDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectCrossDriver.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCrossDriver.selectDriver()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCrossDriver.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
index 6af6c90..5e2268d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
@@ -17,7 +17,7 @@
<#NameCon id="phone" name="司机手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html
index 1211d30..438ee01 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html
@@ -34,7 +34,7 @@
<#TimeCon id="businessTime" name="交易时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRechargeRecord.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRechargeRecord.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRechargeRecord.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
index ccf2591..74c3656 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
@@ -19,7 +19,7 @@
<#TimeCon id="createTime" name="充值时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRechargeRecordAgent.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRechargeRecordAgent.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRechargeRecordAgent.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html
index b6fdb69..62bab4d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html
@@ -22,7 +22,7 @@
<#TimeCon id="createTime" name="充值时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRechargeRecordUser.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRechargeRecordUser.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRechargeRecordUser.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html
index a8f1d0f..6a6ea97 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TRegion.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRegion.search()"/>
</div>
</div>
<div class="hidden-xs" id="TRegionTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html
index 8fca86a..857c611 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html
@@ -13,20 +13,20 @@
<#NameCon id="code" name="订单号" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="businessType" style="width: 180px;height: 33px" name="businessType">
- <option value="">交易类型</option>
- <option value="11">佣金提现</option>
- <option value="12">余额提现</option>
- <option value="1">支付订单</option>
- </select>
+ <#SelectCon id="businessType" name="交易类型" >
+ <option value="">交易类型</option>
+ <option value="11">佣金提现</option>
+ <option value="12">余额提现</option>
+ <option value="1">支付订单</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="payType" style="width: 180px;height: 33px" name="payType">
- <option value="">支付渠道</option>
- <option value="1">微信支付</option>
- <option value="2">余额支付</option>
- <option value="3">线下收款</option>
- </select>
+ <#SelectCon id="payType" name="支付渠道" >
+ <option value="">支付渠道</option>
+ <option value="1">微信支付</option>
+ <option value="2">余额支付</option>
+ <option value="3">线下收款</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
<#NameCon id="driverName" name="司机姓名" />
@@ -35,7 +35,7 @@
<#TimeCon id="businessTime" name="交易时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRevenue.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRevenue.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRevenue.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html
index 34d61f2..d323318 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TSystemBulletin.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TSystemBulletin.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TSystemBulletin.resetSearch()"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
index 358f2b4..dd87d07 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TSystemConfig.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TSystemConfig.search()"/>
</div>
</div>
<div class="hidden-xs" id="TSystemConfigTableToolbar" role="group">
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 a0853c6..8e072d6 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
@@ -15,37 +15,37 @@
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <!--<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" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num1" name="num1" value="${num1}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单</span>
</div>
- </div>
+ </div>-->
<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" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num2" name="num2" value="${num2}" type="text" min="0" 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-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" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num3" name="num3" value="${num3}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单 司机A获得</span>
- <input class="control-label" id="num4" name="num4" value="${num4}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num4" name="num4" value="${num4}" type="text" min="0" 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-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" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num5" name="num5" value="${num5}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单 司机B获得</span>
- <input class="control-label" id="num6" name="num6" value="${num6}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num6" name="num6" value="${num6}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单 司机A获得</span>
- <input class="control-label" id="num7" name="num7" value="${num7}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num7" name="num7" value="${num7}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单</span>
</div>
</div>
@@ -66,44 +66,45 @@
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
<script>
- $("input[name=num1]").bind('input',function(){
+ $("input[name=num1]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num2]").bind('input',function(){
+ $("input[name=num2]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num3]").bind('input',function(){
+ $("input[name=num3]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num4]").bind('input',function(){
+ $("input[name=num4]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num5]").bind('input',function(){
+ $("input[name=num5]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num6]").bind('input',function(){
+ $("input[name=num6]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num7]").bind('input',function(){
+ $("input[name=num7]").mouseleave(function(){
var value = $(this).val()
regexp(value)
})
function regexp(value){
- var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
+ var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数
+ var reg1 = /^(([1-9]{1}\d*)|(0{1}))(\.\d{2})$/; // 两位小数
//先判断是否为整数 在判断 是否在 1-总页 整数范围之内
if(reg.test(value)){
- if(parseInt(value) <= 0){
- Feng.error("请输入大于0的正整数");
+ if(value == 0){
+ Feng.error("请输入大于0的整数或保留两位小数");
return;
}
}else{
- Feng.error("请输入大于0的正整数");
+ Feng.error("请输入整数或保留两位小数");
return;
}
}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html
index ec6a562..3bd3848 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html
@@ -13,14 +13,14 @@
<#TimeCon id="createTime" name="发布时间" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="type" style="width: 180px;height: 33px" name="type">
+ <#SelectCon id="type" name="服务类类型" >
<option value="">服务类类型</option>
<option value="1">次数</option>
<option value="2">小时</option>
- </select>
+ </#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TYouTui.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TYouTui.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TYouTui.resetSearch()"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html
index bf45922..7af9250 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html
@@ -23,11 +23,10 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >优推类型:</label>
- <input id="number" name="number" type="number" placeholder="请输入0以上的数字" min="0" style="height: 30px" required>
+ <input id="number" name="number" type="number" placeholder="请输入0以上的数字" min="1" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<select id="type" name="type" style="height: 30px" required>
- <option value="">请选择类型</option>
<option value="1">次数</option>
<option value="2">小时</option>
</select>
@@ -38,13 +37,12 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >兑换条件:</label>
- <input id="integral" name="integral" type="number" maxlength="4" placeholder="最多4位数" style="height: 30px" required>
+ <input id="integral" name="integral" type="number" min="1" maxlength="4" placeholder="最多4位数" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>积分</label>
</div>
</div>
-
<div class="initialLevel col-sm-12 control-label form-group">
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
@@ -60,7 +58,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >有效期:</label>
- <input id="effectiveTime" name="effectiveTime" maxlength="4" placeholder="最多4位数" type="number" style="height: 30px" required>
+ <input id="effectiveTime" name="effectiveTime" min="1" maxlength="4" placeholder="最多4位数" type="number" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>天</label>
@@ -72,6 +70,18 @@
<span style="color:red">*</span>
<label class="control-label" >服务内容:</label>
<textarea id="serviceContent" name="serviceContent" placeholder="请输入" maxlength="500" style="height: 80px" required></textarea>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group">
+ <div class="initialLevel col-sm-8 control-label form-group" >
+ <div style="width: 20%">
+ <span style="color:red">*</span>
+ <label class="control-label" >上传图片:</label>
+ </div>
+ <div style="width: 80%" >
+ <#uploadImg id="picture" name="picture"/>
+ </div>
</div>
</div>
@@ -92,4 +102,11 @@
</div>
</div>
<script src="${ctxPath}/static/modular/system/tYouTui/tYouTui_info.js"></script>
+<script type="text/javascript">
+ $(function (){
+ var idCardPositive = new $WebUpload("picture");
+ idCardPositive.setUploadBarId("progressBar");
+ idCardPositive.init();
+ })
+</script>
@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
index 06372ae..84045d0 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
@@ -12,14 +12,14 @@
<div class="form-horizontal">
<div class="row">
<div class="col-sm-12">
- <#input id="oldPwd" name="原密码" underline="true" type="password"/>
+ <#input id="oldPwd" name="原始密码" underline="true" type="password"/>
<#input id="newPwd" name="新密码" underline="true" type="password"/>
- <#input id="rePwd" name="新密码验证" type="password"/>
+ <#input id="rePwd" name="确认新密码" type="password"/>
</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="UserInfoDlg.chPwd()"/>
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="UserInfoDlg.chPwd()"/>
</div>
</div>
</div>
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..35bd98e 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
@@ -22,12 +22,15 @@
return "";
}*/
},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: 'ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '角色名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
{title: '上级角色', field: 'pName', align: 'center', valign: 'middle', sortable: true},
- {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
- {title: '包含账户数', field: 'userCount', align: 'center', valign: 'middle', sortable: true},
- {title: '别名', field: 'tips', align: 'center', valign: 'middle', sortable: true}]
+ {title: '所属部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
+ {title: '负责人', field: 'headName', align: 'center', valign: 'middle', sortable: true},
+ {title: '负责人电话', field: 'headPhone', align: 'center', valign: 'middle', sortable: true},
+ {title: '包含账户数', field: 'userCount',visible: false, align: 'center', valign: 'middle', sortable: true},
+ {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
+ {title: '别名', field: 'tips', visible: false,align: 'center', valign: 'middle', sortable: true}]
return columns;
};
@@ -122,9 +125,21 @@
Role.search = function () {
var queryData = {};
queryData['roleName'] = $("#roleName").val();
+ queryData['headName'] = $("#headName").val();
+ queryData['headPhone'] = $("#headPhone").val();
Role.table.refresh({query: queryData});
}
+/**
+ * 重置
+ */
+Role.resetSearch = function (){
+ $("#roleName").val('');
+ $("#headName").val('');
+ $("#headPhone").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/role/role_info.js b/management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js
index c9fc418..0083ff9 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js
@@ -19,14 +19,26 @@
message: '别名不能为空'
}
}
- }/*,
- pName: {
+ },
+ headName: {
validators: {
notEmpty: {
- message: '父级名称不能为空'
+ message: '负责人名称不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
- }*/
+ },
+ headPhone: {
+ validators: {
+ regexp: {
+ regexp: /^1[3-9]\d{9}$/,
+ message: '请输入合法手机号'
+ }
+ }
+ }
}
};
@@ -118,7 +130,7 @@
* 收集数据
*/
RolInfoDlg.collectData = function () {
- this.set('id').set('name').set('pid').set('deptid').set('tips').set('num');
+ this.set('id').set('name').set('pid').set('deptid').set('tips').set('num').set("headName").set("headPhone");
};
/**
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
index f815e7a..220a924 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
@@ -244,9 +244,11 @@
var principal=$("#principal").val();
var principalPhone = $("#principalPhone").val();
var createTime = $("#createTime").val();
+ var status = $("#status").val();
window.location.href=Feng.ctxPath + "/tAgent/export?principal="+principal
+"&principalPhone="+principalPhone
+"&createTime="+createTime
+ +"&status="+status
;
}
@@ -258,6 +260,7 @@
queryData['principal'] = $("#principal").val();
queryData['principalPhone'] = $("#principalPhone").val();
queryData['createTime'] = $("#createTime").val();
+ queryData['status'] = $("#status").val();
TAgent.table.refresh({query: queryData});
};
@@ -268,6 +271,7 @@
$("#principal").val('');
$("#principalPhone").val('');
$("#createTime").val('');
+ $("#status").val('');
TAgent.search();
}
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/tAppUser.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
index c820a68..56bf20c 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
@@ -124,7 +124,7 @@
var index = layer.open({
type: 2,
title: '停用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUser_start_and_stop?id='+id
@@ -139,7 +139,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUser_start_and_stop?id='+id
@@ -151,22 +151,32 @@
* 提交启用冻结
*/
TAppUser.updateStatus = function () {
- var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) {
- Feng.success("修改成功!");
- TAppUserInfoDlg.close();
- parent.TAppUser.table.refresh();
- }, function (data) {
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- });
- ajax.set("id",$("#id").val());
- ajax.set("status",$("#status").val());
- if($("#status").val() == 1){
- ajax.set("remark",$("#stopRemark").val());
- }
- if($("#status").val() == 2){
- ajax.set("remark",$("#startRemark").val());
- }
- ajax.start();
+ var status = $("#status").val();
+ if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+ Feng.info("请输入冻结理由!")
+ return;
+ }
+ if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+ Feng.info("请输入启用理由!")
+ return;
+ }
+
+ var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) {
+ Feng.success("修改成功!");
+ TAppUserInfoDlg.close();
+ parent.TAppUser.table.refresh();
+ }, function (data) {
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("id",$("#id").val());
+ ajax.set("status",$("#status").val());
+ if($("#status").val() == 1){
+ ajax.set("remark",$("#stopRemark").val());
+ }
+ if($("#status").val() == 2){
+ ajax.set("remark",$("#startRemark").val());
+ }
+ ajax.start();
};
/**
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/tAppUser/tAppUserException.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
index 2083ba3..55d1770 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
@@ -102,7 +102,7 @@
var index = layer.open({
type: 2,
title: '停用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUserException_start_and_stop?id='+id
@@ -117,7 +117,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUserException_start_and_stop?id='+id
@@ -129,6 +129,16 @@
* 提交启用冻结
*/
TAppUserException.updateStatus = function () {
+ var status = $("#status").val();
+ if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+ Feng.info("请输入冻结理由!")
+ return;
+ }
+ if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+ Feng.info("请输入启用理由!")
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) {
Feng.success("修改成功!");
TAppUserInfoDlg.closeException();
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js
index c2e71ce..13ffad5 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js
@@ -127,6 +127,13 @@
* 删除
*/
TBranchOffice.delete = function (id) {
+
+ var userType = $('#userType').val()
+ if(userType == 2){
+ Feng.error("无权删除分公司!")
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/delete", function (data) {
Feng.success("删除成功!");
TBranchOffice.table.refresh();
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/tCommercial/tCommercial.js b/management/guns-admin/src/main/webapp/static/modular/system/tCommercial/tCommercial.js
index 2c5dda3..c09a949 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tCommercial/tCommercial.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tCommercial/tCommercial.js
@@ -26,7 +26,11 @@
}
}
},
- {title: '广告图图片', field: 'url', visible: true, align: 'center', valign: 'middle'},
+ {title: '广告图图片', field: 'url', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ return '<img src="'+row.url+'" style="height: 60px;width: 60px"/>'
+ }
+ },
{title: '端口(设备)', field: 'device', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
if (row.device === 1){
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js b/management/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js
index d4119d6..e581956 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js
@@ -20,6 +20,7 @@
{title: '投诉时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
{title: '投诉人昵称', field: 'userName', visible: true, align: 'center', valign: 'middle'},
{title: '投诉人电话', field: 'userPhone', visible: true, align: 'center', valign: 'middle'},
+ {title: '投诉司机电话', field: 'driverPhone', visible: true, align: 'center', valign: 'middle'},
{title: '投诉原因', field: 'reason', visible: true, align: 'center', valign: 'middle'},
{title: '备注', field: 'notes', visible: true, align: 'center', valign: 'middle'},
{title: '处理状态', field: 'state', visible: true, align: 'center', valign: 'middle',
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js
index 91fbf7b..b2549d4 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js
@@ -8,6 +8,10 @@
validators: {
notEmpty: {
message: '优惠券名称不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
@@ -22,17 +26,6 @@
validators: {
notEmpty: {
message: '请选择服务类类型'
- }
- }
- },
- couponCount: {
- validators: {
- notEmpty: {
- message: '优惠券数量不能为空'
- },
- regexp: {
- regexp: /^[1-9]\d*$/,
- message: '请输入大于0的正整数'
}
}
},
@@ -157,11 +150,33 @@
return ;
}
+ var couponConditionalAmount = $('#couponConditionalAmount').val();
+ if(couponConditionalAmount < 14){
+ Feng.info("条件金额最低14元!")
+ return;
+ }
+
+ var couponType = $('#couponType').val();
+ if(couponType == 2 && ($("input[name=couponCount2]").val() == null || $("input[name=couponCount2]").val() == '')){
+ Feng.info("请填写优惠券限制数量!")
+ return;
+ }
+
+ // if(couponType == 2 && $("input[name=couponCount2]").val() < 1){
+ // Feng.info("新人优惠券限制数量必须大于0!")
+ // return;
+ // }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCoupon/add", function(data){
- Feng.success("添加成功!");
- window.parent.TCoupon.table.refresh();
- TCouponInfoDlg.close();
+ if(500 == data.code){
+ Feng.error(data.message)
+ return;
+ }else {
+ Feng.success("添加成功!");
+ window.parent.TCoupon.table.refresh();
+ TCouponInfoDlg.close();
+ }
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
index 82657ea..9aece9f 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -165,7 +165,7 @@
var index = layer.open({
type: 2,
title: '冻结',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -180,7 +180,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -192,6 +192,18 @@
* 提交启用冻结
*/
TDriver.updateStatus = function () {
+
+ var status = $("#status").val();
+ console.log(status)
+ if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+ Feng.info("请输入冻结理由!")
+ return;
+ }
+ if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+ Feng.info("请输入解冻理由!")
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tDriver/update-status", function (data) {
Feng.success("修改成功!");
TDriverInfoDlg.close();
@@ -221,7 +233,7 @@
var index = layer.open({
type: 2,
title: '充值余额',
- area: ['45%', '20%'], //宽高
+ area: ['800px', '220px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/rechargeBalancePage?id=' + id
@@ -300,6 +312,12 @@
* 提交审核
*/
TDriver.auditSubmit = function () {
+
+ if($("#approvalStatus").val() == 3 && ($("#approvalNotes").val() == '' || $("#approvalNotes").val() == null)){
+ Feng.info("请输入驳回原因!");
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tDriver/auditSubmit", function (data) {
Feng.success("修改成功!");
TDriverInfoDlg.close();
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js
index c7ca600..b85fb5c 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js
@@ -15,7 +15,7 @@
return [
{field: 'selectItem', radio: true},
{title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '关联层级', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '关联层级', field: 'level', visible: true, align: 'center', valign: 'middle'},
{title: '用户姓名', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
{title: '上级人员', field: 'inviterName', visible: true, align: 'center', valign: 'middle'},
@@ -32,6 +32,7 @@
}
}},
{title: '关联人数', field: 'connectedPersons', visible: true, align: 'center', valign: 'middle'},
+ {title: '更新时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
return '<a href="#" onclick="TDriverCommissionConnect.searchTDriverDetail('+row.id+')" style="color:blue">查询</a>'
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
index dfeb8aa..ba3b551 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
@@ -128,7 +128,7 @@
var index = layer.open({
type: 2,
title: '停用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriverException_start_and_stop?id='+id
@@ -143,7 +143,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriverException_start_and_stop?id='+id
@@ -155,6 +155,17 @@
* 提交启用冻结
*/
TDriverException.updateStatus = function () {
+
+ var status = $("#status").val();
+ if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+ Feng.info("请输入冻结理由!")
+ return;
+ }
+ if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+ Feng.info("请输入解冻理由!")
+ return;
+ }
+
var ajax = new $ax(Feng.ctxPath + "/tDriver/update-status", function (data) {
Feng.success("修改成功!");
TDriverInfoDlg.closeException();
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..c6869b1 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: '不能输入特殊字符和数字'
}
}
},
@@ -51,6 +59,10 @@
validators: {
notEmpty: {
message: '身份证号码不能为空'
+ },
+ regexp: {
+ regexp: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
+ message: '请输入合法身份证号码'
}
}
},
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tEdition/tEdition.js b/management/guns-admin/src/main/webapp/static/modular/system/tEdition/tEdition.js
index e09f924..ca8191c 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tEdition/tEdition.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tEdition/tEdition.js
@@ -14,16 +14,16 @@
TEdition.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: '主键', field: 'id', visible: true, align: 'center', valign: 'middle'},
- {title: '版本编号', field: 'editionNo', visible: true, align: 'center', valign: 'middle'},
- {title: '版本文件', field: 'editionFile', visible: true, align: 'center', valign: 'middle',
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
+ {title: '更新时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '版本编号', field: 'editionNo', visible: true, align: 'center', valign: 'middle'},
+ {title: '版本文件', field: 'editionFile', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
return row.editionFile.substr(47,row.editionFile.length)
}
},
- {title: '版本公告', field: 'editionAnnouncement', visible: true, align: 'center', valign: 'middle'},
- {title: '端口', field: 'editionPort', visible: false, align: 'center', valign: 'middle'},
- {title: '创建时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '版本公告', field: 'editionAnnouncement', visible: true, align: 'center', valign: 'middle'},
+ {title: '端口', field: 'editionPort', visible: false, align: 'center', valign: 'middle'},
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
return '<a href="#" onclick="TEdition.delete('+row.id+')" style="color:red">删除</a>'
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: '支付订单详情',
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 0375706..85d79f5 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
@@ -114,13 +114,14 @@
Feng.error("保存失败!" + data.responseJSON.message + "!");
});
var reqData = {};
- reqData['num1'] = Number($("#num1").val());
- reqData['num2'] = Number($("#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['num1'] = $("#num1").val();
+ reqData['num2'] = $("#num2").val();
+ reqData['num3'] = $("#num3").val();
+ reqData['num4'] = $("#num4").val();
+ reqData['num5'] = $("#num5").val();
+ reqData['num6'] = $("#num6").val();
+ reqData['num7'] = $("#num7").val();
+ console.log(JSON.stringify(reqData))
ajax.set("content",JSON.stringify(reqData));
ajax.set("type",2);
ajax.start();
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js
index 59da50f..414d4ee 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js
@@ -27,6 +27,11 @@
}
},
{title: '服务内容', field: 'content', visible: true, align: 'center', valign: 'middle'},
+ {title: '图片', field: 'picture', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ return '<img src="'+row.picture+'" style="height: 60px;width: 60px"/>'
+ }
+ },
{title: '兑换积分数', field: 'integral', visible: true, align: 'center', valign: 'middle'},
{title: '优推值', field: 'number', visible: false, align: 'center', valign: 'middle'},
{title: '优推距离(米)', field: 'distance', visible: true, align: 'center', valign: 'middle'},
@@ -34,9 +39,9 @@
{title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
if (row.status === 1){
- return '<span>正常</span>'
+ return '<span>启用</span>'
}else if (row.status === 2){
- return '<span>冻结</span>'
+ return '<span>停用</span>'
}else if (row.status === 3){
return '<span>已删除</span>'
}
@@ -45,11 +50,11 @@
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
if (row.status === 1){
- return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:red">冻结</a>' +' ' +
- '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:red">删除</a>'
+ return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:lightskyblue">停用</a>' +' ' +
+ '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:lightskyblue">删除</a>'
}else if (row.status === 2){
- return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:green">解冻</a>' +' ' +
- '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:red">删除</a>'
+ return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:lightskyblue">启用</a>' +' ' +
+ '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:lightskyblue">删除</a>'
}
}
}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js
index e182b88..e989234 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js
@@ -8,6 +8,10 @@
validators: {
notEmpty: {
message: '优推名称不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
@@ -120,6 +124,7 @@
.set('status')
.set('distance')
.set('serviceContent')
+ .set('picture')
.set('createTime');
}
--
Gitblit v1.7.1