From 6ca99d25f33a52da4f465141729ee18996fde709 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 15 六月 2023 10:57:52 +0800
Subject: [PATCH] 订单修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java | 22 +++++++++++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 8 +--
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml | 6 +-
management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js | 26 ++++++------
4 files changed, 41 insertions(+), 21 deletions(-)
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 9cc18eb..41da08c 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
@@ -60,8 +60,8 @@
o.id, o.code, o.userId, o.driverId, o.`source`, o.agentId, o.branchOfficeId, o.startTime, o.startAddress, o.startLat, o.startLng, o.endAddress, o.endLat, o.endLng,
o.boardingTime, o.getoffTime, o.estimatedPrice, o.orderMoney, o.payMoney, o.discountedPrice, o.couponId, o.payType, o.payTime, o.`state`, o.status, o.createTime,
o.startDistance,o.startPrice,o.overDriveDistance,o.overDrivePrice,o.longDistance,o.longDistancePrice,o.overLongDistance,o.overLongDistancePrice,
- o.waitTime,o.waitTimePrice,o.outWaitTime,o.outWaitTimePrice,o.badWeatherDistance,o.badWeatherPrice,o.overBadWeatherDistance,o.overBadWeatherPrice,a.nickname AS userName,
- a.phone AS userPhone,a.cancelCount,a.status AS userStatus,d.name AS driverName,d.phone AS driverPhone
+ o.waitTime,o.waitTimePrice,o.outWaitTime,o.outWaitTimePrice,o.badWeatherDistance,o.badWeatherPrice,o.overBadWeatherDistance,o.overBadWeatherPrice,
+ o.userPhone,o.userName,a.cancelCount,a.status AS userStatus,d.name AS driverName,d.phone AS driverPhone
</sql>
<sql id="Base_Column_Server_Order">
@@ -69,7 +69,7 @@
o.boardingTime, o.getoffTime, o.estimatedPrice, o.orderMoney, o.payMoney, o.discountedPrice, o.couponId, o.payType, o.payTime, o.`state`, o.status, o.createTime,
o.startDistance,o.startPrice,o.overDriveDistance,o.overDrivePrice,o.longDistance,o.longDistancePrice,o.overLongDistance,o.overLongDistancePrice,
o.waitTime,o.waitTimePrice,o.outWaitTime,o.outWaitTimePrice,o.badWeatherDistance,o.badWeatherPrice,o.overBadWeatherDistance,o.overBadWeatherPrice,
- d.name AS driverName,d.phone AS driverPhone
+ o.userPhone,o.userName,d.name AS driverName,d.phone AS driverPhone
</sql>
<select id="getOrderList" resultType="com.stylefeng.guns.modular.system.controller.resp.TOrderResp">
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
index 06bd233..6452db6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
@@ -192,6 +192,28 @@
@ApiModelProperty(value = "是否已开票 1是 0否")
private Integer isInvoice;
+ @ApiModelProperty(value = "用户手机号")
+ private String userPhone;
+
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+
+ public String getUserPhone() {
+ return userPhone;
+ }
+
+ public void setUserPhone(String userPhone) {
+ this.userPhone = userPhone;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
public Integer getIsInvoice() {
return isInvoice;
}
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 9828cbe..aa9408c 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
@@ -103,12 +103,12 @@
model.addAttribute("discountAmount",tOrder.getDiscountAmount());//折扣金额
model.addAttribute("userId",tOrder.getUserId());//用户id
model.addAttribute("routeRecord",tOrder.getRouteRecord());//行程录音
+ model.addAttribute("userPhone",tOrder.getUserPhone());//用户手机号
+ model.addAttribute("userName",tOrder.getUserName());//用户名称
// 查询用户
TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
if(Objects.nonNull(tAppUser)){
- model.addAttribute("userName",tAppUser.getNickname());
- model.addAttribute("userPhone",tAppUser.getPhone());
model.addAttribute("havDiscount",tAppUser.getHavDiscount());
if(1 == tAppUser.getHavDiscount()){
// 计算9折优惠金额
@@ -118,9 +118,7 @@
model.addAttribute("multiply",0);
}
}else {
- model.addAttribute("userName","");
- model.addAttribute("userPhone","");
- model.addAttribute("havDiscount","");
+ model.addAttribute("havDiscount",0);
model.addAttribute("multiply",0);
}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js b/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js
index 258a7df..ec823ce 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js
@@ -34,10 +34,10 @@
field: 'rePassword',
message: '两次密码不一致'
},
- regexp: {
- regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
- },
+ // regexp: {
+ // regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
+ // message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
+ // },
}
},
rePassword: {
@@ -49,10 +49,10 @@
field: 'password',
message: '两次密码不一致'
},
- regexp: {
- regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
- },
+ // regexp: {
+ // regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
+ // message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
+ // },
}
}
}
@@ -298,11 +298,11 @@
Feng.error("新密码不能和原始密码相同");
return
}
- let patt = /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/;
- if(!patt.test(newPwd)){
- Feng.error("密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符");
- return
- }
+ // let patt = /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/;
+ // if(!patt.test(newPwd)){
+ // Feng.error("密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符");
+ // return
+ // }
var ajax = new $ax(Feng.ctxPath + "/mgr/changePwd", function (data) {
Feng.success("修改成功!");
}, function (data) {
--
Gitblit v1.7.1