From 76cdbb7703ada66794afd0370db7d5e984bdd11e Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 24 六月 2024 14:36:32 +0800
Subject: [PATCH] 优化
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 4 ++--
cloud-server-management/src/main/webapp/WEB-INF/view/login.html | 6 +++---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index f66961f..55afd69 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1955,7 +1955,7 @@
userPointsMerchandise.setPayStatus(2);
userPointsMerchandise.setPaymentTime(new Date());
userPointsMerchandise.setOrderNumber(tradeNo);
- userPointsMerchandise.setPayType(2);
+ userPointsMerchandise.setCashPayType(2);
userPointsMerchandise.setInsertTime(null);
userPointsMerchandise.setUserId(null);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
@@ -2121,7 +2121,7 @@
userPointsMerchandise.setPayStatus(2);
userPointsMerchandise.setPaymentTime(new Date());
userPointsMerchandise.setOrderNumber(transaction_id);
- userPointsMerchandise.setPayType(1);
+ userPointsMerchandise.setCashPayType(1);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
TAppUser tAppUser = baseMapper.selectById(userPointsMerchandise.getUserId());
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 596e698..61c4018 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -1568,7 +1568,7 @@
if (ToolUtil.isNotEmpty(pointMercharsPayedVo.getStatus())) {
userPointsMerchandiseLambdaQueryWrapper.eq(UserPointsMerchandise::getStatus, pointMercharsPayedVo.getStatus());
}
- List<UserPointsMerchandise> list = upmseService.list(userPointsMerchandiseLambdaQueryWrapper);
+ List<UserPointsMerchandise> list = upmseService.list(userPointsMerchandiseLambdaQueryWrapper.orderByDesc(UserPointsMerchandise::getPaymentTime));
System.out.println(list);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (list.size() > 0) {
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
index a90987a..2846a61 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
@@ -64,16 +64,16 @@
<form class="m-t" role="form" action="${ctxPath}/login" method="post">
<div class="item">
<img src="${ctxPath}/img/account.png" />
- <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="admin">
+ <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="">
</div>
<div class="item">
<img src="${ctxPath}/img/password.png" />
- <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="123456">
+ <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="">
</div>
<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" placeholder="验证码" required="" value="111111">
+ <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="">
</div>
<div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
<img src="${ctxPath}/kaptcha" id="kaptcha" width="90px" height="34px"/>
--
Gitblit v1.7.1