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/TShopController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 9cf7bd0..b0b0443 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -296,7 +296,8 @@
Integer objectId = UserExt.getUser().getObjectId();
list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId);
}else {
- list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName,objectId);
}
page.setRecords(list);
return super.packForBT(page);
@@ -367,16 +368,25 @@
}else {
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, pCode1));
- tStore.setProvince(one.getName());
- tStore.setProvinceCode(one.getCode());
+ if (one !=null){
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ }
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cCode1));
- tStore.setCity(one1.getName());
- tStore.setCityCode(one1.getCode());
+ if (one1 !=null){
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
}
tStore.setStartTime(time.split(" - ")[0]);
tStore.setEndTime(time.split(" - ")[1]);
tStore.setIds(ids);
- tStore.setType(type);
+ if (UserExt.getUser().getObjectType()==2){
+ tStore.setType(2);
+ }else{
+ tStore.setType(type);
+ }
+
tStore.setOperatorId(yyId);
tStore.setState(1);
tStore.setCreateTime(new Date());
@@ -392,15 +402,13 @@
user.setPassword(SecureUtil.md5("a123456"));
user.setObjectType(3);
user.setStatus(1);
+ userMapper.insert(user);
tStore.setStoreStaffId(user.getId());
tStore.setLon(lon);
tStore.setLat(lat);
+ tStore.setOperatorId(UserExt.getUser().getObjectId());
storeService.save(tStore);
-
-
user.setObjectId(tStore.getId());
- userMapper.insert(user);
-
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
--
Gitblit v1.7.1