Compare commits
No commits in common. "44b64aa9df1e6d82a076201903667d8688d88085" and "84206e653d535db1c13e58f1dd9c1e85365a04d4" have entirely different histories.
44b64aa9df
...
84206e653d
|
|
@ -22,7 +22,7 @@ public class CartPageController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/cart_order_success")
|
@GetMapping("/cart_oder_success")
|
||||||
public String cartOrderSuccessPage() {
|
public String cartOrderSuccessPage() {
|
||||||
return "cart_order_success";
|
return "cart_order_success";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@ public class UserController {
|
||||||
|
|
||||||
@PostMapping("/user/update")
|
@PostMapping("/user/update")
|
||||||
public ServerResponseEntity<Boolean> updatePassword(@RequestBody PasswordData passwordData) {
|
public ServerResponseEntity<Boolean> updatePassword(@RequestBody PasswordData passwordData) {
|
||||||
logger.info("request passwordData: {}",passwordData);
|
|
||||||
if(passwordData != null){
|
if(passwordData != null){
|
||||||
boolean isSuccess = userService.updateUserPasswordByUserId(passwordData);
|
boolean isSuccess = userService.updateUserPasswordByUserId(passwordData);
|
||||||
if (isSuccess) {
|
if (isSuccess) {
|
||||||
|
|
|
||||||
|
|
@ -36,9 +36,7 @@ public class UserService {
|
||||||
|
|
||||||
public boolean updateUserPasswordByUserId(PasswordData passwordData) {
|
public boolean updateUserPasswordByUserId(PasswordData passwordData) {
|
||||||
String currentPassword = queryPasswordByUserId(passwordData.getUserId());
|
String currentPassword = queryPasswordByUserId(passwordData.getUserId());
|
||||||
logger.info("currentPassword: {}, oldPassword: {}.",currentPassword,passwordData.getOldPassword());
|
if (currentPassword == passwordData.getOldPassword()) {
|
||||||
if (currentPassword.equals(passwordData.getOldPassword())) {
|
|
||||||
logger.info("start update password.");
|
|
||||||
UpdateWrapper<User> updateWrapper = new UpdateWrapper<>();
|
UpdateWrapper<User> updateWrapper = new UpdateWrapper<>();
|
||||||
updateWrapper.eq("user_id", passwordData.getUserId())
|
updateWrapper.eq("user_id", passwordData.getUserId())
|
||||||
.set("password", passwordData.getNewPassword());
|
.set("password", passwordData.getNewPassword());
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,9 @@
|
||||||
|
|
||||||
function toPay() {
|
function toPay() {
|
||||||
var nu = '1';
|
var nu = '1';
|
||||||
window.location = "/cart_agreement";
|
|
||||||
|
window.location = "cart_agreement.html";
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<!--内容-->
|
<!--内容-->
|
||||||
|
|
|
||||||
|
|
@ -58,14 +58,12 @@
|
||||||
var nu = '1';
|
var nu = '1';
|
||||||
|
|
||||||
if (check()) {
|
if (check()) {
|
||||||
// $("#aspnetForm").submit();
|
$("#aspnetForm").submit();
|
||||||
window.location.href = "/cart_order";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
$(function() {
|
$(function() {
|
||||||
$("#aspnetForm").attr("action", "/cart_order");
|
$("#aspnetForm").attr("action", "/cart_order");
|
||||||
// window.location.href = "/cart_order";
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<!--真爱协议中的内容-->
|
<!--真爱协议中的内容-->
|
||||||
|
|
|
||||||
|
|
@ -179,16 +179,15 @@
|
||||||
//check
|
//check
|
||||||
if ($(".shop_adress-top:not(:last) :radio:checked").length == 0) {
|
if ($(".shop_adress-top:not(:last) :radio:checked").length == 0) {
|
||||||
alert("请先选择一个地址。");
|
alert("请先选择一个地址。");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
var nu = '1';
|
var nu = '1';
|
||||||
|
|
||||||
// $("#aspnetForm").submit();
|
$("#aspnetForm").submit();
|
||||||
window.location.href = "/cart_order_success";
|
|
||||||
|
|
||||||
}
|
}
|
||||||
$(function() {
|
$(function() {
|
||||||
// window.location.href = "/cart_order_success";
|
$("#aspnetForm").attr("action", "/cart_order_success");
|
||||||
// $("#aspnetForm").attr("action", "/cart_order_success");
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<!--内容-->
|
<!--内容-->
|
||||||
|
|
|
||||||
Reference in New Issue