From c4a098e3f88bc5071e36b92b9e5dcceb51129957 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:25:07 +0800
Subject: [PATCH] 同步后台代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
index 216eed1..3c22173 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
@@ -3,13 +3,17 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.modular.system.controller.resp.TAppUserResp;
import com.stylefeng.guns.modular.system.controller.util.ExcelUtil;
import com.stylefeng.guns.modular.system.enums.CouponStatusEnum;
+import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
import com.stylefeng.guns.modular.system.exports.TAppUserExceptionExport;
-import com.stylefeng.guns.modular.system.model.TAppUser;
-import com.stylefeng.guns.modular.system.model.TCoupon;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITAppUserService;
import com.stylefeng.guns.modular.system.service.ITCouponService;
+import com.stylefeng.guns.modular.system.service.ITOrderService;
+import com.stylefeng.guns.modular.system.service.ITUserToCouponService;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -18,10 +22,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
+import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -46,6 +52,12 @@
private ITAppUserService tAppUserService;
@Autowired
private ITCouponService tCouponService;
+ @Autowired
+ private ITOrderService tOrderService;
+ @Autowired
+ private ITUserToCouponService tUserToCouponService;
+ @Autowired
+ private RedisUtil redisUtil;
/**
* 跳转到首页
@@ -139,7 +151,6 @@
@RequestMapping("/userDetail")
public String userDetail(Integer tAppUserId, Model model) {
tAppUserService.detail(tAppUserId,model);
-
return PREFIX + "tAppUserDetail.html";
}
@@ -164,7 +175,10 @@
EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
// 是否异常
wrapper.eq("is_exception",2);
- return tAppUserService.selectList(wrapper);
+ wrapper.orderBy("createTime",false);
+ List<TAppUser> tAppUsers = tAppUserService.selectList(wrapper);
+
+ return tAppUserService.getTAppUserResp(tAppUsers);
}
@@ -180,6 +194,8 @@
Integer id,
Integer status) {
EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
+ wrapper.ne("is_exception",2);
+ wrapper.orderBy("createTime",false);
return tAppUserService.selectList(wrapper);
}
@@ -213,7 +229,7 @@
}
/**
- * 修改
+ * 修改用户状态
*/
@RequestMapping(value = "/update-status")
@ResponseBody
@@ -223,6 +239,9 @@
TAppUser tAppUser = tAppUserService.selectById(id);
if(1 == status){
tAppUser.setStatus(2);
+ String value = redisUtil.getValue("USER_" + tAppUser.getPhone());
+ redisUtil.remove(value);
+ redisUtil.remove("USER_" + tAppUser.getPhone());
}
if(2 == status){
tAppUser.setStatus(1);
@@ -270,22 +289,24 @@
String[] title = new String[] {"用户ID","用户昵称","手机号","性别","头像","微信openid",
"微信unionid","紧急联系人","紧急联系电话","账户余额","用户标签id","状态","添加时间"};
EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
+ wrapper.ne("is_exception",2);
// 是否异常
- wrapper.eq("is_exception",2);
List<TAppUser> list = tAppUserService.selectList(wrapper);
String[][] values = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
TAppUser d = list.get(i);
values[i] = new String[title.length];
- values[i][0] = d.getId().toString();
+ values[i][0] = String.valueOf(d.getId());
values[i][1] = d.getNickname();
values[i][2] = d.getPhone();
Integer sex = d.getSex();
- if(1 == sex){
- values[i][3] = "男";
- }else if(2 == sex){
- values[i][3] = "女";
+ if(Objects.nonNull(sex)){
+ if(1 == sex){
+ values[i][3] = "男";
+ }else if(2 == sex){
+ values[i][3] = "女";
+ }
}else {
values[i][3] = "未知";
}
@@ -294,8 +315,8 @@
values[i][6] = d.getUnionid();
values[i][7] = d.getEmergencyContact();
values[i][8] = d.getEmergencyPhone();
- values[i][9] = d.getAccountBalance().toString();
- values[i][10] = d.getUserTagId().toString();
+ values[i][9] = String.valueOf(d.getAccountBalance());
+ values[i][10] = String.valueOf(Objects.nonNull(d.getUserTagId())?d.getUserTagId():"");
Integer status1 = d.getStatus();
if(1 == status1){
values[i][11] = "正常";
@@ -341,7 +362,7 @@
wrapper.eq("is_exception",2);
List<TAppUser> list = tAppUserService.selectList(wrapper);
- List<TAppUserExceptionExport> exportList = new ArrayList<>(list.size());
+ /*List<TAppUserExceptionExport> exportList = new ArrayList<>(list.size());
for (TAppUser tAppUser : list) {
TAppUserExceptionExport export = new TAppUserExceptionExport();
BeanUtils.copyProperties(tAppUser,export);
@@ -352,7 +373,21 @@
tCoupons = tCoupons.stream().filter(coupon->coupon.getCouponStatus().equals(CouponStatusEnum.NOT_USED.getCode())).collect(Collectors.toList());
// 剩余优惠券
export.setRemainingCoupons(tCoupons.size());
- // TODO 查询消费记录
+ // 查询消费记录
+ exportList.add(export);
+ }*/
+ List<TAppUserResp> tAppUserRespList = tAppUserService.getTAppUserResp(list);
+ List<TAppUserExceptionExport> exportList = new ArrayList<>(list.size());
+ for (TAppUserResp tAppUserResp : tAppUserRespList) {
+ TAppUserExceptionExport export = new TAppUserExceptionExport();
+ BeanUtils.copyProperties(tAppUserResp,export);
+ // 优惠券总数
+ export.setCouponsSum(tAppUserResp.getCouponSum());
+ // 剩余优惠券
+ export.setRemainingCoupons(tAppUserResp.getNotUsedCount());
+ export.setConsumptionTimes(tAppUserResp.getConsumeSum());
+ export.setHistoricalConsumption(tAppUserResp.getConsumePrice());
+ export.setLastConsumptionTime(tAppUserResp.getLastConsumptionTime());
exportList.add(export);
}
String[][] values = new String[list.size()][];
@@ -363,10 +398,10 @@
values[i][1] = d.getId().toString();
values[i][2] = d.getNickname();
values[i][3] = d.getPhone();
- values[i][4] = d.getRemainingCoupons().toString();
- values[i][5] = d.getCouponsSum().toString();
- values[i][6] = d.getConsumptionTimes().toString();
- values[i][7] = d.getHistoricalConsumption().toString();
+ values[i][4] = String.valueOf(d.getRemainingCoupons());
+ values[i][5] = String.valueOf(d.getCouponsSum());
+ values[i][6] = String.valueOf(Objects.nonNull(d.getConsumptionTimes())?d.getConsumptionTimes():0);
+ values[i][7] = String.valueOf(Objects.nonNull(d.getHistoricalConsumption())?d.getHistoricalConsumption():0);
if(Objects.nonNull(d.getLastConsumptionTime())){
values[i][8] = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(d.getLastConsumptionTime());
}else {
--
Gitblit v1.7.1