From 568090f64ffb581a3734497297bb240372214f42 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 25 七月 2023 15:12:20 +0800
Subject: [PATCH] account模块的探索玩湃：商品列表查询；management模块：配置
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 8 -
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java | 5 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 12 ---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 36 +++++---
cloud-server-management/src/main/webapp/WEB-INF/view/login.html | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointMallDetailsResponse.java | 34 --------
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java | 39 +++++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 12 +--
cloud-server-management/src/main/resources/mapper/UserMapper.xml | 3
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java | 37 ---------
11 files changed, 74 insertions(+), 116 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index b97525a..d0cd7c9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -267,13 +267,9 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil<PointMallDetailsResponse> pointsMallList(MallRequest request){
+ public ResultUtil<List<Goods>> pointsMallList(MallRequest request){
try {
- Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
- if(null == userIdFormRedis){
- return ResultUtil.tokenErr();
- }
- return ResultUtil.success(tauService.queryAppUserIntegral(request,userIdFormRedis));
+ return ResultUtil.success(tauService.queryAppUserIntegral(request));
}catch (Exception e){
return ResultUtil.runErr();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java
new file mode 100644
index 0000000..7df80ad
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java
@@ -0,0 +1,39 @@
+package com.dsh.account.model.vo.userBenefitDetail;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class Goods {
+
+ @ApiModelProperty(value = "商品id")
+ private Integer goodId;
+
+ @ApiModelProperty(value = "商品封面图")
+ private String goodImg;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodName;
+
+ @ApiModelProperty(value = "1积分 2现金+积分")
+ private Integer condition;
+
+ @ApiModelProperty(value = "金额")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "适用范围： 1全部用户 2仅限会员 3仅限学员")
+ private Integer belongsType;
+
+ @ApiModelProperty(value = "商品类型： 1实物 2课包 3门票 4优惠券")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "已兑换数量")
+ private Integer nums;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java
index 89eb87c..c52cbf0 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java
@@ -22,4 +22,9 @@
@ApiModelProperty(value = "搜索内容")
private String search;
+ @ApiModelProperty(value = "页码")
+ private Integer pageNum;
+
+ @ApiModelProperty(value = "每页数量")
+ private Integer pageSize;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointMallDetailsResponse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointMallDetailsResponse.java
index 68cc3f3..2aae860 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointMallDetailsResponse.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointMallDetailsResponse.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
@Data
@@ -21,38 +20,5 @@
@ApiModelProperty(value = "商品列表")
private List<Goods> goods;
-
-
- @Data
- public static class Goods{
-
- @ApiModelProperty(value = "商品id")
- private Integer goodId;
-
- @ApiModelProperty(value = "商品封面图")
- private String goodImg;
-
- @ApiModelProperty(value = "商品名称")
- private String goodName;
-
- @ApiModelProperty(value = "1积分 2现金+积分")
- private Integer condition;
-
- @ApiModelProperty(value = "金额")
- private BigDecimal amount;
-
- @ApiModelProperty(value = "积分")
- private Integer integral;
-
- @ApiModelProperty(value = "适用范围： 1全部用户 2仅限会员 3仅限学员")
- private Integer belongsType;
-
- @ApiModelProperty(value = "商品类型： 1实物 2课包 3门票 4优惠券")
- private Integer goodsType;
-
- @ApiModelProperty(value = "已兑换数量")
- private Integer nums;
-
- }
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index 145c72f..c35a746 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -121,7 +121,7 @@
List<RechargeCentVo> getSysRechargeConfig(Integer appUserId);
- PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis);
+ List<Goods> queryAppUserIntegral(MallRequest request);
ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request);
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 deb3dc6..ea5d476 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
@@ -38,6 +38,10 @@
import com.dsh.account.util.*;
import com.dsh.account.util.akeylogin.Md5Util;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -629,14 +633,8 @@
}
@Override
- public PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis) {
- PointMallDetailsResponse detailsResponse = new PointMallDetailsResponse();
- List<PointMallDetailsResponse.Goods> goods = new ArrayList<>();
-
- TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
- detailsResponse.setName(tAppUser.getName());
- detailsResponse.setIntegral(tAppUser.getIntegral());
- detailsResponse.setHeadImg(tAppUser.getHeadImg());
+ public List<Goods> queryAppUserIntegral(MallRequest request ) {
+ List<Goods> goods = new ArrayList<>();
CommodityRequest commodityRequest = new CommodityRequest();
commodityRequest.setLon(request.getLon());
@@ -644,7 +642,7 @@
List<PointsMerchandise> vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
if (vicinityGoods.size() > 0) {
for (PointsMerchandise vicinityGood : vicinityGoods) {
- PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
+ Goods commodity = new Goods();
switch (vicinityGood.getType()) {
case 1:
commodity.setGoodId(vicinityGood.getId());
@@ -701,7 +699,7 @@
List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest);
if (allCoupons.size() > 0) {
for (Coupon allCoupon : allCoupons) {
- PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
+ Goods commodity = new Goods();
commodity.setGoodId(allCoupon.getId());
commodity.setGoodName(allCoupon.getName());
commodity.setCondition(allCoupon.getRedemptionMethod());
@@ -727,17 +725,17 @@
switch (request.getRank()){
case 1:
goods = goods.stream()
- .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral).reversed())
+ .sorted(Comparator.comparing(Goods::getIntegral).reversed())
.collect(Collectors.toList());
break;
case 2:
goods = goods.stream()
- .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral))
+ .sorted(Comparator.comparing(Goods::getIntegral))
.collect(Collectors.toList());
break;
case 3:
goods = goods.stream()
- .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getNums).reversed())
+ .sorted(Comparator.comparing(Goods::getNums).reversed())
.collect(Collectors.toList());
break;
default:
@@ -750,8 +748,16 @@
.filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
.collect(Collectors.toList());
}
- detailsResponse.setGoods(goods);
- return detailsResponse;
+ Pageable pageable = PageRequest.of(request.getPageNum() - 1, request.getPageSize());
+ Page<Goods> page = getPage(goods, pageable);
+ return page.getContent();
+ }
+
+ // 对数据进行分页处理的方法
+ private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) {
+ int start = (int) pageable.getOffset();
+ int end = Math.min((start + pageable.getPageSize()), dataList.size());
+ return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
}
@Override
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
index 4b47cae..250c295 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
@@ -110,10 +110,6 @@
model.addAttribute("tips", a);
return "/login.html";
}
- //设置上级ID
- if (SinataUtil.isNotEmpty(user.getObjectId())){
-// ShiroKit.getUser().setObjectId(user.getObjectId());
- }
//设置角色
// ShiroKit.getUser().setRoleType(user.getRoleType());
@@ -135,10 +131,10 @@
model.addAttribute("avatar", avatar);
model.addAttribute("userName", user.getName());
model.addAttribute("type", 0);
- model.addAttribute("passwordHint",
- null == user.getPassWordUpdate()
- || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
- ? a: "");
+// model.addAttribute("passwordHint",
+// null == user.getPassWordUpdate()
+// || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
+// ? a: "");
return "/index.html";
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 98c888d..0727730 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -158,7 +158,6 @@
if (user.getPassword().equals(oldMd5)) {
String newMd5 = MD5.md5(newPwd);
user.setPassword(newMd5);
- user.setPassWordUpdate(new Date());
user.updateById();
return SUCCESS_TIP;
} else {
@@ -222,7 +221,6 @@
User objectUser = UserFactory.createUser(user);
//查找平台所属公司
//Search for the company that owns the platform.
- objectUser.setPassWordUpdate(new Date());
this.userService.save(objectUser);
return SUCCESS_TIP;
@@ -335,11 +333,6 @@
assertAuth(userId);
this.userService.setStatus(userId, ManagerStatus.FREEZED.getCode());
- User user = userService.getById(userId);
- if (user.getRoleType() == 2){
-
- }else if (user.getRoleType() == 3){
- }
return SUCCESS_TIP;
}
@@ -357,11 +350,6 @@
assertAuth(userId);
this.userService.setStatus(userId, ManagerStatus.OK.getCode());
- User user = userService.getById(userId);
- if (user.getRoleType() == 2){
-
- }else if (user.getRoleType() == 3){
- }
return SUCCESS_TIP;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
index 6cee96e..e4b03b7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
@@ -40,11 +40,6 @@
* 密码
*/
private String password;
- /**
- * 密码修改时间
- */
- @TableField("passWordUpdate")
- private Date passWordUpdate;
/**
* md5密码盐
*/
@@ -89,32 +84,7 @@
* 保留字段
*/
private Integer version;
- /**
- * 角色类型 1=平台 2=分公司 3=加盟商
- */
- @TableField("roleType")
- private Integer roleType;
- /**
- * 对象ID
- */
- @TableField("objectId")
- private Integer objectId;
- public Integer getRoleType() {
- return roleType;
- }
-
- public void setRoleType(Integer roleType) {
- this.roleType = roleType;
- }
-
- public Integer getObjectId() {
- return objectId;
- }
-
- public void setObjectId(Integer objectId) {
- this.objectId = objectId;
- }
public Integer getId() {
return id;
@@ -144,13 +114,6 @@
return password;
}
- public Date getPassWordUpdate() {
- return passWordUpdate;
- }
-
- public void setPassWordUpdate(Date passWordUpdate) {
- this.passWordUpdate = passWordUpdate;
- }
public void setPassword(String password) {
this.password = password;
diff --git a/cloud-server-management/src/main/resources/mapper/UserMapper.xml b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
index 72b6a86..18dd6b5 100644
--- a/cloud-server-management/src/main/resources/mapper/UserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
@@ -8,7 +8,6 @@
<result column="avatar" property="avatar" />
<result column="account" property="account" />
<result column="password" property="password" />
- <result column="passWordUpdate" property="passWordUpdate"/>
<result column="salt" property="salt" />
<result column="name" property="name" />
<result column="birthday" property="birthday" />
@@ -33,7 +32,7 @@
id, account, name, birthday,password, sex, email, avatar,
phone, roleid,salt,
deptid, status,
- createtime, version,roleType,objectId
+ createtime, version
</sql>
<select id="selectUsers" resultType="map">
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 ebc3eba..0bd14be 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
@@ -58,7 +58,7 @@
<img src="${ctxPath}/img/index4.png" style="width: 300px;height: 400px;z-index: 1000;border-radius: 10px">
<div style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
<div style="max-height: 100%">
- <h3 style="color: black;"><img src="${ctxPath}/img/logo.png" width="30px" height="30px"/> evmoto Admin site</h3>
+ <h3 style="color: black;"><img src="${ctxPath}/img/logo.png" width="30px" height="30px"/> Play pai site</h3>
<br/>
<h4 style="color: red;">${tips!}</h4>
<form class="m-t" role="form" action="${ctxPath}/login" method="post">
--
Gitblit v1.7.1