张延森 4 år sedan
förälder
incheckning
58f1ea1f70
20 ändrade filer med 594 tillägg och 6 borttagningar
  1. 1
    1
      pom.xml
  2. 9
    4
      src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java
  3. 18
    0
      src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java
  4. 6
    0
      src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java
  5. 135
    0
      src/main/java/com/huiju/estateagents/controller/TaPersonLevelSettingController.java
  6. 18
    0
      src/main/java/com/huiju/estateagents/controller/TaShopController.java
  7. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaShopTypeController.java
  8. 122
    0
      src/main/java/com/huiju/estateagents/controller/TdShopBadgeController.java
  9. 10
    0
      src/main/java/com/huiju/estateagents/entity/TaOrg.java
  10. 68
    0
      src/main/java/com/huiju/estateagents/entity/TaPersonLevelSetting.java
  11. 30
    0
      src/main/java/com/huiju/estateagents/entity/TaShop.java
  12. 58
    0
      src/main/java/com/huiju/estateagents/entity/TdShopBadge.java
  13. 18
    0
      src/main/java/com/huiju/estateagents/mapper/TaPersonLevelSettingMapper.java
  14. 18
    0
      src/main/java/com/huiju/estateagents/mapper/TdShopBadgeMapper.java
  15. 16
    0
      src/main/java/com/huiju/estateagents/service/ITaPersonLevelSettingService.java
  16. 16
    0
      src/main/java/com/huiju/estateagents/service/ITdShopBadgeService.java
  17. 20
    0
      src/main/java/com/huiju/estateagents/service/impl/TaPersonLevelSettingServiceImpl.java
  18. 20
    0
      src/main/java/com/huiju/estateagents/service/impl/TdShopBadgeServiceImpl.java
  19. 5
    0
      src/main/resources/mapper/TaPersonLevelSettingMapper.xml
  20. 5
    0
      src/main/resources/mapper/TdShopBadgeMapper.xml

+ 1
- 1
pom.xml Visa fil

10
 	</parent>
10
 	</parent>
11
 	<groupId>com.huiju</groupId>
11
 	<groupId>com.huiju</groupId>
12
 	<artifactId>zcloud</artifactId>
12
 	<artifactId>zcloud</artifactId>
13
-	<version>v3.5.29</version>
13
+	<version>v1.0.1</version>
14
 	<name>zhiyun</name>
14
 	<name>zhiyun</name>
15
 	<description>致云</description>
15
 	<description>致云</description>
16
 
16
 

+ 9
- 4
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Visa fil

18
 import com.huiju.estateagents.common.MD5Utils;
18
 import com.huiju.estateagents.common.MD5Utils;
19
 import com.huiju.estateagents.entity.*;
19
 import com.huiju.estateagents.entity.*;
20
 import com.huiju.estateagents.mapper.TaRoleMapper;
20
 import com.huiju.estateagents.mapper.TaRoleMapper;
21
-import com.huiju.estateagents.service.ITaMiniappService;
22
-import com.huiju.estateagents.service.ITaPersonBuildingService;
23
-import com.huiju.estateagents.service.ITaPersonService;
24
-import com.huiju.estateagents.service.ITaRoleService;
21
+import com.huiju.estateagents.service.*;
25
 import org.slf4j.Logger;
22
 import org.slf4j.Logger;
26
 import org.slf4j.LoggerFactory;
23
 import org.slf4j.LoggerFactory;
27
 import org.springframework.beans.factory.annotation.Autowired;
24
 import org.springframework.beans.factory.annotation.Autowired;
51
 
48
 
52
     @Autowired
49
     @Autowired
53
     public ITaUserService iTaUserService;
50
     public ITaUserService iTaUserService;
51
+
52
+    @Autowired
53
+    public ITaOrgService iTaOrgService;
54
     
54
     
55
     @Autowired
55
     @Autowired
56
     private ISysTokenService sysTokenService;
56
     private ISysTokenService sysTokenService;
291
             QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
291
             QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
292
             taMiniappQueryWrapper.eq("org_id", getOrgId(request));
292
             taMiniappQueryWrapper.eq("org_id", getOrgId(request));
293
             TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);
293
             TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);
294
+            //
295
+            TaOrg taOrg = iTaOrgService.getById(taUser.getOrgId());
294
 
296
 
295
             taUser.setMenus((List<SysMenu>) authMenu.getData());
297
             taUser.setMenus((List<SysMenu>) authMenu.getData());
296
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
298
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
297
             taUser.setRoles(roles);
299
             taUser.setRoles(roles);
298
             taUser.setLoginPassword("");
300
             taUser.setLoginPassword("");
299
             taUser.setMiniAppName(taMiniapp.getName());
301
             taUser.setMiniAppName(taMiniapp.getName());
302
+            taUser.setOrgName(taOrg.getName());
303
+            taUser.setOrgLogo(taOrg.getWaterMark());
300
 
304
 
301
             //获取所有菜单
305
             //获取所有菜单
302
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
306
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
303
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
307
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
304
 
308
 
309
+
305
             userMap.put("taUser", taUser);
310
             userMap.put("taUser", taUser);
306
             userMap.put("menuList", allMenus);
311
             userMap.put("menuList", allMenus);
307
             userMap.put("buttonList", allButtons);
312
             userMap.put("buttonList", allButtons);

+ 18
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java Visa fil

243
     private String miniAppName;
243
     private String miniAppName;
244
 
244
 
245
     private Boolean notShow;
245
     private Boolean notShow;
246
+
247
+    /**
248
+     * 公司封面
249
+     */
250
+    @TableField(exist = false)
251
+    private String orgThumb;
252
+
253
+    /**
254
+     * 公司描述
255
+     */
256
+    @TableField(exist = false)
257
+    private String orgDesc;
258
+
259
+    /**
260
+     * 公司Logo
261
+     */
262
+    @TableField(exist = false)
263
+    private String orgLogo;
246
 }
264
 }

+ 6
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Visa fil

162
         taOrg.setCreateDate(LocalDateTime.now());
162
         taOrg.setCreateDate(LocalDateTime.now());
163
         taOrg.setBuildingNum(taUser.getOrgNum());
163
         taOrg.setBuildingNum(taUser.getOrgNum());
164
         taOrg.setDefaultCityId(taUser.getDefaultCityId());
164
         taOrg.setDefaultCityId(taUser.getDefaultCityId());
165
+        taOrg.setThumb(taUser.getOrgThumb());
166
+        taOrg.setOrgDesc(taUser.getOrgDesc());
165
         if (taOrgMapper.insert(taOrg) < 1) {
167
         if (taOrgMapper.insert(taOrg) < 1) {
166
             throw new Exception("生成用户公司信息失败");
168
             throw new Exception("生成用户公司信息失败");
167
         }
169
         }
284
             taUser.setWaterMark(taOrg.getWaterMark());
286
             taUser.setWaterMark(taOrg.getWaterMark());
285
             taUser.setOrgNum(taOrg.getBuildingNum());
287
             taUser.setOrgNum(taOrg.getBuildingNum());
286
             taUser.setDefaultCityId(taOrg.getDefaultCityId());
288
             taUser.setDefaultCityId(taOrg.getDefaultCityId());
289
+            taUser.setOrgThumb(taOrg.getThumb());
290
+            taUser.setOrgDesc(taOrg.getOrgDesc());
287
         }
291
         }
288
 
292
 
289
         TaMiniapp taMiniapp = getMiniappByOrg(taOrg);
293
         TaMiniapp taMiniapp = getMiniappByOrg(taOrg);
312
             taOrg.setWaterMark(taUser.getWaterMark());
316
             taOrg.setWaterMark(taUser.getWaterMark());
313
             taOrg.setBuildingNum(taUser.getOrgNum());
317
             taOrg.setBuildingNum(taUser.getOrgNum());
314
             taOrg.setDefaultCityId(taUser.getDefaultCityId());
318
             taOrg.setDefaultCityId(taUser.getDefaultCityId());
319
+            taOrg.setThumb(taUser.getOrgThumb());
320
+            taOrg.setOrgDesc(taUser.getOrgDesc());
315
             if (taOrgMapper.updateById(taOrg) < 1) {
321
             if (taOrgMapper.updateById(taOrg) < 1) {
316
                 throw new Exception("更新用户公司信息失败");
322
                 throw new Exception("更新用户公司信息失败");
317
             }
323
             }

+ 135
- 0
src/main/java/com/huiju/estateagents/controller/TaPersonLevelSettingController.java Visa fil

1
+package com.huiju.estateagents.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.base.BaseController;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.entity.TaOrg;
10
+import io.swagger.annotations.Api;
11
+import io.swagger.annotations.ApiOperation;
12
+import io.swagger.annotations.ApiParam;
13
+import org.slf4j.Logger;
14
+import org.slf4j.LoggerFactory;
15
+import org.springframework.beans.factory.annotation.Autowired;
16
+import org.springframework.web.bind.annotation.PathVariable;
17
+import org.springframework.web.bind.annotation.RequestBody;
18
+import org.springframework.web.bind.annotation.RequestMapping;
19
+import org.springframework.web.bind.annotation.RequestMethod;
20
+import org.springframework.web.bind.annotation.RequestParam;
21
+import com.huiju.estateagents.service.ITaPersonLevelSettingService;
22
+import com.huiju.estateagents.entity.TaPersonLevelSetting;
23
+import org.springframework.web.bind.annotation.RestController;
24
+
25
+import javax.servlet.http.HttpServletRequest;
26
+
27
+/**
28
+ * <p>
29
+    * 用户等级设置  前端控制器
30
+    * </p>
31
+ *
32
+ * @author yansen
33
+ * @since 2020-11-05
34
+ */
35
+
36
+@Api(tags = "用户等级设置 ")
37
+@RestController
38
+@RequestMapping("/api")
39
+public class TaPersonLevelSettingController extends BaseController {
40
+
41
+    private final Logger logger = LoggerFactory.getLogger(TaPersonLevelSettingController.class);
42
+
43
+    @Autowired
44
+    public ITaPersonLevelSettingService iTaPersonLevelSettingService;
45
+
46
+
47
+    /**
48
+     * 分页查询列表
49
+     * @param pageNum
50
+     * @param pageSize
51
+     * @return
52
+     */
53
+    @RequestMapping(value="/{client}/person-level",method= RequestMethod.GET)
54
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
55
+    public ResponseBean taPersonLevelSettingList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String client,
56
+                                                 @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
57
+                                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
58
+                                                 HttpServletRequest request) throws Exception {
59
+        Integer orgId = getOrgId(request);
60
+
61
+        IPage<TaPersonLevelSetting> pg = new Page<>(pageNum, pageSize);
62
+        QueryWrapper<TaPersonLevelSetting> queryWrapper = new QueryWrapper<>();
63
+        queryWrapper.eq("org_id", orgId);
64
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
65
+        queryWrapper.orderByAsc("level_id");
66
+
67
+        IPage<TaPersonLevelSetting> result = iTaPersonLevelSettingService.page(pg, queryWrapper);
68
+        return ResponseBean.success(result);
69
+    }
70
+
71
+    /**
72
+     * 保存对象
73
+     * @param taPersonLevelSetting 实体对象
74
+     * @return
75
+     */
76
+    @RequestMapping(value="/admin/person-level",method= RequestMethod.POST)
77
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
78
+    public ResponseBean taPersonLevelSettingAdd(@ApiParam("保存内容") @RequestBody TaPersonLevelSetting taPersonLevelSetting,
79
+                                                HttpServletRequest request) throws Exception{
80
+        if (null == taPersonLevelSetting) {
81
+            return ResponseBean.error("未发现有效的数据", ResponseBean.ERROR_ILLEGAL_PARAMS);
82
+        }
83
+
84
+        if (null == taPersonLevelSetting.getLevelId()) {
85
+            return ResponseBean.error("未设置等级ID", ResponseBean.ERROR_ILLEGAL_PARAMS);
86
+        }
87
+
88
+        taPersonLevelSetting.setOrgId(getOrgId(request));
89
+        if (iTaPersonLevelSettingService.save(taPersonLevelSetting)){
90
+            return ResponseBean.success(taPersonLevelSetting);
91
+        }else {
92
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
93
+        }
94
+    }
95
+
96
+    /**
97
+     * 根据id删除对象
98
+     * @param id  实体ID
99
+     */
100
+    @RequestMapping(value="/admin/person-level/{id}", method= RequestMethod.DELETE)
101
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
102
+    public ResponseBean taPersonLevelSettingDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
103
+        TaPersonLevelSetting taPersonLevelSetting = iTaPersonLevelSettingService.getById(id);
104
+        taPersonLevelSetting.setStatus(CommConstant.STATUS_DELETE);
105
+        return taPersonLevelSettingUpdate(id, taPersonLevelSetting);
106
+    }
107
+
108
+    /**
109
+     * 修改对象
110
+     * @param id  实体ID
111
+     * @param taPersonLevelSetting 实体对象
112
+     * @return
113
+     */
114
+    @RequestMapping(value="/admin/person-level/{id}",method= RequestMethod.PUT)
115
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
116
+    public ResponseBean taPersonLevelSettingUpdate(@ApiParam("对象ID") @PathVariable Integer id,
117
+                                                   @ApiParam("更新内容") @RequestBody TaPersonLevelSetting taPersonLevelSetting) throws Exception{
118
+        taPersonLevelSetting.setLevelId(id);
119
+        if (iTaPersonLevelSettingService.updateById(taPersonLevelSetting)){
120
+            return ResponseBean.success(iTaPersonLevelSettingService.getById(id));
121
+        }else {
122
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
123
+        }
124
+    }
125
+
126
+    /**
127
+     * 根据id查询对象
128
+     * @param id  实体ID
129
+     */
130
+    @RequestMapping(value="/admin/person-level/{id}",method= RequestMethod.GET)
131
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
132
+    public ResponseBean taPersonLevelSettingGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
133
+        return ResponseBean.success(iTaPersonLevelSettingService.getById(id));
134
+    }
135
+}

+ 18
- 0
src/main/java/com/huiju/estateagents/controller/TaShopController.java Visa fil

8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
 import com.huiju.estateagents.common.CommonUtils;
9
 import com.huiju.estateagents.common.CommonUtils;
10
 import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.common.StringUtils;
11
+import com.huiju.estateagents.entity.TaShopType;
12
+import com.huiju.estateagents.service.ITaShopTypeService;
11
 import io.swagger.annotations.Api;
13
 import io.swagger.annotations.Api;
12
 import io.swagger.annotations.ApiOperation;
14
 import io.swagger.annotations.ApiOperation;
13
 import io.swagger.annotations.ApiParam;
15
 import io.swagger.annotations.ApiParam;
45
     @Autowired
47
     @Autowired
46
     public ITaShopService iTaShopService;
48
     public ITaShopService iTaShopService;
47
 
49
 
50
+    @Autowired
51
+    public ITaShopTypeService iTaShopTypeService;
48
 
52
 
49
     /**
53
     /**
50
      * 分页查询列表
54
      * 分页查询列表
58
                                 @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
62
                                 @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
59
                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
63
                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
60
                                 @ApiParam("商铺名称") @RequestParam(value = "name", required = false) String name,
64
                                 @ApiParam("商铺名称") @RequestParam(value = "name", required = false) String name,
65
+                                @ApiParam("商铺分类") @RequestParam(value = "typeId", required = false) String typeId,
61
                                 @ApiParam("排序字段") @RequestParam(value = "sortField", defaultValue = "create_date") String sortField,
66
                                 @ApiParam("排序字段") @RequestParam(value = "sortField", defaultValue = "create_date") String sortField,
67
+                                @ApiParam("首页推荐") @RequestParam(value = "isIndex", required = false) Boolean isIndex,
62
                                 HttpServletRequest request) throws Exception{
68
                                 HttpServletRequest request) throws Exception{
63
 
69
 
64
         Integer orgId = getOrgId(request);
70
         Integer orgId = getOrgId(request);
66
         QueryWrapper<TaShop> queryWrapper = new QueryWrapper<>();
72
         QueryWrapper<TaShop> queryWrapper = new QueryWrapper<>();
67
         queryWrapper.eq("org_id", orgId);
73
         queryWrapper.eq("org_id", orgId);
68
         queryWrapper.like(!StringUtils.isEmpty(name), "shop_name", name);
74
         queryWrapper.like(!StringUtils.isEmpty(name), "shop_name", name);
75
+        queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
76
+        queryWrapper.eq(null != isIndex, "is_index", null != isIndex && isIndex ? 1 : 0);
69
         queryWrapper.gt("status", CommConstant.STATUS_DELETE);
77
         queryWrapper.gt("status", CommConstant.STATUS_DELETE);
70
         queryWrapper.orderByDesc(sortField);
78
         queryWrapper.orderByDesc(sortField);
71
 
79
 
86
         Integer orgId = getOrgId(request);
94
         Integer orgId = getOrgId(request);
87
         taShop.setShopId(CommonUtils.getUUIDS());
95
         taShop.setShopId(CommonUtils.getUUIDS());
88
         taShop.setOrgId(orgId);
96
         taShop.setOrgId(orgId);
97
+
98
+        TaShopType taShopType = iTaShopTypeService.getById(taShop.getTypeId());
99
+        if (null != taShopType) {
100
+            taShop.setTypeName(taShopType.getTypeName());
101
+        }
102
+
89
         if (iTaShopService.save(taShop)){
103
         if (iTaShopService.save(taShop)){
90
             return ResponseBean.success(taShop);
104
             return ResponseBean.success(taShop);
91
         }else {
105
         }else {
119
                                      @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
133
                                      @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
120
 
134
 
121
         taShop.setShopId(id);
135
         taShop.setShopId(id);
136
+        TaShopType taShopType = iTaShopTypeService.getById(taShop.getTypeId());
137
+        if (null != taShopType) {
138
+            taShop.setTypeName(taShopType.getTypeName());
139
+        }
122
         if (iTaShopService.updateById(taShop)){
140
         if (iTaShopService.updateById(taShop)){
123
             return ResponseBean.success(iTaShopService.getById(id));
141
             return ResponseBean.success(iTaShopService.getById(id));
124
         }else {
142
         }else {

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaShopTypeController.java Visa fil

36
 
36
 
37
 @Api(tags = "商户分类 ")
37
 @Api(tags = "商户分类 ")
38
 @RestController
38
 @RestController
39
-@RequestMapping("/")
39
+@RequestMapping("/api")
40
 public class TaShopTypeController extends BaseController {
40
 public class TaShopTypeController extends BaseController {
41
 
41
 
42
     private final Logger logger = LoggerFactory.getLogger(TaShopTypeController.class);
42
     private final Logger logger = LoggerFactory.getLogger(TaShopTypeController.class);

+ 122
- 0
src/main/java/com/huiju/estateagents/controller/TdShopBadgeController.java Visa fil

1
+package com.huiju.estateagents.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.base.BaseController;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
9
+import io.swagger.annotations.Api;
10
+import io.swagger.annotations.ApiOperation;
11
+import io.swagger.annotations.ApiParam;
12
+import org.slf4j.Logger;
13
+import org.slf4j.LoggerFactory;
14
+import org.springframework.beans.factory.annotation.Autowired;
15
+import org.springframework.web.bind.annotation.PathVariable;
16
+import org.springframework.web.bind.annotation.RequestBody;
17
+import org.springframework.web.bind.annotation.RequestMapping;
18
+import org.springframework.web.bind.annotation.RequestMethod;
19
+import org.springframework.web.bind.annotation.RequestParam;
20
+import com.huiju.estateagents.service.ITdShopBadgeService;
21
+import com.huiju.estateagents.entity.TdShopBadge;
22
+import org.springframework.web.bind.annotation.RestController;
23
+
24
+/**
25
+ * <p>
26
+    * 商户外卖标签  前端控制器
27
+    * </p>
28
+ *
29
+ * @author yansen
30
+ * @since 2020-11-05
31
+ */
32
+
33
+@Api(tags = "商户外卖标签 ")
34
+@RestController
35
+@RequestMapping("/api")
36
+public class TdShopBadgeController extends BaseController {
37
+
38
+    private final Logger logger = LoggerFactory.getLogger(TdShopBadgeController.class);
39
+
40
+    @Autowired
41
+    public ITdShopBadgeService iTdShopBadgeService;
42
+
43
+
44
+    /**
45
+     * 分页查询列表
46
+     * @param pageNum
47
+     * @param pageSize
48
+     * @return
49
+     */
50
+    @RequestMapping(value="/{client}/shop-badge",method= RequestMethod.GET)
51
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
52
+    public ResponseBean tdShopBadgeList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String client,
53
+                                        @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
54
+									    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
55
+
56
+		    IPage<TdShopBadge> pg = new Page<>(pageNum, pageSize);
57
+            QueryWrapper<TdShopBadge> queryWrapper = new QueryWrapper<>();
58
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
59
+            queryWrapper.orderByAsc("sort_no");
60
+
61
+            IPage<TdShopBadge> result = iTdShopBadgeService.page(pg, queryWrapper);
62
+            return ResponseBean.success(result);
63
+    }
64
+//
65
+//    /**
66
+//     * 保存对象
67
+//     * @param tdShopBadge 实体对象
68
+//     * @return
69
+//     */
70
+//    @RequestMapping(value="/tdShopBadge",method= RequestMethod.POST)
71
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
72
+//    public ResponseBean tdShopBadgeAdd(@ApiParam("保存内容") @RequestBody TdShopBadge tdShopBadge) throws Exception{
73
+//
74
+//        if (iTdShopBadgeService.save(tdShopBadge)){
75
+//            return ResponseBean.success(tdShopBadge);
76
+//        }else {
77
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
78
+//        }
79
+//    }
80
+//
81
+//    /**
82
+//     * 根据id删除对象
83
+//     * @param id  实体ID
84
+//     */
85
+//    @RequestMapping(value="/tdShopBadge/{id}", method= RequestMethod.DELETE)
86
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
87
+//    public ResponseBean tdShopBadgeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
88
+//        if(iTdShopBadgeService.removeById(id)){
89
+//            return ResponseBean.success("success");
90
+//        }else {
91
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
92
+//        }
93
+//    }
94
+//
95
+//    /**
96
+//     * 修改对象
97
+//     * @param id  实体ID
98
+//     * @param tdShopBadge 实体对象
99
+//     * @return
100
+//     */
101
+//    @RequestMapping(value="/tdShopBadge/{id}",method= RequestMethod.PUT)
102
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
103
+//    public ResponseBean tdShopBadgeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
104
+//                                        @ApiParam("更新内容") @RequestBody TdShopBadge tdShopBadge) throws Exception{
105
+//
106
+//        if (iTdShopBadgeService.updateById(tdShopBadge)){
107
+//            return ResponseBean.success(iTdShopBadgeService.getById(id));
108
+//        }else {
109
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
110
+//        }
111
+//    }
112
+//
113
+//    /**
114
+//     * 根据id查询对象
115
+//     * @param id  实体ID
116
+//     */
117
+//    @RequestMapping(value="/tdShopBadge/{id}",method= RequestMethod.GET)
118
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
119
+//    public ResponseBean tdShopBadgeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
120
+//        return ResponseBean.success(iTdShopBadgeService.getById(id));
121
+//    }
122
+}

+ 10
- 0
src/main/java/com/huiju/estateagents/entity/TaOrg.java Visa fil

86
      * 短地址
86
      * 短地址
87
      */
87
      */
88
     private String shortId;
88
     private String shortId;
89
+
90
+    /**
91
+     * 封面
92
+     */
93
+    private String thumb;
94
+
95
+    /**
96
+     * 简介
97
+     */
98
+    private String orgDesc;
89
 }
99
 }

+ 68
- 0
src/main/java/com/huiju/estateagents/entity/TaPersonLevelSetting.java Visa fil

1
+package com.huiju.estateagents.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import java.time.LocalDateTime;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import java.io.Serializable;
7
+import lombok.Data;
8
+import lombok.EqualsAndHashCode;
9
+import lombok.experimental.Accessors;
10
+
11
+/**
12
+ * <p>
13
+ * 用户等级设置 
14
+ * </p>
15
+ *
16
+ * @author yansen
17
+ * @since 2020-11-05
18
+ */
19
+@Data
20
+@EqualsAndHashCode(callSuper = false)
21
+@Accessors(chain = true)
22
+public class TaPersonLevelSetting implements Serializable {
23
+
24
+    private static final long serialVersionUID = 1L;
25
+
26
+    /**
27
+     * 等级ID
28
+     */
29
+    @TableId(value = "level_id", type = IdType.INPUT)
30
+    private Integer levelId;
31
+
32
+    /**
33
+     * 等级名称
34
+     */
35
+    private String levelName;
36
+
37
+    /**
38
+     * 等级说明
39
+     */
40
+    private String levelDesc;
41
+
42
+    /**
43
+     * 等级图标
44
+     */
45
+    private String levelIcon;
46
+
47
+    /**
48
+     * 积分规则 半角逗号连接,默认闭开区间.0,10代表0-9积分属于当前等级
49
+     */
50
+    private String pointRule;
51
+
52
+    /**
53
+     * 公司id
54
+     */
55
+    private Integer orgId;
56
+
57
+    /**
58
+     * 创建时间
59
+     */
60
+    private LocalDateTime createDate;
61
+
62
+    /**
63
+     * 状态
64
+     */
65
+    private Integer status;
66
+
67
+
68
+}

+ 30
- 0
src/main/java/com/huiju/estateagents/entity/TaShop.java Visa fil

44
      */
44
      */
45
     private String shopDesc;
45
     private String shopDesc;
46
 
46
 
47
+    /**
48
+     * 电话
49
+     */
50
+    private String phone;
51
+
52
+    /**
53
+     * 分类ID
54
+     */
55
+    private String typeId;
56
+
57
+    /**
58
+     * 分类名称
59
+     */
60
+    private String typeName;
61
+
47
     /**
62
     /**
48
      * 地址
63
      * 地址
49
      */
64
      */
69
      */
84
      */
70
     private String tags;
85
     private String tags;
71
 
86
 
87
+    /**
88
+     * 外卖标签
89
+     */
90
+    private String badges;
91
+
92
+    /**
93
+     * 人均消费
94
+     */
95
+    private String costAvg;
96
+
97
+    /**
98
+     * 首页推荐
99
+     */
100
+    private Boolean isIndex;
101
+
72
     /**
102
     /**
73
      * 排序
103
      * 排序
74
      */
104
      */

+ 58
- 0
src/main/java/com/huiju/estateagents/entity/TdShopBadge.java Visa fil

1
+package com.huiju.estateagents.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import java.time.LocalDateTime;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import java.io.Serializable;
7
+import lombok.Data;
8
+import lombok.EqualsAndHashCode;
9
+import lombok.experimental.Accessors;
10
+
11
+/**
12
+ * <p>
13
+ * 商户外卖标签 
14
+ * </p>
15
+ *
16
+ * @author yansen
17
+ * @since 2020-11-05
18
+ */
19
+@Data
20
+@EqualsAndHashCode(callSuper = false)
21
+@Accessors(chain = true)
22
+public class TdShopBadge implements Serializable {
23
+
24
+    private static final long serialVersionUID = 1L;
25
+
26
+    /**
27
+     * 编码
28
+     */
29
+    @TableId(value = "shop_badge_code", type = IdType.INPUT)
30
+    private String shopBadgeCode;
31
+
32
+    /**
33
+     * 说明
34
+     */
35
+    private String remark;
36
+
37
+    /**
38
+     * 颜色
39
+     */
40
+    private String color;
41
+
42
+    /**
43
+     * 排序
44
+     */
45
+    private Integer sortNo;
46
+
47
+    /**
48
+     * 创建时间
49
+     */
50
+    private LocalDateTime createDate;
51
+
52
+    /**
53
+     * 状态
54
+     */
55
+    private Integer status;
56
+
57
+
58
+}

+ 18
- 0
src/main/java/com/huiju/estateagents/mapper/TaPersonLevelSettingMapper.java Visa fil

1
+package com.huiju.estateagents.mapper;
2
+
3
+import com.huiju.estateagents.entity.TaPersonLevelSetting;
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * <p>
9
+ * 用户等级设置  Mapper 接口
10
+ * </p>
11
+ *
12
+ * @author yansen
13
+ * @since 2020-11-05
14
+ */
15
+@Mapper
16
+public interface TaPersonLevelSettingMapper extends BaseMapper<TaPersonLevelSetting> {
17
+
18
+}

+ 18
- 0
src/main/java/com/huiju/estateagents/mapper/TdShopBadgeMapper.java Visa fil

1
+package com.huiju.estateagents.mapper;
2
+
3
+import com.huiju.estateagents.entity.TdShopBadge;
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * <p>
9
+ * 商户外卖标签  Mapper 接口
10
+ * </p>
11
+ *
12
+ * @author yansen
13
+ * @since 2020-11-05
14
+ */
15
+@Mapper
16
+public interface TdShopBadgeMapper extends BaseMapper<TdShopBadge> {
17
+
18
+}

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITaPersonLevelSettingService.java Visa fil

1
+package com.huiju.estateagents.service;
2
+
3
+import com.huiju.estateagents.entity.TaPersonLevelSetting;
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+
6
+/**
7
+ * <p>
8
+ * 用户等级设置  服务类
9
+ * </p>
10
+ *
11
+ * @author yansen
12
+ * @since 2020-11-05
13
+ */
14
+public interface ITaPersonLevelSettingService extends IService<TaPersonLevelSetting> {
15
+
16
+}

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITdShopBadgeService.java Visa fil

1
+package com.huiju.estateagents.service;
2
+
3
+import com.huiju.estateagents.entity.TdShopBadge;
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+
6
+/**
7
+ * <p>
8
+ * 商户外卖标签  服务类
9
+ * </p>
10
+ *
11
+ * @author yansen
12
+ * @since 2020-11-05
13
+ */
14
+public interface ITdShopBadgeService extends IService<TdShopBadge> {
15
+
16
+}

+ 20
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonLevelSettingServiceImpl.java Visa fil

1
+package com.huiju.estateagents.service.impl;
2
+
3
+import com.huiju.estateagents.entity.TaPersonLevelSetting;
4
+import com.huiju.estateagents.mapper.TaPersonLevelSettingMapper;
5
+import com.huiju.estateagents.service.ITaPersonLevelSettingService;
6
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ * 用户等级设置  服务实现类
12
+ * </p>
13
+ *
14
+ * @author yansen
15
+ * @since 2020-11-05
16
+ */
17
+@Service
18
+public class TaPersonLevelSettingServiceImpl extends ServiceImpl<TaPersonLevelSettingMapper, TaPersonLevelSetting> implements ITaPersonLevelSettingService {
19
+
20
+}

+ 20
- 0
src/main/java/com/huiju/estateagents/service/impl/TdShopBadgeServiceImpl.java Visa fil

1
+package com.huiju.estateagents.service.impl;
2
+
3
+import com.huiju.estateagents.entity.TdShopBadge;
4
+import com.huiju.estateagents.mapper.TdShopBadgeMapper;
5
+import com.huiju.estateagents.service.ITdShopBadgeService;
6
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ * 商户外卖标签  服务实现类
12
+ * </p>
13
+ *
14
+ * @author yansen
15
+ * @since 2020-11-05
16
+ */
17
+@Service
18
+public class TdShopBadgeServiceImpl extends ServiceImpl<TdShopBadgeMapper, TdShopBadge> implements ITdShopBadgeService {
19
+
20
+}

+ 5
- 0
src/main/resources/mapper/TaPersonLevelSettingMapper.xml Visa fil

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.mapper.TaPersonLevelSettingMapper">
4
+
5
+</mapper>

+ 5
- 0
src/main/resources/mapper/TdShopBadgeMapper.xml Visa fil

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.mapper.TdShopBadgeMapper">
4
+
5
+</mapper>