From 5b83b50d38c757b38dcc87a40a17d34cc2948e10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 09:49:15 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
index 20c6822..f187303 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
@@ -22,8 +22,10 @@
import com.dsh.guns.modular.system.model.TCourse;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.model.User;
+import com.dsh.guns.modular.system.model.dto.SelectDto;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -62,6 +64,8 @@
@Resource
private UserMapper userMapper;
+ @Autowired
+ private IUserService userService;
/**
@@ -115,9 +119,8 @@
private CourseClient courseClient;
@RequestMapping(value = "/timeChange")
@ResponseBody
- public List<Integer> timeChange(Integer oneId) {
-
- List<Integer> integerList = courseClient.timeChange(oneId);
+ public List<SelectDto> timeChange(Integer oneId) {
+ List<SelectDto> integerList = courseClient.timeChange(oneId);
return integerList ;
}
@@ -241,7 +244,14 @@
@ResponseBody
public Object pwd(Integer id) {
try {
- userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getObjectId,id).eq(User::getObjectType,2));
+ // 查询门店 获取门店店长id
+ TStore store = storeService.getById(id);
+ User user = userService.getById(store.getStoreStaffId());
+ user.setPassword(SecureUtil.md5("a123456"));
+ userService.updateById(user);
+ userMapper.selectOne(new LambdaQueryWrapper<User>()
+ .eq(User::getObjectId,id)
+ .eq(User::getObjectType,2));
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1