no message

src/main/java/com/gree/mall/contest/bean/admin/AdminUserBean.java

@@ -1,8 +1,7 @@
 package com.gree.mall.contest.bean.admin;
 
 import com.gree.mall.contest.plus.entity.AdminUser;
-//import com.gree.mall.contest.plus.entity.Merchant;
-//import com.gree.mall.contest.plus.entity.ServiceProvider;
+import com.gree.mall.contest.plus.entity.Merchant;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,9 +17,6 @@ public class AdminUserBean extends AdminUser {
     @Schema(description = "token到期时间")
     private Date expireTimeToken;
 
-//    @Schema(description = "服务商")
-//    private ServiceProvider serviceProvider;
-//
-//    @Schema(description = "合作商户")
-//    private Merchant merchant;
+    @Schema(description = "商家")
+    private Merchant merchant;
 }

src/main/java/com/gree/mall/contest/bean/admin/AdminUserCom.java

@@ -2,7 +2,7 @@ package com.gree.mall.contest.bean.admin;
 
 import com.gree.mall.contest.plus.entity.AdminCompanyWechat;
 import com.gree.mall.contest.plus.entity.AdminUser;
-import com.gree.mall.contest.plus.entity.AdminWebsit;
+import com.gree.mall.contest.plus.entity.MerchantWebsit;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,7 +14,7 @@ import java.util.List;
 public class AdminUserCom extends AdminUser {
 
     @Schema(description = "部门")
-    private AdminWebsit adminWebsit;
+    private MerchantWebsit merchantWebsit;
     @Schema(description = "部门id")
     private List<String> adminWebsitIds;
     @Schema(description = "只读帐号")

src/main/java/com/gree/mall/contest/bean/admin/AdminWebsitTree.java

@@ -1,15 +0,0 @@
-package com.gree.mall.contest.bean.admin;
-
-import com.gree.mall.contest.plus.entity.AdminWebsit;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AdminWebsitTree extends AdminWebsit {
-
-    @Schema(description = "children")
-    private List<AdminWebsitTree> children;
-
-}

src/main/java/com/gree/mall/contest/bean/admin/MerchantWebsitTree.java

@@ -0,0 +1,17 @@
+package com.gree.mall.contest.bean.admin;
+
+import com.gree.mall.contest.plus.entity.MerchantWebsit;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MerchantWebsitTree extends MerchantWebsit {
+
+    @Schema(description = "children")
+    private List<MerchantWebsitTree> children;
+
+}

src/main/java/com/gree/mall/contest/controller/pc/admin/AdminWebsitController.java

@@ -1,11 +1,11 @@
 package com.gree.mall.contest.controller.pc.admin;
 
-import com.gree.mall.contest.bean.admin.AdminWebsitTree;
+import com.gree.mall.contest.bean.admin.MerchantWebsitTree;
 import com.gree.mall.contest.exception.RemoteServiceException;
 import com.gree.mall.contest.helper.ResponseHelper;
 import com.gree.mall.contest.logic.admin.AdminWebsitLogic;
-import com.gree.mall.contest.plus.entity.AdminWebsit;
-import com.gree.mall.contest.plus.entity.AdminWebsitRegion;
+import com.gree.mall.contest.plus.entity.MerchantWebsit;
+import com.gree.mall.contest.plus.entity.MerchantWebsitRegion;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,36 +28,36 @@ public class AdminWebsitController {
 
     @GetMapping("/tree")
     @Operation(summary = "部门树")
-    public ResponseHelper<AdminWebsitTree> tree(HttpServletRequest request,
-                                                @Parameter(description = "角色查询",required = false)
+    public ResponseHelper<MerchantWebsitTree> tree(HttpServletRequest request,
+                                                   @Parameter(description = "角色查询",required = false)
                                                 @RequestParam(required = false,defaultValue = "false") Boolean isRole
                                                 ){
-        List<AdminWebsitTree> tree = adminWebsitLogic.tree(request,isRole);
+        List<MerchantWebsitTree> tree = adminWebsitLogic.tree(request,isRole);
         return ResponseHelper.success(tree);
     }
 
     @GetMapping("/list")
     @Operation(summary = "部门列表")
-    public ResponseHelper<List<AdminWebsit>> list(
+    public ResponseHelper<List<MerchantWebsit>> list(
             @RequestParam(required = false) Boolean isAll,
             @RequestParam(required = false) Boolean status
     ){
-        List<AdminWebsit> list = adminWebsitLogic.list(isAll,status);
+        List<MerchantWebsit> list = adminWebsitLogic.list(isAll,status);
         return ResponseHelper.success(list);
     }
 
 
     @PostMapping("/add")
     @Operation(summary = "新增部门")
-    public ResponseHelper add(@RequestBody AdminWebsit adminWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
-        adminWebsitLogic.add(adminWebsit,request);
+    public ResponseHelper add(@RequestBody MerchantWebsit merchantWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
+        adminWebsitLogic.add(merchantWebsit,request);
         return ResponseHelper.success();
     }
 
     @PostMapping("/update")
     @Operation(summary = "修改部门")
-    public ResponseHelper update(@RequestBody AdminWebsit adminWebsit,HttpServletRequest request) throws RemoteServiceException, WxErrorException {
-        adminWebsitLogic.update(adminWebsit,request);
+    public ResponseHelper update(@RequestBody MerchantWebsit merchantWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
+        adminWebsitLogic.update(merchantWebsit,request);
         return ResponseHelper.success();
     }
 
@@ -70,29 +70,29 @@ public class AdminWebsitController {
 
     @GetMapping("/detail")
     @Operation(summary = "部门详情")
-    public ResponseHelper<AdminWebsit> detail(@RequestParam String id){
-        AdminWebsit detail = adminWebsitLogic.detail(id);
+    public ResponseHelper<MerchantWebsit> detail(@RequestParam String id){
+        MerchantWebsit detail = adminWebsitLogic.detail(id);
         return ResponseHelper.success(detail);
     }
 
     @PostMapping("/region/save")
     @Operation(summary = "保存部门服务区域")
-    public ResponseHelper<List<AdminWebsitRegion>> saveRegion(
-            @RequestBody List<AdminWebsitRegion> adminWebsitRegions
+    public ResponseHelper<List<MerchantWebsitRegion>> saveRegion(
+            @RequestBody List<MerchantWebsitRegion> merchantWebsitRegions
     ){
-        adminWebsitLogic.saveRegion(adminWebsitRegions);
+        adminWebsitLogic.saveRegion(merchantWebsitRegions);
         return ResponseHelper.success();
     }
 
     @PostMapping("/region/list")
     @Operation(summary = "部门服务区域列表")
-    public ResponseHelper<List<AdminWebsitRegion>> listRegion(
+    public ResponseHelper<List<MerchantWebsitRegion>> listRegion(
             @RequestParam String adminWebsitId,
             @Parameter(description = "关键词",required = false) @RequestParam(required = false) String keyword,
             @Parameter(description = "服务类目id",required = false) @RequestParam(required = false) String serviceCategoryId
     ){
-        List<AdminWebsitRegion> adminWebsitRegions = adminWebsitLogic.listRegion(adminWebsitId,keyword,serviceCategoryId);
-        return ResponseHelper.success(adminWebsitRegions);
+        List<MerchantWebsitRegion> merchantWebsitRegions = adminWebsitLogic.listRegion(adminWebsitId,keyword,serviceCategoryId);
+        return ResponseHelper.success(merchantWebsitRegions);
     }
 
     @PostMapping("/region/delete")

src/main/java/com/gree/mall/contest/logic/admin/AdminUserLogic.java

@@ -15,8 +15,6 @@ import com.gree.mall.contest.bean.admin.AdminUserBean;
 import com.gree.mall.contest.bean.admin.AdminUserCom;
 import com.gree.mall.contest.bean.admin.AdminWebsitGrantBean;
 import com.gree.mall.contest.bean.admin.reqDto.AdminUserAddReqBean;
-import com.gree.mall.contest.commonmapper.AdminMapper;
-import com.gree.mall.contest.commonmapper.CommonMapper;
 import com.gree.mall.contest.constant.Constant;
 import com.gree.mall.contest.enums.admin.RoleTypeEnum;
 import com.gree.mall.contest.exception.RemoteServiceException;
@@ -55,15 +53,9 @@ public class AdminUserLogic {
     private final AdminModuleService adminModuleService;
     private final AdminRoleService adminRoleService;
     private final AdminUserModuleRelaService adminUserModuleRelaService;
-    private final AdminCompanyWechatService adminCompanyWechatService;
-    private final AdminWebsitService adminWebsitService;
-    private final AdminMapper adminMapper;
+    private final MerchantWebsitService merchantWebsitService;
     private final SMSLogic smsLogic;
-//    private final ServiceProviderService serviceProviderService;
-//    private final MerchantService merchantService;
-    private final CommonMapper commonMapper;
-    private final SysConfigService sysConfigService;
-    private final AdminWebsitLogic adminWebsitLogic;
+    private final MerchantService merchantService;
 
     @Value("${jwt.expire}")
     private Long expiration;
@@ -230,8 +222,8 @@ public class AdminUserLogic {
             throw new RemoteServiceException("帐号已被注册");
         }
         //当前用户选择的部门
-        AdminWebsit adminWebsit = adminWebsitService.getById(adminUser.getAdminWebsitId());
-        if(adminWebsit == null){
+        MerchantWebsit merchantWebsit = merchantWebsitService.getById(adminUser.getAdminWebsitId());
+        if(merchantWebsit == null){
             throw new RemoteServiceException("请选择部门");
         }
         //需要用户roleId
@@ -273,8 +265,8 @@ public class AdminUserLogic {
             throw new RemoteServiceException("请为用户选择角色");
         }
         //当前用户选择的部门
-        AdminWebsit adminWebsit = adminWebsitService.getById(newUser.getAdminWebsitId());
-        if(adminWebsit == null){
+        MerchantWebsit merchantWebsit = merchantWebsitService.getById(newUser.getAdminWebsitId());
+        if(merchantWebsit == null){
             throw new RemoteServiceException("请选择部门");
         }
         this.setType(admin,oldUser,newUser);
@@ -327,9 +319,9 @@ public class AdminUserLogic {
         List<String> adminWebsitIds = adminUser.getAdminWebsitIds();
 
         if(StringUtils.isNotBlank(adminWebsitId)) {
-            List<AdminWebsit> list = new ArrayList<>();
+            List<MerchantWebsit> list = new ArrayList<>();
             list.addAll(commonLogic.queryAllChild(list, adminWebsitId));
-            adminWebsitIds = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
+            adminWebsitIds = list.stream().map(MerchantWebsit::getWebsitId).collect(Collectors.toList());
             //要把查得父id加入
             adminWebsitIds.add(adminWebsitId);
         }
@@ -357,10 +349,8 @@ public class AdminUserLogic {
         AdminUserBean adminUserBean = new AdminUserBean();
         BeanUtils.copyProperties(adminUser, adminUserBean);
         //服务商对象
-//        ServiceProvider serviceProvider = serviceProviderService.getById(adminUser.getServiceProviderId());
-//        Merchant merchant = merchantService.getById(adminUser.getServiceProviderId());
-//        adminUserBean.setServiceProvider(serviceProvider);
-//        adminUserBean.setMerchant(merchant);
+        Merchant merchant = merchantService.getById(adminUser.getServiceProviderId());
+        adminUserBean.setMerchant(merchant);
         return adminUserBean;
     }
 

src/main/java/com/gree/mall/contest/logic/admin/AdminWebsitLogic.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.gree.mall.contest.bean.admin.AdminUserCom;
-import com.gree.mall.contest.bean.admin.AdminWebsitTree;
+import com.gree.mall.contest.bean.admin.MerchantWebsitTree;
 import com.gree.mall.contest.constant.Constant;
 import com.gree.mall.contest.exception.RemoteServiceException;
 import com.gree.mall.contest.logic.common.CommonLogic;
@@ -29,8 +29,8 @@ import java.util.stream.Collectors;
 public class AdminWebsitLogic {
 
     private final AdminWebsitService adminWebsitService;
+    private final MerchantWebsitService merchantWebsitService;
     private final AdminWebsitRegionService adminWebsitRegionService;
-//    private final ServiceProviderService serviceProviderService;
     private final AdminUserService adminUserService;
     private final CommonLogic commonLogic;
 
@@ -39,7 +39,7 @@ public class AdminWebsitLogic {
     /**
      * 部门树
      */
-    public List<AdminWebsitTree> tree(HttpServletRequest request, Boolean isRole){
+    public List<MerchantWebsitTree> tree(HttpServletRequest request, Boolean isRole){
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         List<AdminRole> adminRoles = adminRoleService.lambdaQuery().in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds())
@@ -52,40 +52,40 @@ public class AdminWebsitLogic {
         if (isRole){
             if (CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()))
                 websids.addAll(adminUser.getAdminWebsitIds());
-            List<AdminWebsit> list = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId,websids)
-                    .orderByAsc(AdminWebsit::getCreateTime)
+            List<MerchantWebsit> list = merchantWebsitService.lambdaQuery().in(MerchantWebsit::getWebsitId,websids)
+                    .orderByAsc(MerchantWebsit::getCreateTime)
                     .list();
 
-            List<AdminWebsitTree> adminWebsitTrees = BeanUtil.copyToList(list, AdminWebsitTree.class);
+            List<MerchantWebsitTree> merchantWebsitTrees = BeanUtil.copyToList(list, MerchantWebsitTree.class);
 
-            return adminWebsitTrees;
+            return merchantWebsitTrees;
         }
 
-        List<AdminWebsit> list = adminWebsitService.list();
-        List<AdminWebsitTree> trees = new ArrayList<>();
+        List<MerchantWebsit> list = merchantWebsitService.list();
+        List<MerchantWebsitTree> trees = new ArrayList<>();
 
 
-        for(AdminWebsit adminWebsit : list){
-            AdminWebsitTree adminWebsitTree = new AdminWebsitTree();
-            BeanUtils.copyProperties(adminWebsit,adminWebsitTree);
-            trees.add(adminWebsitTree);
+        for(MerchantWebsit merchantWebsit : list){
+            MerchantWebsitTree merchantWebsitTree = new MerchantWebsitTree();
+            BeanUtils.copyProperties(merchantWebsit, merchantWebsitTree);
+            trees.add(merchantWebsitTree);
         }
-        List<AdminWebsitTree> parentList = trees.stream()
+        List<MerchantWebsitTree> parentList = trees.stream()
                 .filter(x ->  x.getWebsitId().equals(adminUser.getAdminWebsitId())).collect(Collectors.toList());
 
-        for(AdminWebsitTree adminWebsit:parentList){
+        for(MerchantWebsitTree adminWebsit:parentList){
             adminWebsit.setChildren(this.treeModule(trees,adminWebsit.getWebsitId()));
         }
         return parentList;
     }
 
 
-    public List<AdminWebsit> list(Boolean isAll,Boolean status){
+    public List<MerchantWebsit> list(Boolean isAll, Boolean status){
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
-        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
-                .eq(status != null,AdminWebsit::getStatus, status)
-                .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()) && (isAll == null || !isAll),AdminWebsit::getWebsitId,adminUser.getAdminWebsitIds())
+        List<MerchantWebsit> list = merchantWebsitService.lambdaQuery()
+                .eq(status != null, MerchantWebsit::getStatus, status)
+                .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()) && (isAll == null || !isAll), MerchantWebsit::getWebsitId,adminUser.getAdminWebsitIds())
                 .list();
         return list;
     }
@@ -95,63 +95,63 @@ public class AdminWebsitLogic {
      *  新增部门
      */
     @Transactional
-    public void add(AdminWebsit adminWebsit, HttpServletRequest request) throws WxErrorException, RemoteServiceException {
+    public void add(MerchantWebsit merchantWebsit, HttpServletRequest request) throws WxErrorException, RemoteServiceException {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
-        Long count = adminWebsitService.lambdaQuery().eq(AdminWebsit::getName, adminWebsit.getName())
+        Long count = merchantWebsitService.lambdaQuery().eq(MerchantWebsit::getName, merchantWebsit.getName())
                 .count();
         if(count > 0){
             throw new RemoteServiceException("部门名称已存在");
         }
-        AdminWebsit parent = adminWebsitService.getById(adminWebsit.getParentId());
+        MerchantWebsit parent = merchantWebsitService.getById(merchantWebsit.getParentId());
         if(parent == null){
             throw new RemoteServiceException("请选择父部门");
         }
-        List<AdminWebsit> list = new ArrayList<>();
-        list.addAll(commonLogic.queryAllChild(list,adminWebsit.getWebsitId()));
-        List<String> childWebsitIds = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
-        if(childWebsitIds.contains(adminWebsit.getParentId())){
+        List<MerchantWebsit> list = new ArrayList<>();
+        list.addAll(commonLogic.queryAllChild(list, merchantWebsit.getWebsitId()));
+        List<String> childWebsitIds = list.stream().map(MerchantWebsit::getWebsitId).collect(Collectors.toList());
+        if(childWebsitIds.contains(merchantWebsit.getParentId())){
             throw new RemoteServiceException("父级部门不可以是自己或者自己的下级部门");
         }
-        adminWebsit.setType(parent.getType());
-        adminWebsit.setWebsitId(IdWorker.getIdStr());
-        adminWebsitService.save(adminWebsit);
+        merchantWebsit.setType(parent.getType());
+        merchantWebsit.setWebsitId(IdWorker.getIdStr());
+        merchantWebsitService.save(merchantWebsit);
     }
     /**
      * 编辑部门
      */
     @Transactional
-    public void update(AdminWebsit adminWebsit,HttpServletRequest request) throws RemoteServiceException, WxErrorException {
-        AdminWebsit old = adminWebsitService.getById(adminWebsit.getWebsitId());
+    public void update(MerchantWebsit merchantWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
+        MerchantWebsit old = merchantWebsitService.getById(merchantWebsit.getWebsitId());
         if(Constant.SYS_WEBSIT_NAME.contains(old.getName())){
             throw new RemoteServiceException("不可操作当前部门信息");
         }
-        Long count = adminWebsitService.lambdaQuery()
-                .ne(AdminWebsit::getWebsitId,adminWebsit.getWebsitId())
-                .eq(AdminWebsit::getName, adminWebsit.getName())
+        Long count = merchantWebsitService.lambdaQuery()
+                .ne(MerchantWebsit::getWebsitId, merchantWebsit.getWebsitId())
+                .eq(MerchantWebsit::getName, merchantWebsit.getName())
                 .count();
         if(count > 0){
             throw new RemoteServiceException("部门名称或部门编号已存在");
         }
-        if(adminWebsit.getParentId().equals("0")){
+        if(merchantWebsit.getParentId().equals("0")){
             throw new RemoteServiceException("请选择父部门");
         }
-        AdminWebsit parent = adminWebsitService.getById(adminWebsit.getParentId());
+        MerchantWebsit parent = merchantWebsitService.getById(merchantWebsit.getParentId());
         if(parent == null){
             throw new RemoteServiceException("请选择父部门");
         }
-        if(StringUtils.equals(adminWebsit.getWebsitId(),adminWebsit.getParentId())){
+        if(StringUtils.equals(merchantWebsit.getWebsitId(), merchantWebsit.getParentId())){
             throw new RemoteServiceException("父级部门不可以是自己");
         }
-        List<AdminWebsit> list = new ArrayList<>();
-        list.addAll(commonLogic.queryAllChild(list,adminWebsit.getWebsitId()));
-        List<String> childWebsitIds = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
-        if(childWebsitIds.contains(adminWebsit.getParentId())){
+        List<MerchantWebsit> list = new ArrayList<>();
+        list.addAll(commonLogic.queryAllChild(list, merchantWebsit.getWebsitId()));
+        List<String> childWebsitIds = list.stream().map(MerchantWebsit::getWebsitId).collect(Collectors.toList());
+        if(childWebsitIds.contains(merchantWebsit.getParentId())){
             throw new RemoteServiceException("父级部门不可以是自己或者自己的下级部门");
         }
-        adminWebsit.setType(parent.getType());
-        adminWebsitService.saveOrUpdate(adminWebsit);
-        //workWechatLogic.updateOrganization(adminWebsit.getWebsitId(),adminWebsit.getName(),adminWebsit.getParentId(),adminUser.getAdminCompanyWechat());
+        merchantWebsit.setType(parent.getType());
+        merchantWebsitService.saveOrUpdate(merchantWebsit);
+        //workWechatLogic.updateOrganization(merchantWebsit.getWebsitId(),merchantWebsit.getName(),merchantWebsit.getParentId(),adminUser.getAdminCompanyWechat());
     }
 
     /**
@@ -159,11 +159,11 @@ public class AdminWebsitLogic {
      */
     @Transactional
     public void delete(String websitId,HttpServletRequest request) throws WxErrorException {
-        AdminWebsit old = adminWebsitService.getById(websitId);
+        MerchantWebsit old = merchantWebsitService.getById(websitId);
         if(Constant.SYS_WEBSIT_NAME.contains(old.getName())){
             throw new RemoteServiceException("不可操作当前部门信息");
         }
-        Long count = adminWebsitService.lambdaQuery().eq(AdminWebsit::getParentId, websitId).count();
+        Long count = merchantWebsitService.lambdaQuery().eq(MerchantWebsit::getParentId, websitId).count();
         if(count > 0){
             throw new RemoteServiceException("当前部门存在子级，删除失败");
         }
@@ -173,15 +173,15 @@ public class AdminWebsitLogic {
         }
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         //递归删除
-        List<AdminWebsit> list = new ArrayList<>();
+        List<MerchantWebsit> list = new ArrayList<>();
         list.addAll(commonLogic.queryAllChild(list,websitId));
-        List<String> ids = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
+        List<String> ids = list.stream().map(MerchantWebsit::getWebsitId).collect(Collectors.toList());
         ids.add(websitId);
         if(ids.size() > 0) {
 //            for(String idd : ids){
 //                workWechatLogic.deleteOrganization(idd,adminUser.getAdminCompanyWechat());
 //            }
-            adminWebsitService.lambdaUpdate().in(AdminWebsit::getWebsitId, ids).remove();
+            merchantWebsitService.lambdaUpdate().in(MerchantWebsit::getWebsitId, ids).remove();
         }
     }
 
@@ -189,9 +189,9 @@ public class AdminWebsitLogic {
      * 详情
      * @param id
      */
-    public AdminWebsit detail(String id){
-        AdminWebsit adminWebsit = adminWebsitService.getById(id);
-        return adminWebsit;
+    public MerchantWebsit detail(String id){
+        MerchantWebsit merchantWebsit = merchantWebsitService.getById(id);
+        return merchantWebsit;
     }
 
     /**
@@ -200,17 +200,17 @@ public class AdminWebsitLogic {
      * @param parentId
      * @return
      */
-    private List<AdminWebsitTree> treeModule(List<AdminWebsitTree> list, String parentId){
+    private List<MerchantWebsitTree> treeModule(List<MerchantWebsitTree> list, String parentId){
         //最父级资源树
         if(parentId == null || parentId.equals("0")) {
             return null;
         }
-        List<AdminWebsitTree> collect = list.stream()
+        List<MerchantWebsitTree> collect = list.stream()
                 .filter(e -> e.getParentId().equals(parentId)).collect(Collectors.toList());
         if(collect.size() == 0){
             return null;
         }
-        for(AdminWebsitTree bean : collect){
+        for(MerchantWebsitTree bean : collect){
             bean.setChildren(this.treeModule(list, bean.getWebsitId()));
         }
         return collect;
@@ -220,35 +220,35 @@ public class AdminWebsitLogic {
 
     /**
      * 保存部门的服务区域
-     * @param adminWebsitRegions
+     * @param merchantWebsitRegions
      */
     @Transactional
-    public void saveRegion(List<AdminWebsitRegion> adminWebsitRegions){
-        List<String> adminWebsitIds = adminWebsitRegions.stream().map(AdminWebsitRegion::getAdminWebsitId).distinct().collect(Collectors.toList());
+    public void saveRegion(List<MerchantWebsitRegion> merchantWebsitRegions){
+        List<String> adminWebsitIds = merchantWebsitRegions.stream().map(MerchantWebsitRegion::getAdminWebsitId).distinct().collect(Collectors.toList());
         if(adminWebsitIds.size() != 1){
             throw new RemoteServiceException("参数异常，请检查所有部门id是否一致");
         }
-//        if(adminWebsitRegions.size() > 1){
+//        if(merchantWebsitRegions.size() > 1){
 //            throw new RemoteServiceException("暂只支持1个个保存");
 //        }
-        for(AdminWebsitRegion adminWebsitRegion : adminWebsitRegions) {
+        for(MerchantWebsitRegion merchantWebsitRegion : merchantWebsitRegions) {
             Long count = adminWebsitRegionService.lambdaQuery()
-                    .eq(AdminWebsitRegion::getAdminWebsitId, adminWebsitRegion.getAdminWebsitId())
-                    .eq(AdminWebsitRegion::getServiceCategoryId, adminWebsitRegion.getServiceCategoryId())
-                    .eq(AdminWebsitRegion::getProvinceId, adminWebsitRegion.getProvinceId())
-                    .eq(AdminWebsitRegion::getCityId, adminWebsitRegion.getCityId())
-                    .eq(AdminWebsitRegion::getAreaId, adminWebsitRegion.getAreaId())
-                    .eq(AdminWebsitRegion::getStreetId, adminWebsitRegion.getStreetId())
+                    .eq(MerchantWebsitRegion::getAdminWebsitId, merchantWebsitRegion.getAdminWebsitId())
+                    .eq(MerchantWebsitRegion::getServiceCategoryId, merchantWebsitRegion.getServiceCategoryId())
+                    .eq(MerchantWebsitRegion::getProvinceId, merchantWebsitRegion.getProvinceId())
+                    .eq(MerchantWebsitRegion::getCityId, merchantWebsitRegion.getCityId())
+                    .eq(MerchantWebsitRegion::getAreaId, merchantWebsitRegion.getAreaId())
+                    .eq(MerchantWebsitRegion::getStreetId, merchantWebsitRegion.getStreetId())
                     .count();
-            String pcas = adminWebsitRegion.getProvince() + adminWebsitRegion.getCity() + adminWebsitRegion.getArea() + adminWebsitRegion.getStreet();
+            String pcas = merchantWebsitRegion.getProvince() + merchantWebsitRegion.getCity() + merchantWebsitRegion.getArea() + merchantWebsitRegion.getStreet();
             if (count > 0) {
                 throw new RemoteServiceException(pcas + "已存在，请勿重复添加");
             }
-            adminWebsitRegion.setPcas(pcas);
-            adminWebsitRegionService.save(adminWebsitRegion);
+            merchantWebsitRegion.setPcas(pcas);
+            adminWebsitRegionService.save(merchantWebsitRegion);
         }
         //刷新服务商的服务类目冗余字段
-        reloadServiceCategoryName(adminWebsitRegions.get(0).getAdminWebsitId());
+        reloadServiceCategoryName(merchantWebsitRegions.get(0).getAdminWebsitId());
     }
 
     /**
@@ -256,11 +256,11 @@ public class AdminWebsitLogic {
      * @param adminWebsitId
      * @return
      */
-    public List<AdminWebsitRegion> listRegion(String adminWebsitId,String keyword,String serviceCategoryId){
-        List<AdminWebsitRegion> list = adminWebsitRegionService.lambdaQuery()
-                .like(StringUtils.isNotBlank(keyword),AdminWebsitRegion::getPcas,keyword)
-                .eq(StringUtils.isNotBlank(serviceCategoryId),AdminWebsitRegion::getServiceCategoryId,serviceCategoryId)
-                .eq(AdminWebsitRegion::getAdminWebsitId, adminWebsitId).list();
+    public List<MerchantWebsitRegion> listRegion(String adminWebsitId, String keyword, String serviceCategoryId){
+        List<MerchantWebsitRegion> list = adminWebsitRegionService.lambdaQuery()
+                .like(StringUtils.isNotBlank(keyword), MerchantWebsitRegion::getPcas,keyword)
+                .eq(StringUtils.isNotBlank(serviceCategoryId), MerchantWebsitRegion::getServiceCategoryId,serviceCategoryId)
+                .eq(MerchantWebsitRegion::getAdminWebsitId, adminWebsitId).list();
         return list;
     }
 
@@ -268,10 +268,10 @@ public class AdminWebsitLogic {
      * 删除服务区域
      */
     public void deleteRegion(String id){
-        AdminWebsitRegion adminWebsitRegion = adminWebsitRegionService.getById(id);
+        MerchantWebsitRegion merchantWebsitRegion = adminWebsitRegionService.getById(id);
         adminWebsitRegionService.removeById(id);
         //刷新服务商的服务类目冗余字段
-        reloadServiceCategoryName(adminWebsitRegion.getAdminWebsitId());
+        reloadServiceCategoryName(merchantWebsitRegion.getAdminWebsitId());
     }
 
 
@@ -281,9 +281,9 @@ public class AdminWebsitLogic {
      * @return
      */
     public void reloadServiceCategoryName(String adminWebsitId){
-        String serviceCategoryName = adminWebsitRegionService.lambdaQuery().eq(AdminWebsitRegion::getAdminWebsitId, adminWebsitId)
+        String serviceCategoryName = adminWebsitRegionService.lambdaQuery().eq(MerchantWebsitRegion::getAdminWebsitId, adminWebsitId)
                 .list().stream()
-                .map(AdminWebsitRegion::getServiceCategoryName)
+                .map(MerchantWebsitRegion::getServiceCategoryName)
                 .distinct()
                 .collect(Collectors.joining());
 

src/main/java/com/gree/mall/contest/logic/common/CommonLogic.java

@@ -54,6 +54,7 @@ public class CommonLogic {
     private final AdminCompanyWechatService adminCompanyWechatService;
     private final AdminMapper adminMapper;
     private final AdminWebsitService adminWebsitService;
+    private final MerchantWebsitService merchantWebsitService;
     private final AdminWebsitRegionService adminWebsitRegionService;
     private final UserService userService;
     private final OSSUtil ossUtil;
@@ -162,21 +163,21 @@ public class CommonLogic {
      * 部门帐号
      */
     public AdminUserCom websitAccount(AdminUserCom adminUserCom, HttpServletRequest request) {
-        AdminWebsit adminWebsit = adminWebsitService.getById(adminUserCom.getAdminWebsitId());
-        adminUserCom.setAdminWebsit(adminWebsit);
+        MerchantWebsit merchantWebsit = merchantWebsitService.getById(adminUserCom.getAdminWebsitId());
+        adminUserCom.setMerchantWebsit(merchantWebsit);
         //非平台账号
         if (!adminUserCom.getUserName().equals("admin")) {
-            List<AdminWebsit> list = new ArrayList<>();
+            List<MerchantWebsit> list = new ArrayList<>();
             list.addAll(this.queryAllChild(list, adminUserCom.getAdminWebsitId()));
-            List<String> websitIds = list.stream().map(AdminWebsit::getWebsitId).distinct().collect(Collectors.toList());
+            List<String> websitIds = list.stream().map(MerchantWebsit::getWebsitId).distinct().collect(Collectors.toList());
             websitIds.add(adminUserCom.getAdminWebsitId());
             adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList()));
 
             //平台业务员的区id
             if (StringUtils.equals(adminUserCom.getType(), RoleTypeEnum.A.getCode())) {
                 //区域id
-                List<AdminWebsitRegion> adminWebsitRegions = adminWebsitRegionService.lambdaQuery().in(AdminWebsitRegion::getAdminWebsitId, adminUserCom.getAdminWebsitIds()).list();
-                adminUserCom.setAreaIds(adminWebsitRegions.stream().map(AdminWebsitRegion::getAreaId).distinct().collect(Collectors.toList()));
+                List<MerchantWebsitRegion> merchantWebsitRegions = adminWebsitRegionService.lambdaQuery().in(MerchantWebsitRegion::getAdminWebsitId, adminUserCom.getAdminWebsitIds()).list();
+                adminUserCom.setAreaIds(merchantWebsitRegions.stream().map(MerchantWebsitRegion::getAreaId).distinct().collect(Collectors.toList()));
             }
 
         }
@@ -194,18 +195,18 @@ public class CommonLogic {
     /**
      * 递归查询所有数据
      */
-    public List<AdminWebsit> queryAllChild(List<AdminWebsit> list, String id) {
+    public List<MerchantWebsit> queryAllChild(List<MerchantWebsit> list, String id) {
         if (id == null || id.equals("0")) {
             return list;
         }
-        List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery().eq(AdminWebsit::getParentId, id).list();
-        if (adminWebsits.size() == 0) {
+        List<MerchantWebsit> merchantWebsits = merchantWebsitService.lambdaQuery().eq(MerchantWebsit::getParentId, id).list();
+        if (merchantWebsits.size() == 0) {
             return list;
         }
-        for (AdminWebsit adminWebsit : adminWebsits) {
-            this.queryAllChild(list, adminWebsit.getWebsitId());
+        for (MerchantWebsit merchantWebsit : merchantWebsits) {
+            this.queryAllChild(list, merchantWebsit.getWebsitId());
         }
-        list.addAll(adminWebsits);
+        list.addAll(merchantWebsits);
         return list;
     }
 

src/main/java/com/gree/mall/contest/logic/merchant/MerchantLogic.java

@@ -147,7 +147,7 @@ public class MerchantLogic {
         types.add("C");
         types.add("E");
 
-        String providerId = types.contains(adminUser.getAdminWebsit().getType()) ? null : adminUser.getServiceProviderId();
+        String providerId = types.contains(adminUser.getMerchantWebsit().getType()) ? null : adminUser.getServiceProviderId();
         IPage<MerchantRegionVO> page = commonMapper.listMerchantRegion(zfireParamBean.page(),
                 zfireParamBean, providerId);
         return page;
@@ -186,26 +186,26 @@ public class MerchantLogic {
 //            throw new RemoteServiceException("负责人手机号已存在，请更换");
 //        }
         //生成部门
-        AdminWebsit adminWebsit = new AdminWebsit();
-        adminWebsit.setWebsitId(merchantAddBean.getId());
-        adminWebsit.setName(merchantAddBean.getName());
-        adminWebsit.setParentId(Constant.SERVICE_PROVIDER.PARENT_WEBSIT_ID);
-        adminWebsit.setType(RoleTypeEnum.B.getCode());
-        adminWebsit.insert();
+        MerchantWebsit merchantWebsit = new MerchantWebsit();
+        merchantWebsit.setWebsitId(merchantAddBean.getId());
+        merchantWebsit.setName(merchantAddBean.getName());
+        merchantWebsit.setParentId(Constant.SERVICE_PROVIDER.PARENT_WEBSIT_ID);
+        merchantWebsit.setType(RoleTypeEnum.B.getCode());
+        merchantWebsit.insert();
         //生成账号
         AdminUser adminUser = new AdminUser();
         adminUser.setUserName(merchantAddBean.getChargeMobile());
         adminUser.setNickName(merchantAddBean.getName());
         adminUser.setRoleId(adminRole.getAdminRoleId());
         adminUser.setRoleName(adminRole.getName());
-        adminUser.setType(adminWebsit.getType());
+        adminUser.setType(merchantWebsit.getType());
         adminUser.setUserName(merchantAddBean.getId());
         adminUser.setPassword(MD5Utils.md5("123456"));
-        adminUser.setAdminWebsitId(adminWebsit.getWebsitId());
+        adminUser.setAdminWebsitId(merchantWebsit.getWebsitId());
         adminUser.setLinkName(merchantAddBean.getChargeName());
         adminUser.setLinkPhone(merchantAddBean.getChargeMobile());
         adminUser.setAddress(merchantAddBean.getAddress());
-        adminUser.setServiceProviderId(adminWebsit.getWebsitId());
+        adminUser.setServiceProviderId(merchantWebsit.getWebsitId());
         adminUser.insert();
 
         return merchantDetail(merchantAddBean.getId());

src/main/java/com/gree/mall/contest/logic/order/OrderLogic.java

@@ -16,7 +16,6 @@ import com.gree.mall.contest.bean.pay.PayDetail;
 import com.gree.mall.contest.bean.user.CurrentCompanyWechat;
 import com.gree.mall.contest.commonmapper.AppMapper;
 import com.gree.mall.contest.commonmapper.CoustomUserCouponMapper;
-import com.gree.mall.contest.commonmapper.CustomWebsitMapper;
 import com.gree.mall.contest.commonmapper.OrderMapper;
 import com.gree.mall.contest.constant.Constant;
 import com.gree.mall.contest.enums.*;
@@ -83,7 +82,6 @@ public class OrderLogic {
     private final OrderRefundService orderRefundService;
     private final UserCouponService userCouponService;
     private final CoustomUserCouponMapper coustomUserCouponMapper;
-    private final CustomWebsitMapper customWebsitMapper;
     private final ExpressInfoService expressInfoService;
     private final OrderRequestService orderRequestService;
     private final UserService userService;

src/main/java/com/gree/mall/contest/logic/user/UserLogic.java

@@ -296,7 +296,7 @@ public class UserLogic {
                         .one();
             }
 
-            user.setWebsitId(adminWebsit.getWebsitId() + "");
+            user.setWebsitId(adminWebsit.getWebsitId());
             user.setWebsitName(adminWebsit.getName());
             if (!isInner) {
                 if (StringUtils.isBlank(user.getWorkUserId())) {

src/main/java/com/gree/mall/contest/logic/user/WorkerLogic.java

@@ -6,10 +6,10 @@ import com.gree.mall.contest.enums.UserTypeEnum;
 import com.gree.mall.contest.exception.RemoteServiceException;
 import com.gree.mall.contest.logic.SMSLogic;
 import com.gree.mall.contest.logic.common.CommonLogic;
-import com.gree.mall.contest.plus.entity.AdminWebsit;
+import com.gree.mall.contest.plus.entity.MerchantWebsit;
 import com.gree.mall.contest.plus.entity.User;
 import com.gree.mall.contest.plus.entity.UserServiceApply;
-import com.gree.mall.contest.plus.service.AdminWebsitService;
+import com.gree.mall.contest.plus.service.MerchantWebsitService;
 import com.gree.mall.contest.plus.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +28,7 @@ public class WorkerLogic {
     private final SMSLogic smsLogic;
     private final CommonLogic commonLogic;
     private final UserService userService;
-    private final AdminWebsitService adminWebsitService;
+    private final MerchantWebsitService merchantWebsitService;
 
     public void sendSms(String phone, String key, String vrifyCode, HttpServletRequest request) throws Exception {
         if (!this.isPhoneLegal(phone)) {
@@ -86,11 +86,11 @@ public class WorkerLogic {
 
     }
 
-    public List<AdminWebsit> websitList(HttpServletRequest request) {
+    public List<MerchantWebsit> websitList(HttpServletRequest request) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-        final List<AdminWebsit> websitList = adminWebsitService.lambdaQuery()
-                .eq(AdminWebsit::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
-                .orderByAsc(AdminWebsit::getCreateTime)
+        final List<MerchantWebsit> websitList = merchantWebsitService.lambdaQuery()
+                .eq(MerchantWebsit::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
+                .orderByAsc(MerchantWebsit::getCreateTime)
                 .list();
 
         return websitList;

src/main/java/com/gree/mall/contest/logic/websit/WebsitLogic.java

@@ -8,8 +8,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -17,7 +15,7 @@ public class WebsitLogic {
 
     private final AdminWebsitService adminWebsitService;
 
-    public IPage<AdminWebsit> list(HttpServletRequest request, Integer pageNo, Integer pageSize) {
+    public IPage<AdminWebsit> list(Integer pageNo, Integer pageSize) {
         return adminWebsitService.lambdaQuery()
                 .page(new Page<>(pageNo, pageSize));
     }