From ad86e0cb28f4301c4935bea43e4ebd824338390e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 18 五月 2023 16:44:46 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 6
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java | 11 +
management/guns-admin/src/main/resources/application.yml | 3
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 14 +-
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 16 ++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 20 ++
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js | 18 ++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java | 4
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js | 20 +++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 48 ++++---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetail.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java | 52 ++++++++
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html | 22 +++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pojo/GaoDePoJo.java | 28 ++++
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetailConnect.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html | 7 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html | 42 ++++--
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/tAppUser/tAppUserDetailException.html | 10 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html | 2
23 files changed, 279 insertions(+), 60 deletions(-)
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 f815215..0e38599 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
@@ -235,7 +235,11 @@
tUserToCoupon.setExpireTime(expireTime);
// 添加发放人id和类型
- tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
+ if(ShiroKit.getUser().getRoleType() == 1){
+ tUserToCoupon.setObjectId(1);
+ }else {
+ tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
+ }
tUserToCoupon.setRoleType(ShiroKit.getUser().getRoleType());
tUserToCoupons.add(tUserToCoupon);
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 0a5f6f0..f1bc1a1 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
@@ -51,6 +51,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -219,8 +220,8 @@
* 佣金跳转详情页面
*/
@RequestMapping("/commission/driverCommissionDetail")
- public String driverCommissionDetail(Integer tDriverId, Model model) {
- tDriverService.driverCommissionDetail(tDriverId,model);
+ public String driverCommissionDetail(Integer tDriverId,Integer levelFlag, Model model) {
+ tDriverService.driverCommissionDetail(tDriverId,levelFlag,model);
return PREFIX + "tDriverCommissionDetail.html";
}
@@ -348,7 +349,11 @@
public Object commissionList(String name,String phone,Integer status) {
EntityWrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
List<TDriver> tDrivers = tDriverService.selectList(wrapper);
- return tDriverService.getTDriverCommissionResp(tDrivers);
+ List<TDriverCommissionResp> commissionResp = tDriverService.getTDriverCommissionResp(tDrivers);
+ for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
+ tDriverCommissionResp.setLevelFlag(0);
+ }
+ return commissionResp;
}
/**
* 获取异常列表
@@ -368,8 +373,7 @@
*/
@RequestMapping(value = "/commission/connect/list")
@ResponseBody
- public Object commissionConnectList(String driverId) {
-
+ public Object commissionConnectList(String driverId,Integer levelFlag) {
// 查询当前用户的用户信息
TDriver tDriver = tDriverService.selectById(driverId);
@@ -379,24 +383,30 @@
}
wrapper.orderBy("createTime",false);
List<TDriver> list = tDriverService.selectList(wrapper);
- List<TDriverCommissionResp> commissionResp = tDriverService.getTDriverCommissionResp(list);
- for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
- 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 {
+ List<TDriverCommissionResp> commissionResp = new ArrayList<>();
+ try{
+ commissionResp = tDriverService.getTDriverCommissionResp(list);
+ for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
+ if(Objects.nonNull(tDriver)){
+ tDriverCommissionResp.setInviterName(tDriver.getName());
+ tDriverCommissionResp.setInviterPhone(tDriver.getPhone());
+ if(levelFlag == 0){
+ tDriverCommissionResp.setLevelFlag(1);
+ tDriverCommissionResp.setLevel("一级");
+ }
+ if(levelFlag == 1){
+ tDriverCommissionResp.setLevelFlag(2);
tDriverCommissionResp.setLevel("二级");
}
- }else {
- tDriverCommissionResp.setLevel("一级");
- }
+ if(levelFlag == 2){
+ tDriverCommissionResp.setLevelFlag(3);
+ tDriverCommissionResp.setLevel("三级");
+ }
+ }
}
+ }catch (Exception e){
+ e.printStackTrace();
}
return commissionResp;
}
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 e966706..2e81210 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
@@ -1,20 +1,27 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.GunsApplication;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.state.Order;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.controller.resp.TOrderServerResp;
+import com.stylefeng.guns.modular.system.controller.util.HttpUtils;
import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
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.pojo.GaoDePoJo;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -41,6 +48,8 @@
@RequestMapping("/tHomePage")
public class THomePageController extends BaseController {
+ private final static Logger log = LoggerFactory.getLogger(THomePageController.class);
+
@Autowired
private IUserService userService;
@Autowired
@@ -53,6 +62,10 @@
private ITRevenueService tRevenueService;
@Autowired
private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private GaoDePoJo gaoDePoJo;
+ @Autowired
+ private HttpUtils httpUtils;
@Autowired
private RedisUtil redisUtil;
@@ -75,6 +88,10 @@
.ne("status", StatusEnum.DELETE.getCode())
.ne("principal",""));
model.addAttribute("agentList",agentList);
+ // 查询广东省广州市的地址解析
+ Map<String, String> map = geocode("广东省广州市");
+ model.addAttribute("addressLon",map.get("addressLon"));
+ model.addAttribute("addressLat",map.get("addressLat"));
// 查询广东全区域数据 查询广东所有的代理商
List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>()
.eq("provinceCode", "440000"));
@@ -172,6 +189,11 @@
map.put("agentList",agentList);
if(Objects.nonNull(agentId)){
+ // 查询当前代理商
+ TAgent tAgent = tAgentService.selectById(agentId);
+ Map<String, String> mapAddress = geocode(tAgent.getProvinceName()+tAgent.getCityName());
+ map.put("addressLon",mapAddress.get("addressLon"));
+ map.put("addressLat",mapAddress.get("addressLat"));
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
.eq("agentId", agentId));
@@ -253,6 +275,10 @@
// 查询统计在线司机，待接单，服务中，已完成，已取消
List<TDriver> onLineDriver = tDriverService.selectList(new EntityWrapper<TDriver>()
.in("agentId", ids));
+
+ Map<String, String> mapAddress = geocode("广东省广州市");
+ map.put("addressLon",mapAddress.get("addressLon"));
+ map.put("addressLat",mapAddress.get("addressLat"));
List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
@@ -669,4 +695,30 @@
return map;
}
+ private Map<String,String> geocode(String address){
+ Map<String,String> map = new HashMap<>(2);
+ try {
+ String url = "https://restapi.amap.com/v3/geocode/geo?address=" + address + "&key=" + gaoDePoJo.getKey();
+ url = url.trim().replace("#", "").replace(" ", "");
+ String result = httpUtils.get(url);
+ log.info("地址解析结果:{}", result);
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ if (jsonObject.getString("status").equals("1")) {
+ String geocodes = jsonObject.getString("geocodes");
+ JSONArray objects = JSONObject.parseArray(geocodes);
+ String string = objects.getString(0);
+ JSONObject geocodesObject = JSONObject.parseObject(string);
+ log.info("地址数据:{}", geocodesObject);
+ String location = geocodesObject.getString("location");
+ String[] split = location.split(",");
+ map.put("addressLon",split[0]);
+ map.put("addressLat",split[1]);
+ }
+ } catch (Exception e) {
+ log.error("解析地址失败============:{}", e.getMessage());
+ e.printStackTrace();
+ }
+ return map;
+ }
+
}
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 678e0f6..24d5a39 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
@@ -113,7 +113,7 @@
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("num3",jsonObject.getString("num3"));
return PREFIX + "tSystemConfigExtractionRules.html";
}
/**
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 ddf5e84..d583a36 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
@@ -10,6 +10,9 @@
@ApiModelProperty(value = "层级")
private String level;
+ @ApiModelProperty(value = "标识")
+ private Integer levelFlag;
+
// 所属代理商
@ApiModelProperty(value = "所属代理商")
private String agentName;
@@ -32,6 +35,14 @@
@ApiModelProperty(value = "邀约人电话")
private String inviterPhone;
+ public Integer getLevelFlag() {
+ return levelFlag;
+ }
+
+ public void setLevelFlag(Integer levelFlag) {
+ this.levelFlag = levelFlag;
+ }
+
public String getLevel() {
return level;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pojo/GaoDePoJo.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pojo/GaoDePoJo.java
new file mode 100644
index 0000000..8afcb6a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pojo/GaoDePoJo.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.pojo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author xiaochen
+ * @Date 2022/6/29/02915:26
+ */
+@Component
+@ConfigurationProperties(prefix = "gaode.map")
+public class GaoDePoJo implements Serializable {
+
+ @JsonProperty(value = "key")
+ private String key;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
index 1b133ba..ef3ac5f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
@@ -79,7 +79,7 @@
* @param tDriverId
* @param model
*/
- void driverCommissionDetail(Integer tDriverId, Model model);
+ void driverCommissionDetail(Integer tDriverId,Integer levelFlag, Model model);
/**
* 统计司机数
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 572adb0..d06acb6 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
@@ -25,6 +25,7 @@
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -57,6 +58,7 @@
model.addAttribute("id",tAppUser.getId());
model.addAttribute("nickname",tAppUser.getNickname());
model.addAttribute("remark",tAppUser.getRemark());
+ model.addAttribute("accountBalance",tAppUser.getAccountBalance());
model.addAttribute("createTime",DateUtil.formatDate(tAppUser.getCreateTime()));
// todo 客户渠道
model.addAttribute("customerChannel","");
@@ -106,7 +108,7 @@
}else {
TOrder tOrder = payOrder.get(0);
// 最近消费时间
- model.addAttribute("latelyTime",DateUtil.formatDate(tOrder.getCreateTime()));
+ model.addAttribute("latelyTime",DateUtil.formatDate(tOrder.getPayTime()));
// 最近消费金额
model.addAttribute("latelyPrice",tOrder.getPayMoney());
}
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 dd6964d..d6eac87 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
@@ -184,6 +184,7 @@
model.addAttribute("areaName",tDriver.getAreaName());
model.addAttribute("integral",tDriver.getIntegral());
model.addAttribute("score",tDriver.getScore());
+ model.addAttribute("source",tDriver.getSource());
model.addAttribute("createTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tDriver.getCreateTime()));
// 计算驾龄
@@ -470,11 +471,12 @@
}
@Override
- public void driverCommissionDetail(Integer tDriverId, Model model) {
+ public void driverCommissionDetail(Integer tDriverId, Integer levelFlag,Model model) {
// 查询司机
TDriver driver = tDriverMapper.selectById(tDriverId);
+ model.addAttribute("levelFlag",levelFlag);
// 司机信息封装
model.addAttribute("driverId",tDriverId);
model.addAttribute("name",driver.getName());
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java
index 105c494..d7f6b71 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java
@@ -38,7 +38,9 @@
// 判断发送状态
if(2 == tSystemBulletin.getState()){
// 查找所有司机
- List<TDriver> list = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("id",1));
+ List<TDriver> list = tDriverMapper.selectList(new EntityWrapper<TDriver>()
+ .eq("approvalStatus",2)
+ .eq("status",1));
List<TSystemBulletinUser> tSystemBulletinUsers = new ArrayList<>(list.size());
for (TDriver tDriver : list) {
TSystemBulletinUser tSystemBulletinUser = new TSystemBulletinUser();
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 62e7a81..b70420a 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
@@ -3,10 +3,7 @@
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.model.TDriverWork;
-import com.stylefeng.guns.modular.system.model.TOrder;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -15,10 +12,12 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.Period;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
@@ -37,15 +36,26 @@
private ITOrderService orderService;
@Autowired
private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private ITUserToCouponService userToCouponService;
/**
- * 每隔一分钟去处理的定时任务
+ * 每隔一分钟去处理的定时任务,过期优惠券
*/
@Scheduled(fixedRate = 1000 * 60)
public void taskMinute(){
try {
+ // 查询所有优惠券
+ List<TUserToCoupon> tUserToCoupons = userToCouponService.selectList(new EntityWrapper<TUserToCoupon>());
+ List<TUserToCoupon> collect2 = tUserToCoupons.stream().filter(tUserToCoupon -> LocalDateTime.now().isAfter(DateUtil.dateToLocalDateTime(tUserToCoupon.getExpireTime()))).collect(Collectors.toList());
+ for (TUserToCoupon userToCoupon : collect2) {
+ Integer validCount = userToCoupon.getValidCount();
+ userToCoupon.setExpireCount(validCount);
+ userToCoupon.setValidCount(0);
+ }
+ userToCouponService.updateBatchById(collect2);
} 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 f92b0ed..091b8fc 100644
--- a/management/guns-admin/src/main/resources/application.yml
+++ b/management/guns-admin/src/main/resources/application.yml
@@ -41,6 +41,9 @@
conf:
appId: wx8a9af3889395d0e1
secret: 95a34f114973298cce4297a20bb59bc3
+gaode:
+ map:
+ key: e0370a9a4d10739045fb0b8f4742a67e #高德key
#eureka:
# client:
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 786a2b0..398e9f6 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
@@ -366,7 +366,7 @@
queryOrderCount()
break;
case "map":
- map("");
+ map("",113.264434,23.129162);
break;
case "order":
mapOrder("");
@@ -717,7 +717,7 @@
document.getElementById("cancelCount").innerText=data.cancelCount
$('#allList').val(data.allList);
console.log(data.allList)
- map(data.allList)
+ map(data.allList,data.addressLon,data.addressLat)
getOrderData()
}, function (data) {
@@ -736,7 +736,7 @@
document.getElementById("finishCount").innerText=data.finishCount
document.getElementById("cancelCount").innerText=data.cancelCount
$('#allList').val(data.allList);
- map(data.allList)
+ map(data.allList,data.addressLon,data.addressLat)
getOrderData()
}, function (data) {
});
@@ -783,7 +783,7 @@
}
- function map(e){
+ function map(e,addressLon,addressLat){
window._AMapSecurityConfig = {
securityJsCode:'b62d9146929db08c4c2f4537d045320d',
};
@@ -810,7 +810,7 @@
var map = new AMap.Map('container', {
viewMode: '2D', // 默认使用 2D 模式，如果希望使用带有俯仰角的 3D 模式，请设置 viewMode: '3D',
zoom:10, //初始化地图层级
- center: [104.043246,30.641849] //初始化地图中心点
+ center: [addressLon,addressLat] //初始化地图中心点
});
// map.clearMap(); // 清除地图覆盖物
// 经纬度坐标数组
@@ -823,7 +823,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: marker[2]==1?'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png':'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png',
position: [marker[0], marker[1]],
offset: new AMap.Pixel(-13, -30)
});
@@ -861,7 +861,7 @@
var map = new AMap.Map('containerOrder', {
viewMode: '2D', // 默认使用 2D 模式，如果希望使用带有俯仰角的 3D 模式，请设置 viewMode: '3D',
zoom:10, //初始化地图层级
- center: [104.043246,30.641849] //初始化地图中心点
+ center: [113.264434,23.129162] //初始化地图中心点
});
// map.clearMap(); // 清除地图覆盖物
// 经纬度坐标数组
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 0d92965..825231c 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
@@ -116,7 +116,7 @@
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">剩余:</label>
- <label>${expiredCount}</label>
+ <label>${accountBalance}</label>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetailException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetailException.html
index aa752b8..d817616 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetailException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetailException.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">
@@ -108,7 +109,7 @@
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">剩余:</label>
- <label>${expiredCount}</label>
+ <label>${accountBalance}</label>
</div>
</div>
@@ -173,5 +174,12 @@
type: 'date',
range: true
});
+ $(function (){
+ var queryData = {};
+ queryData['condition'] = $("#condition").val();
+ queryData['userId'] = $("#id").val();
+ console.log($("#id").val())
+ TAppUserDetailOrderTable.table.refresh({query: queryData});
+ })
</script>
@}
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 031077d..173c38a 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
@@ -41,7 +41,12 @@
</div>
<div class="initialLevel col-sm-12 control-label form-group" >
<label class="control-label">司机来源:</label>
- <label></label>
+ @if(source==1){
+ <label>司机注册</label>
+ @}
+ @if(source==2){
+ <label>司机招募</label>
+ @}
</div>
<div class="initialLevel col-sm-12 control-label form-group" >
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 9a35c4d..caf63d2 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
@@ -9,6 +9,7 @@
<div class="row row-lg">
<div class="col-sm-12">
<input hidden id="driverId" value="${driverId}">
+ <input hidden id="levelFlag" value="${levelFlag}">
<hr/>
<div class="initialLevel col-sm-12 control-label form-group" >
@@ -105,6 +106,7 @@
$(function () {
var queryData = {};
queryData['driverId'] = $("#driverId").val();
+ queryData['levelFlag'] = $("#levelFlag").val();
TDriverCommissionConnect.table.refresh({query: queryData});
});
laydate.render({
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetailConnect.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetailConnect.html
index 4932808..e5e4e30 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetailConnect.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetailConnect.html
@@ -9,6 +9,7 @@
<div class="row row-lg">
<div class="col-sm-12">
<input hidden id="driverId" value="${driverId}">
+ <input hidden id="levelFlag" value="${levelFlag}">
<hr/>
<div class="initialLevel col-sm-12 control-label form-group" >
@@ -104,6 +105,7 @@
$(function () {
var queryData = {};
queryData['driverId'] = $("#driverId").val();
+ queryData['levelFlag'] = $("#levelFlag").val();
TDriverCommissionConnect.table.refresh({query: queryData});
});
</script>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
index 4d27bd8..c478533 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
@@ -67,16 +67,30 @@
var value = $(this).val()
regexp(value)
})
+ // function regexp(value){
+ // var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
+ // //先判断是否为整数 在判断 是否在 1-总页 整数范围之内
+ // if(reg.test(value)){
+ // if(parseInt(value) <= 0){
+ // Feng.error("请输入大于0的正整数");
+ // return;
+ // }
+ // }else{
+ // Feng.error("请输入大于0的正整数");
+ // return;
+ // }
+ // }
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/tSystemConfig/tSystemConfigPriceRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
index 882c716..18f040d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html
@@ -124,6 +124,21 @@
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
<script type="text/javascript">
+ // laydate.render({
+ // elem: 'input[name=num1]',
+ // type: 'time',
+ // format: 'HH:mm',
+ // range: false,
+ // lang:'zn'
+ // });
+ // laydate.render({
+ // elem: 'input[name=num2]',
+ // type: 'time',
+ // format: 'HH:mm',
+ // range: false,
+ // lang:'zn'
+ // });
+
var elem1 = document.querySelector(".js-switch1");
var init1 = new Switchery(elem1);
@@ -145,14 +160,6 @@
ajax.start();
})
- $("input[name=num1]").bind('input',function(){
- var value = $(this).val()
- regexp(value)
- })
- $("input[name=num2]").bind('input',function(){
- var value = $(this).val()
- regexp(value)
- })
$("input[name=num3]").bind('input',function(){
var value = $(this).val()
regexp(value)
@@ -227,13 +234,9 @@
var value = $(this).val()
regexp(value)
})
- $("input[name=num21]").bind('input',function(){
- var value = $(this).val()
- regexp(value)
- })
- function regexp(value){
+ /*function regexp(value){
var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
//先判断是否为整数 在判断 是否在 1-总页 整数范围之内
if(reg.test(value)){
@@ -245,6 +248,19 @@
Feng.error("请输入大于0的正整数");
return;
}
+ }*/
+ function regexp(value){
+ var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数 两位小数
+ //先判断是否为整数 在判断 是否在 1-总页 整数范围之内
+ if(reg.test(value)){
+ if(value == 0){
+ Feng.error("请输入大于0的整数或保留两位小数");
+ return;
+ }
+ }else{
+ Feng.error("请输入整数或保留两位小数");
+ return;
+ }
}
</script>
@}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js
index f60041a..1fa51ea 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js
@@ -91,13 +91,29 @@
* 打开查看详情(使用中)
*/
TDriverCommission.searchTDriverDetail = function (id) {
+ var levelFlag = $('#levelFlag').val();
+
+ if(levelFlag == null || levelFlag == ''){
+ levelFlag = 0;
+ }else if(levelFlag == 0){
+ levelFlag = 1;
+ }else if (levelFlag == 1){
+ levelFlag = 2;
+ }else if (levelFlag == 2){
+ levelFlag = 3
+ }
+
+ if(levelFlag == 3){
+ Feng.info("最多可查看三级!")
+ return;
+ }
var index = layer.open({
type: 2,
title: '详情',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tDriver/commission/driverCommissionDetail?tDriverId=' + id
+ content: Feng.ctxPath + '/tDriver/commission/driverCommissionDetail?tDriverId=' + id + '&levelFlag=' + levelFlag
});
this.layerIndex = index;
};
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 b85fb5c..61cfaec 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
@@ -91,13 +91,31 @@
* 打开查看详情(使用中)
*/
TDriverCommissionConnect.searchTDriverDetail = function (id) {
+
+ var levelFlag = $('#levelFlag').val();
+
+ if(levelFlag == null || levelFlag == ''){
+ levelFlag = 0;
+ }else if(levelFlag == 0){
+ levelFlag = 1;
+ }else if (levelFlag == 1){
+ levelFlag = 2;
+ }else if (levelFlag == 2){
+ levelFlag = 3
+ }
+
+ if(levelFlag == 3){
+ Feng.info("最多可查看三级!")
+ return;
+ }
+
var index = layer.open({
type: 2,
title: '详情',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tDriver/commission/driverCommissionDetail?tDriverId=' + id
+ content: Feng.ctxPath + '/tDriver/commission/driverCommissionDetail?tDriverId=' + id + '&levelFlag=' + levelFlag
});
this.layerIndex = index;
};
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 d78dd52..265d356 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
@@ -138,7 +138,7 @@
var reqData = {};
reqData['num1'] = Number($("#num1").val());
reqData['num2'] = Number($("#num2").val());
- reqData['num3'] = Number($("#num3").val());
+ reqData['num3'] = $("#num3").val();
ajax.set("content",JSON.stringify(reqData));
ajax.set("type",3);
ajax.start();
@@ -296,6 +296,20 @@
" </div>"
$("#rules").append($(a))
+ // laydate.render({
+ // elem: '#num1-'+i,
+ // type: 'time',
+ // format: 'HH:mm',
+ // range: false,
+ // lang:'zn'
+ // });
+ // laydate.render({
+ // elem: '#num2-'+i,
+ // type: 'time',
+ // format: 'HH:mm',
+ // range: false,
+ // lang:'zn'
+ // });
}
TSystemConfig.delBox = function (o) {
--
Gitblit v1.7.1