ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
@@ -24,7 +24,7 @@ <#button name="修改" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/> @} @if(shiro.hasPermission("/dept/delete")){ <#button name="删除" icon="fa-plus" clickFun="Dept.delete()" space="true"/> <#button name="删除" icon="fa-remove" clickFun="Dept.delete()" space="true"/> @} </div> <#table id="DeptTable"/> ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/user/user_info.js
@@ -54,6 +54,14 @@ message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符' }, } }, phone: { validators: { regexp: { regexp: /^1\d{10}$/, message: '电话格式不正确' } } } } }; @@ -264,6 +272,13 @@ return; } // 手机号不为空时校验格式 var phone = $("#phone").val(); if (phone && !/^1\d{10}$/.test(phone)) { Feng.error("请输入正确的电话"); return; } //提交信息 var ajax = new $ax(Feng.ctxPath + "/mgr/add", function (data) { if(200 == data.code){ UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -17,6 +17,7 @@ import com.stylefeng.guns.modular.system.warpper.BaseWarpper; import com.stylefeng.guns.modular.system.warpper.ServerCarModelWarpper; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,7 +26,7 @@ import java.math.RoundingMode; import java.util.*; @Slf4j @Service public class ServerCarModelServiceImpl extends ServiceImpl<ServerCarModelMapper, ServerCarModel> implements IServerCarModelService { @@ -249,7 +250,6 @@ return data; } public ServerCarModelWarpper getTextPrice(Integer companyId, double distance, long duration, long wait, Integer type, Map<String, String> geocode) throws Exception { String provinceCode = geocode.get("provinceCode"); String cityCode = geocode.get("cityCode"); @@ -263,6 +263,11 @@ if (null == query1) {//排除没有设置价格的车型 return null; } log.debug("出租车-城市价格配置：{}", JSONArray.toJSONString(systemPriceCity)); log.debug("出租车-设置价格的配置：{}", JSONArray.toJSONString(query1)); log.debug("出租车-实际公里：{}", distance); Map<String, Object> map = new HashMap<>(); double d = distance / 1000;//实际公里 double t = duration / 60;//实际时间 @@ -418,7 +423,7 @@ serverCarModelWarpper.setContentNotThree(new JSONObject()); serverCarModelWarpper.setContentExclusive(jsonObject); serverCarModelWarpper.setContentPrice(new JSONObject()); log.debug("出租车-价格计算结果为：{}", JSONArray.toJSONString(serverCarModelWarpper)); return serverCarModelWarpper; }
@@ -322,7 +322,7 @@ if (orderTaxi.getOrderSource() != 2) { TSysPaymentMode paymentMode = tSysPaymentModeService.selectOne(new EntityWrapper<TSysPaymentMode>().last("LIMIT 1")); baseWarpper.setPaymentMode(paymentMode.getTaxiType()); if (paymentMode != null && Integer.valueOf(1).equals(paymentMode.getTaxiType())) { if (paymentMode != null && Integer.valueOf(1).equals(paymentMode.getTaxiType())) { // 值为后付所以不会进入该流程 try { Map<String, String> startGeocode = gdMapGeocodingUtil.geocode(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat())); if (orderTaxi.getEndLon() != null && orderTaxi.getEndLat() != null && startGeocode != null) { @@ -352,7 +352,7 @@ orderTaxi.setPaymentMode(2); } } catch (Exception e) { e.printStackTrace(); log.error("出租车算价异常：", e); orderTaxi.setPaymentMode(2); orderTaxi.setState(1); } @@ -407,7 +407,6 @@ driverService.updateById(driver); } orderTaxi.setPrepayStage(Integer.valueOf(1).equals(orderTaxi.getPaymentMode()) ? 1 : 0); this.insert(orderTaxi); new Thread(new Runnable() { @@ -1886,6 +1885,7 @@ System.out.println("计算价格874"); taxiPreAmountCalculate(orderTaxi, map); } log.info("获取订单详情为：{}", JSONArray.toJSONString(map)); return map; }
