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()); 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) { 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"/>
