From d6f0958babd71a1dc9d24496076f763f86d76ac7 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 27 十月 2023 13:08:53 +0800
Subject: [PATCH] 商户认证
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index 19de033..58c709a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -15,6 +15,7 @@
import com.dsh.course.feignClient.other.StoreClient;
import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
import com.dsh.guns.config.UserExt;
+import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IRoleService;
@@ -110,22 +111,32 @@
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
String province = data.getProvince();
TCity province1 = cityService.getOne(new QueryWrapper<TCity>().eq("name", data.getProvince()));
+
+ if (province1!=null){
List<TCity> city = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, province1.getId()));
+ model.addAttribute("city",city);
+
+ }
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ if (data.getBirthday()!=null){
String format1 = format.format(data.getBirthday());
+ model.addAttribute("birthday",format1);
+ }
List<User> sales = userService.list(new QueryWrapper<User>().eq("deptid", 2));
model.addAttribute("list",list);
model.addAttribute("roleType",roleType);
model.addAttribute("sales",sales);
model.addAttribute("data",data);
- model.addAttribute("birthday",format1);
- model.addAttribute("city",city);
+
model.addAttribute("type",type);
model.addAttribute("isVip",data.getIsVip());
if (data.getVipEndTime()!=null){
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String format3 = format2.format(data.getVipEndTime());
model.addAttribute("vipEndTime",format3);
+ }else {
+ model.addAttribute("vipEndTime","");
+
}
if (data.getViplevelId()!=null){
// todo创建会员等级表
@@ -144,14 +155,14 @@
@RequestMapping("/listAll")
@ResponseBody
public List<QueryAppUserVO> listAll(String province, String city,String name,
- String phone,Integer isVip, Integer salesmanUserName){
+ String phone,Integer isVip, String salesmanUserName){
QueryAppUser queryAppUser = new QueryAppUser();
queryAppUser.setProvince(province);
queryAppUser.setCity(city);
queryAppUser.setName(name);
queryAppUser.setPhone(phone);
queryAppUser.setIsVip(isVip);
- queryAppUser.setSalesmanUserId(salesmanUserName);
+// queryAppUser.setSalesmanUser(salesmanUserName);
if (province!=null && (!province.equals(""))){
TCity p = cityService.getOne(new QueryWrapper<TCity>().eq("code", province));
queryAppUser.setProvince(p.getName());
@@ -166,7 +177,10 @@
List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
- queryAppUserVO.setSalesmanUserName(userService.getById(queryAppUserVO.getSalesmanUserId()).getName());
+ User byId = userService.getById(queryAppUserVO.getSalesmanUserId());
+ if (byId!=null){
+ queryAppUserVO.setSalesmanUserName(byId.getName());
+ }
}
}
if (salesmanUserName!=null && (!salesmanUserName.equals(""))){
@@ -193,6 +207,7 @@
@ResponseBody
public Object addAppUser(@RequestBody TAppUser appUser){
Integer objectType = UserExt.getUser().getObjectType();
+ appUser.setPassword(MD5.md5("111111"));
appUser.setInsertType(objectType);
appUser.setAddUserId(UserExt.getUser().getObjectId());
Object o = appUserClient.addAppUser1(appUser);
--
Gitblit v1.7.1