部门管理

src/main/java/com/gree/mall/manager/bean/admin/AdminDeptTree.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminDept;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminDeptTree extends AdminDept {
+
+    @ApiModelProperty(value = "是否网点")
+    private Boolean isWebsit = false;
+
+    @ApiModelProperty("children")
+    private List<AdminDeptTree> children;
+
+}

src/main/java/com/gree/mall/manager/bean/admin/AdminDeptWebsitVO.java

@@ -0,0 +1,52 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+public class AdminDeptWebsitVO {
+
+
+    @ZfireField(hide = true)
+    @TableId(value = "admin_dept_websit_id", type = IdType.ID_WORKER_STR)
+    private String adminDeptWebsitId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "部门id")
+    private String adminDeptId;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+//    @ZfireField(hide = true)
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+}

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

@@ -2,28 +2,32 @@ package com.gree.mall.manager.bean.admin;
 
 import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
 import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class AdminUserCom extends AdminUser {
 
-    @ApiModelProperty("部门id")
+    @ApiModelProperty("商家id")
     private List<String> adminWebsitIds;
+    @ApiModelProperty("部门id")
+    private List<String> adminDeptIds;
     @ApiModelProperty("只读帐号")
     private Boolean onlyRead = false;
-    @ApiModelProperty("企业微信id")
+    @ApiModelProperty("商户id")
     private List<String> companyWechatIds;
-    @ApiModelProperty("企微id")
-    private List<String> corpIds;
-    @ApiModelProperty("企业微信id")
-    private String corpId;
     @ApiModelProperty("当前登录人企业微信id")
     private String loginCompanyWechatId;
     @ApiModelProperty("当前登录人企业名称")
     private String loginCompanyName;
-    @ApiModelProperty("当前登录人所使用的企业微信配置")
+    @ApiModelProperty("当前登录人所使用的商户配置")
     private AdminCompanyWechat adminCompanyWechat;
+    @ApiModelProperty("商家")
+    private AdminWebsit adminWebsit;
+
 }

src/main/java/com/gree/mall/manager/commonmapper/AdminMapper.java

@@ -3,11 +3,16 @@ package com.gree.mall.manager.commonmapper;
 import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
 import com.gree.mall.manager.bean.admin.respDto.AdminCompanyWechatRespPageBean;
 import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
 import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.mapping.StatementType;
 
 import java.util.List;
 
@@ -50,4 +55,13 @@ public interface AdminMapper {
                                                          @Param("email") String email,
                                                          @Param("status") Boolean status);
 
+    @SqlParser(filter = true)
+    IPage<AdminDeptWebsitVO> list(Page page, @Param("ex") ZfireParamBean zfireParam);
+
+    @Select({ "call batch_update_company_wechat_name("
+            + "#{companyWechatId,mode=IN,jdbcType=VARCHAR},"
+            + "#{companyWechatName,mode=IN,jdbcType=VARCHAR})"
+    })
+    @Options(statementType = StatementType.CALLABLE)
+    void batchUpdateCompanyWechatName(String companyWechatId, String companyWechatName);
 }

src/main/java/com/gree/mall/manager/commonmapper/EnterpriseWechatWorkerLogicMapper.java

@@ -12,7 +12,7 @@ public interface EnterpriseWechatWorkerLogicMapper {
     /**
      * 企微导出信息list
      */
-    List<EnterpriseWechatWorkerImportList> list(@Param("mainDepartmentIds") List<Long> ids,
+    List<EnterpriseWechatWorkerImportList> list(@Param("mainDepartmentIds") List<String> ids,
                                                 @Param("keyword") String keyword, @Param("corpIds") List<String> corpIds,
                                                 @Param("corpId") String corpId);
 

src/main/java/com/gree/mall/manager/config/NumericIdGeneratorConfig.java

@@ -0,0 +1,152 @@
+package com.gree.mall.manager.config;
+
+import com.gree.mall.manager.constant.Constant;
+import com.gree.mall.manager.utils.RedisUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.redis.util.RedisLockRegistry;
+
+import java.time.Instant;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+@Configuration
+public class NumericIdGeneratorConfig {
+
+    @Value("${machine.generator.short.id}")
+    private int machineId;
+
+    @Autowired
+    private RedisLockRegistry redisLockRegistry;
+
+    @Autowired
+    private RedisUtil redisUtil;
+
+    public static final long INITIAL_EPOCH = 1704067200000L; // 默认纪元2024-01-01
+
+    @Bean
+    public RedisEpochIdGenerator redisEpochIdGenerator() {
+        return new RedisEpochIdGenerator(machineId);
+    }
+
+    public class RedisEpochIdGenerator {
+        private final int machineId;
+        private long currentEpoch;
+        private long sequence = 0L;
+        private long lastTimestamp = -1L;
+
+        // 位分配（总39位）
+        private static final int TIMESTAMP_BITS = 26; // 26位时间戳（约2.7年）
+        private static final int MACHINE_BITS = 3;    // 3位机器ID（0-7）
+        private static final int SEQUENCE_BITS = 10;  // 10位序列号
+
+        private final int maxMachineId = (1 << MACHINE_BITS) - 1;
+        private final long maxSequence = (1L << SEQUENCE_BITS) - 1;
+
+        public RedisEpochIdGenerator(int machineId) {
+            if (machineId > maxMachineId) {
+                throw new IllegalArgumentException("机器ID超过最大值 " + maxMachineId);
+            }
+            this.machineId = machineId;
+            initializeEpoch();
+        }
+
+        private void initializeEpoch() {
+            Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.EPOCH_LOCK_KEY);
+            try {
+                if (obtain.tryLock(10, TimeUnit.SECONDS)) {
+                    Object objStr = redisUtil.get(Constant.RedisPrefix.EPOCH_KEY);
+                    String epochStr = Objects.nonNull(objStr) ? objStr.toString() : null;
+                    if (epochStr == null) {
+                        // Redis数据丢失，重新初始化
+                        long newEpoch = calculateNewEpoch();
+                        redisUtil.set(Constant.RedisPrefix.EPOCH_KEY, String.valueOf(newEpoch));
+                        currentEpoch = newEpoch;
+                    } else {
+                        currentEpoch = Long.parseLong(epochStr);
+                    }
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException("初始化纪元锁中断", e);
+            } finally {
+                if (Objects.nonNull(obtain)) {
+                    obtain.unlock();
+                }
+            }
+        }
+
+        private long calculateNewEpoch() {
+            // 如果Redis中找不到纪元，使用当前时间或默认初始纪元
+            Object objStr = redisUtil.get(Constant.RedisPrefix.EPOCH_KEY);
+            String backupEpoch = Objects.nonNull(objStr) ? objStr.toString() : null;
+            return backupEpoch != null ? Long.parseLong(backupEpoch) :
+                    Math.max(Instant.now().toEpochMilli(), INITIAL_EPOCH);
+        }
+
+        public synchronized long nextId() {
+            long timestamp = Instant.now().toEpochMilli();
+            checkAndUpdateEpoch(timestamp);
+
+            if (timestamp < lastTimestamp) {
+                throw new RuntimeException("时钟回拨 " + (lastTimestamp - timestamp) + "ms");
+            }
+
+            if (timestamp == lastTimestamp) {
+                sequence = (sequence + 1) & maxSequence;
+                if (sequence == 0) {
+                    timestamp = tilNextMillis(lastTimestamp);
+                }
+            } else {
+                sequence = 0;
+            }
+
+            lastTimestamp = timestamp;
+            long adjustedTimestamp = timestamp - currentEpoch;
+
+            return (adjustedTimestamp << (MACHINE_BITS + SEQUENCE_BITS))
+                    | (machineId << SEQUENCE_BITS)
+                    | sequence;
+        }
+
+        private void checkAndUpdateEpoch(long timestamp) {
+            long timeSinceEpoch = timestamp - currentEpoch;
+            if (timeSinceEpoch >= (1L << TIMESTAMP_BITS)) {
+                Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.EPOCH_LOCK_KEY);
+                try {
+                    if (obtain.tryLock(10, TimeUnit.SECONDS)) {
+                        // 双重检查锁
+                        Object objStr = redisUtil.get(Constant.RedisPrefix.EPOCH_KEY);
+                        String strEpoch = Objects.nonNull(objStr) ? objStr.toString() : null;
+                        System.out.println("锁epoch: " + strEpoch);
+                        long currentEpochNow = Long.parseLong(strEpoch);
+                        if (timestamp - currentEpochNow >= (1L << TIMESTAMP_BITS)) {
+                            long newEpoch = timestamp;
+                            redisUtil.set(Constant.RedisPrefix.EPOCH_KEY, String.valueOf(newEpoch));
+                            currentEpoch = newEpoch;
+                        }
+                    }
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    throw new RuntimeException("纪元更新锁中断", e);
+                } finally {
+                    if (Objects.nonNull(obtain)) {
+                        obtain.unlock();
+                    }
+                }
+            }
+        }
+
+        private long tilNextMillis(long lastTimestamp) {
+            long timestamp = Instant.now().toEpochMilli();
+            while (timestamp <= lastTimestamp) {
+                timestamp = Instant.now().toEpochMilli();
+            }
+            return timestamp;
+        }
+    }
+}

src/main/java/com/gree/mall/manager/constant/Constant.java

@@ -44,6 +44,8 @@ public class Constant {
         public final static String CHAT_MESSAGE_SEQ_KEY = "new:CHAT_MESSAGE_SEQ";
         public final static String LOCK_EXCHANGE_CODE = "new:mall:lock:exchangecode";
 
+        public final static String EPOCH_KEY = "new:mall:id:generator:epoch";
+        public final static String EPOCH_LOCK_KEY = "new:mall:id:generator:epoch:lock";
     }
     public class ChatMessage {
         public final static String MSG_TYPE_DOC = "docmsg";

src/main/java/com/gree/mall/manager/controller/admin/AdminDeptController.java

@@ -0,0 +1,158 @@
+package com.gree.mall.manager.controller.admin;
+
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.admin.AdminDeptTree;
+import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.admin.AdminDeptLogic;
+import com.gree.mall.manager.plus.entity.AdminDept;
+import com.gree.mall.manager.plus.entity.AdminDeptWebsit;
+import com.gree.mall.manager.utils.excel.ExcelUtils;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api(value = "部门级别api", tags = {"部门级别api"})
+@RequestMapping(value = "/admin/dept", produces = "application/json; charset=utf-8")
+public class AdminDeptController {
+
+    @Resource
+    AdminDeptLogic adminDeptLogic;
+
+
+    @GetMapping("/tree")
+    @ApiOperation("部门树")
+    public ResponseHelper<AdminDeptTree> tree(HttpServletRequest request) {
+        List<AdminDeptTree> tree = adminDeptLogic.tree(request);
+        return ResponseHelper.success(tree);
+    }
+
+//    @GetMapping("/treeWebsit")
+//    @ApiOperation("部门树合并网点")
+//    public ResponseHelper<AdminDeptTree> treeWebsit(HttpServletRequest request) {
+//        List<AdminDeptTree> tree = adminDeptLogic.treeWebsit(request);
+//        return ResponseHelper.success(tree);
+//    }
+
+
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "部门列表")
+    public ResponseHelper<IPage<AdminDeptWebsitVO>> list(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<AdminDeptWebsitVO> adminDeptVOIPage = adminDeptLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(adminDeptVOIPage, new TypeReference<AdminDeptWebsitVO>() {});
+    }
+
+    @PostMapping("/list/export")
+    @ApiOperation(value = "部门列表导出")
+    public void listExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<AdminDeptWebsitVO> adminDeptVOIPage = adminDeptLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(adminDeptVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+
+    @PostMapping("/add")
+    @ApiOperation("添加部门")
+    public ResponseHelper add(
+            @RequestBody AdminDept adminDept,
+            HttpServletRequest request
+    ) throws ParseException {
+        adminDeptLogic.add(adminDept);
+        return ResponseHelper.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("修改部门")
+    public ResponseHelper update(
+            @RequestBody AdminDept adminDept,
+            HttpServletRequest request
+    ) throws ParseException {
+        adminDeptLogic.update(adminDept);
+        return ResponseHelper.success();
+    }
+
+    @PostMapping("/del")
+    @ApiOperation("删除部门")
+    public ResponseHelper update(
+            @ApiParam(value = "部门id" , required = true) @RequestParam(required = true) String adminDeptId,
+            HttpServletRequest request
+    ) throws ParseException {
+        adminDeptLogic.del(adminDeptId);
+        return ResponseHelper.success();
+    }
+
+    @PostMapping("/addWebsit")
+    @ApiOperation("添加部门商家")
+    public ResponseHelper addWebsit(
+            @ApiParam(value = "部门id" , required = true) @RequestParam(required = true) String adminDeptId,
+            @ApiParam(value = "网点" , required = true) @RequestParam(required = true) List<String> websitIds,
+            HttpServletRequest request
+    ) throws ParseException {
+        adminDeptLogic.addWebsit(adminDeptId,websitIds);
+        return ResponseHelper.success();
+    }
+
+//    @PostMapping("/updateWebsit")
+//    @ApiOperation("修改部门商家")
+//    public ResponseHelper updateWebsit(
+//            @RequestBody AdminDeptWebsit adminDeptWebsit,
+//            HttpServletRequest request
+//    ) throws ParseException {
+//        adminDeptLogic.updateWebsit(adminDeptWebsit);
+//        return ResponseHelper.success();
+//    }
+
+    @PostMapping("/delWebsit")
+    @ApiOperation("删除部门商家")
+    public ResponseHelper delWebsit(
+            @ApiParam(value = "部门网点id" , required = true) @RequestParam(required = true) String adminDeptWebsitId,
+            HttpServletRequest request
+    ) throws ParseException {
+        adminDeptLogic.delWebsit(adminDeptWebsitId);
+        return ResponseHelper.success();
+    }
+
+
+
+    @PostMapping("/import")
+    @ApiOperation("导入部门商家 附件(部门商家导入.xlsx)")
+    public ResponseHelper importData(
+            @RequestPart("file") MultipartFile file
+    ) throws IOException {
+        List<Object> objects = ExcelUtils.importExcel(file);
+        adminDeptLogic.importData(objects);
+        return ResponseHelper.success();
+    }
+
+
+}

src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -58,7 +58,7 @@ public class AdminWebsitController {
 
     @PostMapping("/delete")
     @ApiOperation("删除部门")
-    public ResponseHelper delete(@RequestParam Long id, HttpServletRequest request) throws WxErrorException {
+    public ResponseHelper delete(@RequestParam String id, HttpServletRequest request) throws WxErrorException {
         adminWebsitLogic.delete(id,request);
         return ResponseHelper.success();
     }

src/main/java/com/gree/mall/manager/controller/admin/ew/EnterpriseWechatWorkerController.java

@@ -43,7 +43,7 @@ public class EnterpriseWechatWorkerController {
     public ResponseHelper<IPage<EnterpriseWechatWorker>> list(
            @ApiParam(value = "keyword",required = false) @RequestParam(required = false) String keyword,
            @ApiParam(value = "网点主键",required = false) @RequestParam(required = false) String adminWebsitId,
-           @ApiParam(value = "网点id",required = false) @RequestParam(required = false) Long websitId,
+           @ApiParam(value = "网点id",required = false) @RequestParam(required = false) String websitId,
            @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNo,
            @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize,
            HttpServletRequest request
@@ -129,7 +129,7 @@ public class EnterpriseWechatWorkerController {
     public void exportData(
             @ApiParam(value = "keyword",required = false) @RequestParam(required = false) String keyword,
             @ApiParam(value = "网点主键",required = false) @RequestParam(required = false) String adminWebsitId,
-            @ApiParam(value = "网点id",required = false) @RequestParam(required = false) Long websitId,
+            @ApiParam(value = "网点id",required = false) @RequestParam(required = false) String websitId,
             HttpServletRequest request,
             HttpServletResponse response
     ) throws Exception {

src/main/java/com/gree/mall/manager/controller/common/CommonController.java

@@ -1,6 +1,8 @@
 package com.gree.mall.manager.controller.common;
 
 import com.gree.mall.manager.annotation.ApiNotAuth;
+import com.gree.mall.manager.config.NumericIdGeneratorConfig;
+import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.ExpressLogic;
@@ -13,6 +15,7 @@ import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.EnterpriseWechatWorkerService;
 import com.gree.mall.manager.plus.service.OrderDetailService;
 import com.gree.mall.manager.plus.service.OrderInfoService;
+import com.gree.mall.manager.utils.RedisUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,8 +28,10 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -53,7 +58,6 @@ public class CommonController {
 
 
 
-
     @PostMapping("/upload")
     @ApiOperation(value = "文件上传")
     public ResponseHelper<CommonFile> upload(
@@ -128,29 +132,6 @@ public class CommonController {
         return ResponseHelper.success(s);
     }
 
-
-//    @GetMapping("/test2")
-//    @ApiOperation(value = "本地成员同步到企业微信")
-//    public ResponseHelper test2() throws Exception {
-//        //本地的
-//        List<EnterpriseWechatWorker20220311> local = enterpriseWechatWorker20220311Service.list();
-//        //企微的
-//        List<EnterpriseWechatWorker> remote = enterpriseWechatWorkerService.list();
-//        List<String> remoteList = remote.stream().map(EnterpriseWechatWorker::getWechatUserId).collect(Collectors.toList());
-//        for(EnterpriseWechatWorker20220311 enterpriseWechatWorker : local){
-//            //存在则不处理
-//            if(remoteList.contains(enterpriseWechatWorker.getWechatUserId())){
-//                continue;
-//            }
-//            //不存在则同步到企业微信
-//            workWechatLogic.addWorkUser(enterpriseWechatWorker.getWechatUserId(),enterpriseWechatWorker.getName(),enterpriseWechatWorker.getMobile(),
-//                    enterpriseWechatWorker.getGender(),enterpriseWechatWorker.getEmail(),
-//                    Long.parseLong(enterpriseWechatWorker.getMainDepartment()),enterpriseWechatWorker.getPosition());
-//        }
-//        return ResponseHelper.success();
-//    }
-
-
     @ApiNotAuth
     @GetMapping("/external/last")
     @ApiOperation(value = "获取最新的客户信息")
@@ -183,5 +164,4 @@ public class CommonController {
         String file = commonLogic.getFile(key, response);
         response.sendRedirect(file);
     }
-
 }

src/main/java/com/gree/mall/manager/logic/activity/PromotionApplyLogic.java

@@ -41,9 +41,10 @@ public class PromotionApplyLogic {
     public IPage<PromotionApplyBean> list(String nickName,String websitName,Integer pageNum,Integer pageSize){
         AdminUserCom adminUser =commonLogic.getAdminUser();
 
-        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
-                .like(AdminWebsit::getName, websitName).eq(AdminWebsit::getCorpId,adminUser.getCorpId()).list();
-        List<Long> websitIds = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
+        List<AdminWebsit> list = new ArrayList<>();
+//        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
+//                .like(AdminWebsit::getName, websitName).eq(AdminWebsit::getCorpId,adminUser.getCorpId()).list();
+        List<String> websitIds = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
 
         IPage page = promotionApplyService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(websitIds), PromotionApply::getWebsitId, websitIds)
@@ -57,11 +58,11 @@ public class PromotionApplyLogic {
             PromotionApplyBean promotionApplyBean = new PromotionApplyBean();
             BeanUtils.copyProperties(promotionApply,promotionApplyBean);
 
-            AdminWebsit one = adminWebsitService.lambdaQuery().eq(AdminWebsit::getCorpId, adminUser.getCorpId())
-                    .eq(AdminWebsit::getWebsitId, promotionApply.getWebsitId()).one();
-            if(one != null) {
-                promotionApplyBean.setAdminWebsitName(one.getName());
-            }
+//            AdminWebsit one = adminWebsitService.lambdaQuery().eq(AdminWebsit::getCorpId, adminUser.getCorpId())
+//                    .eq(AdminWebsit::getWebsitId, promotionApply.getWebsitId()).one();
+//            if(one != null) {
+//                promotionApplyBean.setAdminWebsitName(one.getName());
+//            }
             datas.add(promotionApplyBean);
         }
         page.setRecords(datas);
@@ -84,9 +85,9 @@ public class PromotionApplyLogic {
         if(count > 0){
             throw new RemoteServiceException("不可给同1个业务员添加多个配置");
         }
-        EnterpriseWechatWorker enterpriseWechatWorker = enterpriseWechatWorkerService.lambdaQuery()
-                .eq(EnterpriseWechatWorker::getWechatUserId, user.getWorkUserId())
-                .eq(EnterpriseWechatWorker::getCorpId,adminUser.getCorpId()).one();
+//        EnterpriseWechatWorker enterpriseWechatWorker = enterpriseWechatWorkerService.lambdaQuery()
+//                .eq(EnterpriseWechatWorker::getWechatUserId, user.getWorkUserId())
+//                .eq(EnterpriseWechatWorker::getCorpId,adminUser.getCorpId()).one();
 
         PromotionApply promotionApply = new PromotionApply();
         promotionApply.setId(id);
@@ -96,9 +97,9 @@ public class PromotionApplyLogic {
         promotionApply.setWorkerName(user.getWorkName());
         promotionApply.setMobile(user.getMobile());
         promotionApply.setType(user.getType());
-        if(enterpriseWechatWorker != null) {
-            promotionApply.setWebsitId(Long.parseLong(enterpriseWechatWorker.getMainDepartment()));
-        }
+//        if(enterpriseWechatWorker != null) {
+//            promotionApply.setWebsitId(Long.parseLong(enterpriseWechatWorker.getMainDepartment()));
+//        }
         promotionApply.setStatus(status);
         promotionApply.setRate(rate);
         promotionApply.setCreateTime(new Date());
@@ -117,11 +118,11 @@ public class PromotionApplyLogic {
         PromotionApply promotionApply = promotionApplyService.getById(id);
         PromotionApplyBean bean = new PromotionApplyBean();
         BeanUtils.copyProperties(promotionApply,bean);
-        AdminWebsit one = adminWebsitService.lambdaQuery().eq(AdminWebsit::getCorpId, adminUser.getCorpId())
-                .eq(AdminWebsit::getWebsitId, promotionApply.getWebsitId()).one();
-        if(one != null) {
-            bean.setAdminWebsitName(one.getName());
-        }
+//        AdminWebsit one = adminWebsitService.lambdaQuery().eq(AdminWebsit::getCorpId, adminUser.getCorpId())
+//                .eq(AdminWebsit::getWebsitId, promotionApply.getWebsitId()).one();
+//        if(one != null) {
+//            bean.setAdminWebsitName(one.getName());
+//        }
         return bean;
     }
 

src/main/java/com/gree/mall/manager/logic/admin/AdminDeptLogic.java

@@ -0,0 +1,317 @@
+package com.gree.mall.manager.logic.admin;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminDeptTree;
+import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.commonmapper.AdminMapper;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.plus.entity.AdminDept;
+import com.gree.mall.manager.plus.entity.AdminDeptWebsit;
+import com.gree.mall.manager.plus.entity.AdminUserDeptRela;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import com.gree.mall.manager.plus.service.AdminDeptService;
+import com.gree.mall.manager.plus.service.AdminDeptWebsitService;
+import com.gree.mall.manager.plus.service.AdminUserDeptRelaService;
+import com.gree.mall.manager.plus.service.AdminWebsitService;
+import com.gree.mall.manager.utils.StringUtil;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AdminDeptLogic {
+
+    private final CommonLogic commonLogic;
+    private final AdminDeptService adminDeptService;
+    private final AdminMapper adminMapper;
+    private final AdminDeptWebsitService adminDeptWebsitService;
+    private final AdminUserDeptRelaService adminUserDeptRelaService;
+    private final AdminWebsitService adminWebsitService;
+
+    public List<AdminDeptTree> tree(HttpServletRequest request) {
+        final AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<AdminDept> list;
+        if (adminUser.getType() == 0) {
+            list = adminDeptService.lambdaQuery()
+                    .eq(AdminDept::getAdminDeptId, "1")
+                    .list();
+        } else {
+            list = adminDeptService.lambdaQuery()
+                    .eq(AdminDept::getCompanyWechatId, adminUser.getLoginCompanyWechatId())
+                    .eq(AdminDept::getPId, "1")
+                    .list();
+        }
+
+        List<AdminDeptTree> trees = new ArrayList<>();
+        for (AdminDept adminDept : list) {
+            AdminDeptTree adminDeptTree = new AdminDeptTree();
+            BeanUtils.copyProperties(adminDept, adminDeptTree);
+            trees.add(adminDeptTree);
+        }
+
+        for (AdminDeptTree adminDeptTree : trees) {
+            adminDeptTree.setChildren(this.treeModule(adminDeptTree.getAdminDeptId()));
+        }
+        return trees;
+    }
+
+    private List<AdminDeptTree> treeModule(String adminDeptId) {
+        //最父级资源树
+        List<AdminDept> collect = adminDeptService.lambdaQuery()
+                .eq(AdminDept::getPId, adminDeptId).list();
+
+        if (collect.size() == 0) {
+            return new ArrayList<>();
+        }
+
+        List<AdminDeptTree> adminDeptTrees = new ArrayList<>();
+
+        for (AdminDept bean : collect) {
+            AdminDeptTree adminDeptTree = new AdminDeptTree();
+            BeanUtils.copyProperties(bean, adminDeptTree);
+            adminDeptTree.setChildren(this.treeModule(adminDeptTree.getAdminDeptId()));
+
+            adminDeptTrees.add(adminDeptTree);
+        }
+        return adminDeptTrees;
+    }
+
+    public IPage<AdminDeptWebsitVO> list(Page page, ZfireParamBean zfireParam) {
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, AdminDeptWebsitVO.class);
+
+        IPage<AdminDeptWebsitVO> adminDeptWebsitVOIPage = adminMapper.list(page, zfireParam);
+        return adminDeptWebsitVOIPage;
+    }
+
+    public void add(AdminDept adminDept) {
+        AdminDept adminDeptServiceById = adminDeptService.getById(adminDept.getPId());
+
+        adminDept.setCompanyWechatId(adminDeptServiceById.getCompanyWechatId());
+        adminDept.setCompanyName(adminDeptServiceById.getCompanyName());
+        adminDept.insert();
+    }
+
+    public void update(AdminDept adminDept) {
+        final AdminDept dept = adminDeptService.getById(adminDept.getAdminDeptId());
+        if (dept.getPId().equals("1") && StringUtils.isNotBlank(dept.getCompanyWechatId())) {
+            throw new RemoteServiceException("商户名称不能变更");
+        }
+        adminDept.updateById();
+
+        adminDeptWebsitService.lambdaUpdate()
+                .eq(AdminDeptWebsit::getAdminDeptId, adminDept.getAdminDeptId())
+                .set(AdminDeptWebsit::getDeptName, adminDept.getDeptName())
+                .update();
+    }
+
+    public void del(String id) {
+        final AdminDept dept = adminDeptService.getById(id);
+        if (dept.getPId().equals("1") && StringUtils.isNotBlank(dept.getCompanyWechatId())) {
+            throw new RemoteServiceException("商户不能删除");
+        }
+
+        if (adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId, id).count() > 0)
+            throw new RemoteServiceException("存在绑定商家");
+
+        if (adminUserDeptRelaService.lambdaQuery().eq(AdminUserDeptRela::getAdminDeptId, id).count() > 0) {
+            throw new RemoteServiceException("存在绑定账号");
+        }
+
+        adminDeptService.removeById(id);
+    }
+
+
+    public void updateWebsit(AdminDeptWebsit adminDeptWebsit) {
+
+        if (adminDeptWebsitService.lambdaQuery()
+                .eq(AdminDeptWebsit::getAdminDeptId, adminDeptWebsit.getAdminDeptId())
+                .eq(AdminDeptWebsit::getWebsitId, adminDeptWebsit.getWebsitId())
+                .count() > 0)
+            return;
+
+        adminDeptWebsit.updateById();
+    }
+
+    public void delWebsit(String adminDeptWebsitId) {
+        AdminDeptWebsit adminDeptWebsit = adminDeptWebsitService.getById(adminDeptWebsitId);
+
+        AdminDept adminDept = adminDeptService.getById(adminDeptWebsit.getAdminDeptId());
+        if (adminDept.getPId().equals("1"))
+            throw new RemoteServiceException("不能删除");
+
+        adminDeptWebsitService.removeById(adminDeptWebsitId);
+    }
+
+    public List<AdminDeptTree> treeWebsit(HttpServletRequest request) {
+
+        AdminUserCom adminUser = commonLogic.getAdminUser(request);
+
+        List<AdminDeptTree> trees = new ArrayList<>();
+        if (adminUser.getType() == 2 || adminUser.getType() == 4) {
+            // 商家账号只返回商家
+            List<AdminWebsit> adminWebsitList = adminWebsitService.lambdaQuery()
+                    .eq(AdminWebsit::getCompanyWechatId, adminUser.getLoginCompanyWechatId())
+                    .in(AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                    .list();
+            if (CollectionUtil.isEmpty(adminWebsitList)) {
+                return trees;
+            }
+            for (AdminWebsit websit : adminWebsitList) {
+                AdminDeptTree deptTree = new AdminDeptTree();
+                deptTree.setIsWebsit(true);
+                deptTree.setCompanyWechatId(websit.getCompanyWechatId());
+                deptTree.setCompanyName(websit.getCompanyName());
+                deptTree.setAdminDeptId(websit.getWebsitId());
+                deptTree.setDeptName(websit.getName());
+                trees.add(deptTree);
+            }
+            return trees;
+        }
+
+        List<AdminDept> list = adminDeptService.lambdaQuery()
+                .eq(AdminDept::getPId, "0")
+                .list();
+
+        for (AdminDept adminDept : list) {
+            AdminDeptTree adminDeptTree = new AdminDeptTree();
+            BeanUtils.copyProperties(adminDept, adminDeptTree);
+            trees.add(adminDeptTree);
+        }
+
+        for (AdminDeptTree adminDeptTree : trees) {
+            adminDeptTree.setChildren(this.treeModule(adminDeptTree.getAdminDeptId()));
+
+            List<AdminDeptTree> children = adminDeptTree.getChildren();
+            for (AdminDeptTree child : children) {
+                List<AdminDeptWebsit> adminDeptWebsits = adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId, child.getAdminDeptId()).list();
+
+                for (AdminDeptWebsit adminDeptWebsit : adminDeptWebsits) {
+                    AdminDeptTree adminDeptTreeWebsit = new AdminDeptTree();
+                    adminDeptTreeWebsit.setIsWebsit(true);
+                    adminDeptTreeWebsit.setAdminDeptId(adminDeptWebsit.getWebsitId());
+                    adminDeptTreeWebsit.setDeptName(adminDeptWebsit.getWebsitName());
+
+                    child.getChildren().add(adminDeptTreeWebsit);
+
+                }
+                AdminWebsit adminWebsit = adminWebsitService.lambdaQuery().eq(AdminWebsit::getName, child.getDeptName()).last("limit 1").one();
+
+                if (adminWebsit != null) {
+                    child.setAdminDeptId(adminWebsit.getWebsitId());
+                    child.setIsWebsit(true);
+                }
+            }
+        }
+
+        return trees;
+    }
+
+    public void addWebsit(String adminDeptId, List<String> websitIds) {
+        AdminDept adminDept = adminDeptService.getById(adminDeptId);
+
+        List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery()
+                .in(AdminWebsit::getWebsitId, websitIds)
+                .list();
+
+        if (adminDept.getPId().equals("1") && StringUtils.isNotBlank(adminDept.getCompanyWechatId())) {
+            final long count = adminWebsits.stream().filter(v -> !v.getCompanyWechatId().equals(adminDept.getCompanyWechatId())).count();
+            if (count > 0) {
+                throw new RemoteServiceException("不同商户的商家不能添加");
+            }
+        }
+
+        for (AdminWebsit adminWebsit : adminWebsits) {
+            AdminDeptWebsit adminDeptWebsit = new AdminDeptWebsit();
+            adminDeptWebsit.setDeptName(adminDept.getDeptName());
+            adminDeptWebsit.setAdminDeptId(adminDept.getAdminDeptId());
+            adminDeptWebsit.setWebsitId(adminWebsit.getWebsitId());
+            adminDeptWebsit.setWebsitName(adminWebsit.getName());
+
+            if (adminDeptWebsitService.lambdaQuery()
+                    .eq(AdminDeptWebsit::getAdminDeptId, adminDeptWebsit.getAdminDeptId())
+                    .eq(AdminDeptWebsit::getWebsitId, adminWebsit.getWebsitId())
+                    .count() > 0)
+                continue;
+
+            adminDeptWebsit.insert();
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void importData(List<Object> datas) {
+
+        int index = 1;
+
+        List<AdminDeptWebsit> adminDeptWebsits = new ArrayList<>();
+
+        List<AdminDept> adminDepts = adminDeptService.lambdaQuery().list();
+        List<AdminWebsit> websitList = adminWebsitService.lambdaQuery().list();
+        final Map<String, AdminWebsit> websitMap = websitList.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
+
+        for (Object o : datas) {
+
+            index++;
+            List<Object> row = (List<Object>) o;
+
+            if (StringUtil.isEmpty((String) row.get(1)))
+                throw new RemoteServiceException("第" + index + "行,部门名称为空");
+
+            List<AdminDept> adminDeptList = adminDepts.stream().filter(item -> item.getDeptName().equals(row.get(1))).collect(Collectors.toList());
+
+
+            if (CollectionUtils.isEmpty(adminDeptList))
+                throw new RemoteServiceException("第" + index + "行,部门名称找不到对应部门");
+
+            for (AdminDept adminDept : adminDeptList) {
+                final AdminWebsit websit = websitMap.get((String) row.get(0));
+                // 不是平台的需要判断商家是否能放入商户下面
+                if (!adminDept.getCompanyWechatId().equals("0")
+                        && !websit.getCompanyWechatId().equals(adminDept.getCompanyWechatId())) {
+                    throw new RemoteServiceException("第" + index + "行, 商家不能添加到到对应部门");
+                }
+                AdminDeptWebsit adminDeptWebsit = new AdminDeptWebsit();
+
+                adminDeptWebsit.setDeptName(adminDept.getDeptName());
+                adminDeptWebsit.setAdminDeptId(adminDept.getAdminDeptId());
+                adminDeptWebsit.setWebsitId((String) row.get(0));
+
+                adminDeptWebsit.setWebsitName(websit.getName());
+
+                adminDeptWebsitService.lambdaUpdate()
+                        .eq(AdminDeptWebsit::getAdminDeptId, adminDept.getAdminDeptId())
+                        .eq(AdminDeptWebsit::getWebsitId, adminDeptWebsit.getWebsitId())
+                        .remove();
+
+                adminDeptWebsits.add(adminDeptWebsit);
+            }
+        }
+
+        adminDeptWebsitService.saveBatch(adminDeptWebsits);
+
+
+    }
+}

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

@@ -59,7 +59,7 @@ public class AdminWebsitLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         List<AdminWebsit> list = adminWebsitService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCorpIds()),AdminWebsit::getCorpId,adminUser.getCorpIds())
+//                .in(CollectionUtils.isNotEmpty(adminUser.getCorpIds()),AdminWebsit::getCorpId,adminUser.getCorpIds())
                 .list();
         List<AdminWebsitTree> trees = new ArrayList<>();
         for(AdminWebsit adminWebsit : list){
@@ -96,9 +96,9 @@ public class AdminWebsitLogic {
         }
 
         //Long aLong = workWechatLogic.addOrganization(adminWebsit.getName(), adminWebsit.getParentId(),adminUser.getAdminCompanyWechat());
-        Long aLong = IdWorker.getId();
+        String aLong = IdWorker.getIdStr();
         adminWebsit.setId(aLong+"");
-        adminWebsit.setCorpId(adminUser.getCorpIds().get(0));
+//        adminWebsit.setCorpId(adminUser.getCorpIds().get(0));
         adminWebsit.setWebsitId(aLong);
         adminWebsit.insert();
 
@@ -136,12 +136,12 @@ public class AdminWebsitLogic {
      * 删除部门
      */
     @Transactional
-    public void delete(Long id,HttpServletRequest request) throws WxErrorException {
+    public void delete(String id,HttpServletRequest request) throws WxErrorException {
 //s        AdminUserCom adminUser = commonLogic.getAdminUser(request);
         //递归删除
         List<AdminWebsit> list = new ArrayList<>();
         list.addAll(this.queryAllChild(list,id));
-        List<Long> ids = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
+        List<String> ids = list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
         ids.add(id);
         if(ids.size() > 0) {
 //            for(Long idd : ids){
@@ -174,8 +174,8 @@ public class AdminWebsitLogic {
     /**
      * 递归查询所有数据
      */
-    public List<AdminWebsit> queryAllChild(List<AdminWebsit> list,Long id){
-        if(id == null || id == 0){
+    public List<AdminWebsit> queryAllChild(List<AdminWebsit> list,String id){
+        if(id == null || id.equals("0")){
             return list;
         }
         List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery().eq(AdminWebsit::getParentId, id).list();
@@ -195,9 +195,9 @@ public class AdminWebsitLogic {
      * @param parentId
      * @return
      */
-    private List<AdminWebsitTree> treeModule(List<AdminWebsitTree> list, Long parentId,String corpId){
+    private List<AdminWebsitTree> treeModule(List<AdminWebsitTree> list, String parentId,String corpId){
         //最父级资源树
-        if(parentId == null || parentId == 0) {
+        if(parentId == null || parentId.equals("0")) {
             return null;
         }
         List<AdminWebsitTree> collect = list.stream()

src/main/java/com/gree/mall/manager/logic/admin/ew/EnterpriseWechatWorkerLogic.java

@@ -59,9 +59,9 @@ public class EnterpriseWechatWorkerLogic {
     /**
      * 企业成员列表
      */
-    public IPage<EnterpriseWechatWorker> list(String keyword, String adminWebsitId, Long websitId, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+    public IPage<EnterpriseWechatWorker> list(String keyword, String adminWebsitId, String websitId, Integer pageNo, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<Long> ids = new ArrayList<>();
+        List<String> ids = new ArrayList<>();
         List<AdminWebsit> list = new ArrayList<>();
 
         String corpId = null;
@@ -78,7 +78,7 @@ public class EnterpriseWechatWorkerLogic {
                 .and(StringUtils.isNotEmpty(keyword), v -> v.like(EnterpriseWechatWorker::getName, keyword)
                         .or().like(EnterpriseWechatWorker::getWechatUserId, keyword)
                         .or().like(EnterpriseWechatWorker::getMobile, keyword))
-                .in(CollectionUtils.isNotEmpty(adminUser.getCorpIds()), EnterpriseWechatWorker::getCorpId, adminUser.getCorpIds())
+//                .in(CollectionUtils.isNotEmpty(adminUser.getCorpIds()), EnterpriseWechatWorker::getCorpId, adminUser.getCorpIds())
                 .eq(corpId != null, EnterpriseWechatWorker::getCorpId, corpId)
                 .orderByDesc(EnterpriseWechatWorker::getCreateTime, EnterpriseWechatWorker::getId)
                 .page(new Page<>(pageNo, pageSize));
@@ -274,7 +274,7 @@ public class EnterpriseWechatWorkerLogic {
         //----------
         List<EnterpriseWechatWorker> list = enterpriseWechatWorkerService.lambdaQuery()
                 .in(EnterpriseWechatWorker::getMobile, phoneList)
-                .eq(EnterpriseWechatWorker::getCorpId, adminUser.getCorpIds().get(0))
+//                .eq(EnterpriseWechatWorker::getCorpId, adminUser.getCorpIds().get(0))
                 .list();
         if (list.size() == 0) {
             throw new RemoteServiceException("无符合删除条件的数据");
@@ -303,7 +303,7 @@ public class EnterpriseWechatWorkerLogic {
 
         enterpriseWechatWorkerService.lambdaUpdate()
                 .set(EnterpriseWechatWorker::getDepartmentName,adminWebsit.getName())
-                .eq(EnterpriseWechatWorker::getCorpId,adminUser.getCorpId())
+//                .eq(EnterpriseWechatWorker::getCorpId,adminUser.getCorpId())
                 .eq(EnterpriseWechatWorker::getMainDepartment,adminWebsit.getWebsitId())
                 .update();
     }
@@ -321,13 +321,14 @@ public class EnterpriseWechatWorkerLogic {
 
         //所有成员
         List<EnterpriseWechatWorker> enterpriseWechatWorkerList = enterpriseWechatWorkerService.lambdaQuery()
-                .eq(EnterpriseWechatWorker::getCorpId, adminUser.getCorpId()).list();
+//                .eq(EnterpriseWechatWorker::getCorpId, adminUser.getCorpId())
+                .list();
         Map<String,EnterpriseWechatWorker> workers = enterpriseWechatWorkerList.stream().collect(Collectors.toMap(EnterpriseWechatWorker::getMobile, v -> v));
         //所有部门
 //        List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery().eq(AdminWebsit::getCorpId, adminUser.getCorpId()).list();
 //        Map<String, AdminWebsit> adminWebsitMap = adminWebsits.stream().collect(Collectors.toMap(AdminWebsit::getName, v -> v));
 
-        AdminWebsit detail = adminWebsitLogic.detail(mainDepartmentId, adminUser.getCorpId());
+//        AdminWebsit detail = adminWebsitLogic.detail(mainDepartmentId, adminUser.getCorpId());
         for (Object o : datas) {
             List<String> row = (List<String>) o;
             CommonUtils.initList(row, 10);
@@ -358,14 +359,14 @@ public class EnterpriseWechatWorkerLogic {
                 worker.setPosition(postion);
                 worker.setEmail(email);
                 worker.setMainDepartment(mainDepartmentId.toString());
-                worker.setDepartmentName(detail.getName());
+//                worker.setDepartmentName(detail.getName());
                 worker.updateById();
                 continue;
             }
 
             Integer count = enterpriseWechatWorkerService.lambdaQuery()
                     .eq(EnterpriseWechatWorker::getWechatUserId, wechatUserId)
-                    .eq(EnterpriseWechatWorker::getCorpId,adminUser.getCorpId())
+//                    .eq(EnterpriseWechatWorker::getCorpId,adminUser.getCorpId())
                     .count();
             if (count > 0) {
                 throw new RemoteServiceException("导入失败,帐号:" + wechatUserId + "已存在,无法导入");
@@ -380,11 +381,11 @@ public class EnterpriseWechatWorkerLogic {
             enterpriseWechatWorker.setPosition(postion);
             enterpriseWechatWorker.setMobile(mobile);
             enterpriseWechatWorker.setEmail(email);
-            if (detail != null) {
-                enterpriseWechatWorker.setMainDepartment(mainDepartmentId.toString());
-                enterpriseWechatWorker.setDepartmentName(detail.getName());
-                enterpriseWechatWorker.setCorpId(detail.getCorpId());
-            }
+//            if (detail != null) {
+//                enterpriseWechatWorker.setMainDepartment(mainDepartmentId.toString());
+//                enterpriseWechatWorker.setDepartmentName(detail.getName());
+//                enterpriseWechatWorker.setCorpId(detail.getCorpId());
+//            }
 //            if(wxCpUser != null){
 //                enterpriseWechatWorker.setQrCode(wxCpUser.getQrCode());
 //            }
@@ -407,12 +408,12 @@ public class EnterpriseWechatWorkerLogic {
     /**
      * 导出成员
      */
-    public ExcelData exportData(HttpServletRequest request, String keyword, String adminWebsitId, Long websitId) {
+    public ExcelData exportData(HttpServletRequest request, String keyword, String adminWebsitId, String websitId) {
         String[] titles = new String[]{"姓名", "性别", "帐号", "部门编号", "部门", "职务", "手机号码", "邮箱", "创建时间"};
 
 
-        List<String> corpIds = commonLogic.getAdminUser(request).getCorpIds();
-        List<Long> ids = new ArrayList<>();
+//        List<String> corpIds = commonLogic.getAdminUser(request).getCorpIds();
+        List<String> ids = new ArrayList<>();
         List<AdminWebsit> list = new ArrayList<>();
 
         String corpId = null;
@@ -424,7 +425,7 @@ public class EnterpriseWechatWorkerLogic {
         }
         ids.addAll(list.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList()));
 
-        List<EnterpriseWechatWorkerImportList> importList = enterpriseWechatWorkerLogicMapper.list(ids, keyword, corpIds, corpId);
+        List<EnterpriseWechatWorkerImportList> importList = enterpriseWechatWorkerLogicMapper.list(ids, keyword, null, corpId);
 
         List<List<Object>> rows = new ArrayList<>();
         for (EnterpriseWechatWorkerImportList worker : importList) {

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

@@ -93,10 +93,7 @@ public class CommonLogic {
             AdminUser admin = adminUserService.lambdaQuery().eq(AdminUser::getUserName, "admin").one();
             AdminUserCom adminUserCom = new AdminUserCom();
             BeanUtils.copyProperties(admin,adminUserCom);
-            AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById("1");
-            adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
-            adminUserCom.setLoginCompanyWechatId(adminCompanyWechat.getCompanyWechatId());
-            adminUserCom.setLoginCompanyName(adminCompanyWechat.getCompanyName());
+            adminUserCom.setLoginCompanyWechatId("1");
             return adminUserCom;
         }
         AdminUser adminUser = adminUserService.getById(userId);
@@ -139,8 +136,6 @@ public class CommonLogic {
                 List<String> corpIds = list.stream().map(AdminCompanyWechat::getCorpId).collect(Collectors.toList());
 
                 adminUser.setCompanyWechatIds(companyWechatIds);
-                adminUser.setCorpIds(corpIds);
-                adminUser.setCorpId(corpIds.get(0));
                 adminUser.setOnlyRead(companyWechatIds.size() > 1);
                 if (companyWechatIds.size() == 1) {
                     AdminCompanyWechat adminCompanyWechat = list.get(0);
@@ -203,8 +198,6 @@ public class CommonLogic {
             //获取当前登录人的企业微信配置
             AdminCompanyWechat adminCompanyWechat = this.getAdminCompanyWechat(loginCompanyWechatId);
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
-            adminUserCom.setCorpIds(Arrays.asList(adminCompanyWechat.getCorpId()));
-            adminUserCom.setCorpId(adminCompanyWechat.getCorpId());
         }
         return adminUserCom;
     }
@@ -373,4 +366,11 @@ public class CommonLogic {
         String url = OSSUtil.getUrlWw(key,null);
         return url;
     }
+
+    /**
+     * 批量更新商户名称（冗余字段）
+     */
+    public void batchUpdateCompanyWechatName(String companyWechatId, String companyWechatName) {
+        adminMapper.batchUpdateCompanyWechatName(companyWechatId, companyWechatName);
+    }
 }

src/main/java/com/gree/mall/manager/logic/common/FucaiLogic.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.logic.common;
 
-import com.alibaba.excel.util.CollectionUtils;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.utils.StringUtils;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -26,7 +26,7 @@ public class FucaiLogic {
 
 
     public void getWuliao(List<GoodsSpec> goodsSpecs) throws RemoteServiceException {
-        if(CollectionUtils.isEmpty(goodsSpecs)){
+        if(CollectionUtil.isEmpty(goodsSpecs)){
             return;
         }
         if(!profiles.equals("prd")){

src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -1,8 +1,8 @@
 package com.gree.mall.manager.logic.common;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.excel.util.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -152,7 +152,7 @@ public class WechatLogic {
         log.info("【准备结算】:" + JSONArray.toJSONString(orderShares));
         orderShares = orderShares.stream().filter(v -> v.getAmount().doubleValue() > 0).collect(Collectors.toList());
         log.info("【准备结算2】:" + JSONArray.toJSONString(orderShares));
-        if (CollectionUtils.isEmpty(orderShares)) {
+        if (CollectionUtil.isEmpty(orderShares)) {
             return;
         }
 

src/main/java/com/gree/mall/manager/logic/manual/ManualWorkLogic.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.logic.manual;
 
-import com.alibaba.excel.util.CollectionUtils;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.enums.UserTypeEnum;
@@ -41,7 +41,7 @@ public class ManualWorkLogic {
                 .eq(EnterpriseWechatWorker::getMobile, workPhone)
                 .eq(EnterpriseWechatWorker::getCorpId, adminUser.getAdminCompanyWechat().getCorpId())
                 .list();
-        if (CollectionUtils.isEmpty(list)) {
+        if (CollectionUtil.isEmpty(list)) {
             throw new RemoteServiceException("不是企业微信成员");
         }
 
@@ -54,7 +54,7 @@ public class ManualWorkLogic {
                 .eq(User::getMobile, personalPhone)
                 .list();
 
-        if (!CollectionUtils.isEmpty(workUserList)) {
+        if (!CollectionUtil.isEmpty(workUserList)) {
             throw new RemoteServiceException("已经是业务员了");
         }
         if (workUserList == null || workUserList.size() > 1) {

src/main/java/com/gree/mall/manager/logic/report/OfflineDataLogic.java

@@ -66,7 +66,7 @@ public class OfflineDataLogic {
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
         List<AdminWebsit> list = adminWebsitService.lambdaQuery()
                 //.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
-                .in(AdminWebsit::getCorpId, adminUser.getCorpIds())
+//                .in(AdminWebsit::getCorpId, adminUser.getCorpIds())
                 .list();
         List<String> websitNumbers = list.stream().map(AdminWebsit::getWebsitNumber).collect(Collectors.toList());
 

src/main/java/com/gree/mall/manager/logic/report/SalesReportLogic.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.logic.report;
 
-import com.alibaba.excel.util.CollectionUtils;
+import cn.hutool.core.collection.CollectionUtil;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.admin.AdminWebsitBean;
@@ -44,17 +44,17 @@ public class SalesReportLogic {
         List<String> adminWebsitIds = adminUser.getAdminWebsitIds();
 
 
-        if (adminUser.getType() != 0 || CollectionUtils.isEmpty(adminWebsitIds)) {
+        if (adminUser.getType() != 0 || CollectionUtil.isEmpty(adminWebsitIds)) {
             //超管
-            List<SaleReport> saleReports = customSalesReportMapper.queryData(null,startTime, endTime,adminUser.getCorpIds());
-            return saleReports;
+//            List<SaleReport> saleReports = customSalesReportMapper.queryData(null,startTime, endTime,adminUser.getCorpIds());
+            return null;
         } else {
             //拥有的网点权限
             List<AdminWebsit> list = adminWebsitService.lambdaQuery().in(AdminWebsit::getId, adminWebsitIds).list();
             List<String> websitNumbers = list.stream().map(AdminWebsit::getWebsitNumber).collect(Collectors.toList());
             //网点帐号
-            List<SaleReport> saleReports = customSalesReportMapper.queryData(websitNumbers,startTime, endTime,adminUser.getCorpIds());
-            return saleReports;
+//            List<SaleReport> saleReports = customSalesReportMapper.queryData(websitNumbers,startTime, endTime,adminUser.getCorpIds());
+            return null;
         }
     }
 

src/main/java/com/gree/mall/manager/logic/sop/SopRuleLogic.java

@@ -154,7 +154,7 @@ public class SopRuleLogic {
             EnterpriseWechatWorker byId = enterpriseWechatWorkerService.getById(worker);
             SopRuleWorker sopRuleWorker = new SopRuleWorker();
             sopRuleWorker.setWechatUserId(byId.getWechatUserId());
-            sopRuleWorker.setCorpId(adminUser.getCorpId());
+//            sopRuleWorker.setCorpId(adminUser.getCorpId());
             sopRuleWorker.setRuleId(sopRule.getId());
             sopRuleTaskList.add(sopRuleWorker);
         }
@@ -178,7 +178,7 @@ public class SopRuleLogic {
             EnterpriseWechatWorker byId = enterpriseWechatWorkerService.getById(worker);
             SopRuleWorker sopRuleWorker = new SopRuleWorker();
             sopRuleWorker.setWechatUserId(byId.getWechatUserId());
-            sopRuleWorker.setCorpId(adminUser.getCorpId());
+//            sopRuleWorker.setCorpId(adminUser.getCorpId());
             sopRuleWorker.setRuleId(sopRule.getId());
             sopRuleTaskList.add(sopRuleWorker);
         }
@@ -532,7 +532,7 @@ public class SopRuleLogic {
             }
             SopRuleWorker sopRuleWorker = new SopRuleWorker();
             sopRuleWorker.setWechatUserId(byId.getWechatUserId());
-            sopRuleWorker.setCorpId(adminUser.getCorpId());
+//            sopRuleWorker.setCorpId(adminUser.getCorpId());
             sopRuleWorker.setRuleId(sopRuleAdd.getId());
             sopRuleTaskList.add(sopRuleWorker);
         }

src/main/java/com/gree/mall/manager/logic/tag/DepartmentSyncLogic.java

@@ -94,7 +94,7 @@ public class DepartmentSyncLogic {
             List<WxCpDepart> wxCpDeparts = workWechatLogic.miniApp(adminCompanyWechat).getDepartmentService().list(null);
             if (wxCpDeparts != null && wxCpDeparts.size() > 0) {
                 List<AdminWebsit> currDeparts = adminWebsitService.lambdaQuery().select(AdminWebsit::getId).list();
-                List<Long> currDepartIds = currDeparts.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
+                List<String> currDepartIds = currDeparts.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
 
                 List<AdminWebsit> adminWebsits = new ArrayList<>();
                 for (WxCpDepart wxCpDepart : wxCpDeparts) {
@@ -103,7 +103,7 @@ public class DepartmentSyncLogic {
                     }
                     AdminWebsit adminWebsit = new AdminWebsit();
                     BeanUtils.copyProperties(wxCpDepart, adminWebsit);
-                    adminWebsit.setWebsitId(wxCpDepart.getId());
+                    adminWebsit.setWebsitId(String.valueOf(wxCpDepart.getId()));
                     adminWebsit.setSortNum(wxCpDepart.getOrder());
                     adminWebsit.setCorpId(adminCompanyWechat.getCorpId());
                     adminWebsits.add(adminWebsit);

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

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.logic.websit;
 
-import com.alibaba.excel.util.CollectionUtils;
+import cn.hutool.core.collection.CollectionUtil;
 import com.aliyuncs.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,7 +31,7 @@ public class WebsitLogic {
             websitNoList = adminWebsitBean.getWeidsitIds().stream().map(WebsitZone::getWebsitNumber).collect(Collectors.toList());
         }
         return adminWebsitService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(websitNoList), AdminWebsit::getWebsitNumber,websitNoList)
+                .in(CollectionUtil.isNotEmpty(websitNoList), AdminWebsit::getWebsitNumber,websitNoList)
                 .page(new Page<>(pageNo, pageSize));
     }
 

src/main/java/com/gree/mall/manager/schedule/CarryJobScheduled.java

@@ -41,6 +41,7 @@ import me.chanjar.weixin.cp.bean.external.contact.WxCpExternalContactInfo;
 import me.chanjar.weixin.cp.bean.message.WxCpMessage;
 import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.integration.redis.util.RedisLockRegistry;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -55,6 +56,7 @@ import java.util.concurrent.locks.Lock;
 /**
  * 推送redis延迟消息定时任务
  */
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
 @Slf4j
 @Component
 public class CarryJobScheduled {

src/main/java/com/gree/mall/manager/schedule/CouponEndServiceSchedule.java

@@ -3,6 +3,8 @@ package com.gree.mall.manager.schedule;
 import com.gree.mall.manager.enums.CouponFlagEnum;
 import com.gree.mall.manager.plus.entity.Coupon;
 import com.gree.mall.manager.plus.service.CouponService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,6 +13,8 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.Date;
 
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+@Slf4j
 @Component
 public class CouponEndServiceSchedule {
 

src/main/java/com/gree/mall/manager/schedule/DepartmentSyncSchedule.java

@@ -1,82 +0,0 @@
-package com.gree.mall.manager.schedule;
-
-import com.aliyuncs.utils.StringUtils;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.tag.AsyncWxTagLogic;
-import com.gree.mall.manager.logic.tag.DepartmentSyncLogic;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
-import lombok.SneakyThrows;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-@Component
-public class DepartmentSyncSchedule {
-
-    @Autowired
-    private AsyncWxTagLogic asyncWxTagLogic;
-    @Autowired
-    private DepartmentSyncLogic departmentSyncLogic;
-    @Autowired
-    CommonLogic commonLogic;
-
-    /**
-     * 同步企业成员信息
-     * @throws WxErrorException
-     */
-//    @Scheduled(fixedDelay = 3 * 60 * 1000)
-//    public void usertask() throws WxErrorException {
-//        List<AdminCompanyWechat> adminCompanyList = commonLogic.getAdminCompanyList();
-//        if(adminCompanyList.size() == 0){
-//            return;
-//        }
-//        for(AdminCompanyWechat adminCompanyWechat : adminCompanyList) {
-//            if(StringUtils.isNotEmpty(adminCompanyWechat.getMchId()) && StringUtils.isNotEmpty(adminCompanyWechat.getSubAppId())
-//                    &&StringUtils.isNotEmpty(adminCompanyWechat.getSubSecret())) {
-//                departmentSyncLogic.syncDepartmentData(adminCompanyWechat);
-//            }
-//        }
-//    }
-
-    /**
-     * 同步外部联系人和标签数据
-     * @throws WxErrorException
-     */
-//    @Scheduled(fixedDelay = 30 * 60 * 1000)
-//    public void tagTask() throws WxErrorException {
-//        List<AdminCompanyWechat> adminCompanyList = commonLogic.getAdminCompanyList();
-//        if(adminCompanyList.size() == 0){
-//            return;
-//        }
-//        for(AdminCompanyWechat adminCompanyWechat : adminCompanyList) {
-//            if(StringUtils.isNotEmpty(adminCompanyWechat.getMchId()) && StringUtils.isNotEmpty(adminCompanyWechat.getSubAppId())
-//                    &&StringUtils.isNotEmpty(adminCompanyWechat.getSubSecret())) {
-//                asyncWxTagLogic.syncWxUserData(adminCompanyWechat.getCorpId(),adminCompanyWechat);
-//            }
-//        }
-//    }
-
-    /**
-     * 同步部门数据
-     * @throws WxErrorException
-     */
-//    @Scheduled(fixedDelay = 1 * 60 * 1000)
-//    public void departTask() throws WxErrorException {
-//        List<AdminCompanyWechat> adminCompanyList = commonLogic.getAdminCompanyList();
-//        if(adminCompanyList.size() == 0){
-//            return;
-//        }
-//        for(AdminCompanyWechat adminCompanyWechat : adminCompanyList) {
-//            if(StringUtils.isNotEmpty(adminCompanyWechat.getMchId()) && StringUtils.isNotEmpty(adminCompanyWechat.getSubAppId())
-//                    &&StringUtils.isNotEmpty(adminCompanyWechat.getSubSecret())) {
-//                departmentSyncLogic.pullDepartmentList(adminCompanyWechat);
-//            }
-//        }
-//    }
-
-
-}

src/main/java/com/gree/mall/manager/schedule/MarketingMaterialsSyncQyWx.java

@@ -3,12 +3,16 @@ package com.gree.mall.manager.schedule;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.manager.logic.marketing.MarketingMaterialsLogic;
 import com.gree.mall.manager.plus.entity.MarketingMaterials;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+@Slf4j
 @Component
 public class MarketingMaterialsSyncQyWx {
 

src/main/java/com/gree/mall/manager/schedule/OverOrderSchedule.java

@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,8 +33,9 @@ import java.util.stream.Collectors;
 /**
  * 自动签收订单
  */
-@Component
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
 @Slf4j
+@Component
 public class OverOrderSchedule {
 
 

src/main/java/com/gree/mall/manager/schedule/PromotionGroupSchedule.java

@@ -1,12 +1,17 @@
 package com.gree.mall.manager.schedule;
 
 import com.gree.mall.manager.logic.activity.PromotionGroupLogic;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-@Service
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+@Slf4j
+@Component
 public class PromotionGroupSchedule {
 
     @Autowired

src/main/java/com/gree/mall/manager/schedule/StockNoticeSchedule.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.schedule;
-
-import com.gree.mall.manager.logic.notice.NoticeLogic;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * 库存提醒
- */
-@Component
-public class StockNoticeSchedule {
-
-    @Autowired
-    NoticeLogic noticeLogic;
-
-    //@Scheduled(fixedDelay = 1000 * 60 * 10)
-    public void task(){
-        noticeLogic.stockNotice();
-    }
-
-}

src/main/java/com/gree/mall/manager/schedule/TaxSchedule.java

@@ -10,14 +10,16 @@ import com.gree.mall.manager.plus.service.OrderInfoService;
 import com.gree.mall.manager.plus.service.OrderTaxService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.Calendar;
 import java.util.List;
 
-@Component
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
 @Slf4j
+@Component
 public class TaxSchedule {
     @Autowired
     private TaxLogic taxLogic;

src/main/java/com/gree/mall/manager/utils/excel/ExcelExamUtils.java

@@ -201,31 +201,31 @@ public class ExcelExamUtils {
         style.setBorderColor(BorderSide.BOTTOM, color);
     }
 
-    public static List<Object> importExcel(MultipartFile file) throws IOException, RemoteServiceException {
-
-        List<Object> datas = new ArrayList<Object>();
-        InputStream inputStream = file.getInputStream();
-
-        ExcelReader excelReader = new ExcelReader(inputStream,null, new AnalysisEventListener() {
-            @Override
-            public void invoke(Object o, AnalysisContext analysisContext) {
-                datas.add(o);
-            }
-
-            @Override
-            public void doAfterAllAnalysed(AnalysisContext analysisContext) {
-
-            }
-        });
-        excelReader.readAll();
-        inputStream.close();
-
-        if(datas.size() > 10000){
-            throw new RemoteServiceException("每次导入暂只支持最多10000条");
-        }
-
-        return datas;
-    }
+//    public static List<Object> importExcel(MultipartFile file) throws IOException, RemoteServiceException {
+//
+//        List<Object> datas = new ArrayList<Object>();
+//        InputStream inputStream = file.getInputStream();
+//
+//        ExcelReader excelReader = new ExcelReader(inputStream,null, new AnalysisEventListener() {
+//            @Override
+//            public void invoke(Object o, AnalysisContext analysisContext) {
+//                datas.add(o);
+//            }
+//
+//            @Override
+//            public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+//
+//            }
+//        });
+//        excelReader.readAll();
+//        inputStream.close();
+//
+//        if(datas.size() > 10000){
+//            throw new RemoteServiceException("每次导入暂只支持最多10000条");
+//        }
+//
+//        return datas;
+//    }
 
 
 

src/main/java/com/gree/mall/manager/utils/excel/ExcelUtils.java

@@ -2,11 +2,14 @@ package com.gree.mall.manager.utils.excel;
 
 
 
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelReader;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 
+import com.alibaba.excel.read.listener.PageReadListener;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import eu.bitwalker.useragentutils.Browser;
@@ -30,15 +33,14 @@ import java.io.*;
 
 import java.util.ArrayList;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 @Slf4j
 public class ExcelUtils {
 
-
-
-
     //常规导出excel
     public static void exportExcel(HttpServletRequest request, HttpServletResponse response, String fileName, ExcelData data,int idIndex,int[] mergeRows) throws Exception {
         setResponse(request,response,fileName);
@@ -195,28 +197,34 @@ public class ExcelUtils {
     }
 
     public static List<Object> importExcel(MultipartFile file) throws IOException, RemoteServiceException {
-
-        List<Object> datas = new ArrayList<Object>();
-        InputStream inputStream = file.getInputStream();
-
-        ExcelReader excelReader = new ExcelReader(inputStream,null, new AnalysisEventListener() {
-            @Override
-            public void invoke(Object o, AnalysisContext analysisContext) {
-                datas.add(o);
+        log.info("【本次导入数据】开始:" + DateUtil.formatDateTime(new Date()));
+        List<Object> datas = new ArrayList<>();
+        EasyExcelFactory.read(file.getInputStream(), new PageReadListener<Map<Integer, Object>>(v -> {
+            for (Map<Integer, Object> map : v) {
+                List<Object> list = new ArrayList<>();
+                for (Integer key : map.keySet()) {
+                    list.add(map.get(key));
+                }
+                datas.add(list);
             }
+        })).sheet().doRead();
+        log.info("【本次导入数据】结束:" + DateUtil.formatDateTime(new Date()) + ",一共" + datas.size());
+        return datas;
+    }
 
-            @Override
-            public void doAfterAllAnalysed(AnalysisContext analysisContext) {
-
+    public static List<Object> importExcel(InputStream inputStream) throws RemoteServiceException {
+        log.info("【本次导入数据】开始:" + DateUtil.formatDateTime(new Date()));
+        List<Object> datas = new ArrayList<>();
+        EasyExcelFactory.read(inputStream, new PageReadListener<Map<Integer, Object>>(v -> {
+            for (Map<Integer, Object> map : v) {
+                List<Object> list = new ArrayList<>();
+                for (Integer key : map.keySet()) {
+                    list.add(map.get(key));
+                }
+                datas.add(list);
             }
-        });
-        excelReader.readAll();
-        inputStream.close();
-
-        if(datas.size() > 10000){
-            throw new RemoteServiceException("每次导入暂只支持最多10000条");
-        }
-
+        })).sheet().doRead();
+        log.info("【本次导入数据】结束:" + DateUtil.formatDateTime(new Date()) + ",一共" + datas.size());
         return datas;
     }
 
@@ -224,8 +232,6 @@ public class ExcelUtils {
 
 
 
-
-
     private static void setResponse(HttpServletRequest request, HttpServletResponse response, String fileName)throws Exception{
         //        fileName = URLEncoder.encode(fileName, "UTF-8");
         // 告诉浏览器用什么软件可以打开此文件

src/main/resources/bootstrap-dev.properties

@@ -4,7 +4,7 @@
 #spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
 #spring.cloud.nacos.discovery.namespace=d7b1bacd-5b9f-4d1e-9a20-e6f923a744ba
 
-#mybatis-plus.configuration.log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.configuration.log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 #支付回调地址
 wechat.payment.notifyUrl=
@@ -21,6 +21,9 @@ spring.devtools.add-properties=true
 spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:ehcache.xml
 
+#定时器开关
+schedule.enable=false
+
 ##SQL执行分析，该插件有性能损耗，不建议生产环境使用
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource

src/main/resources/bootstrap-prd.properties

@@ -19,6 +19,9 @@ spring.devtools.add-properties=true
 spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:ehcache.xml
 
+#定时器开关
+schedule.enable=true
+
 ##SQL执行分析，该插件有性能损耗，不建议生产环境使用
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource

src/main/resources/bootstrap-test.properties

@@ -21,6 +21,9 @@ spring.devtools.add-properties=true
 spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:ehcache.xml
 
+#定时器开关
+schedule.enable=true
+
 ##SQL执行分析，该插件有性能损耗，不建议生产环境使用
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource

src/main/resources/bootstrap.properties

@@ -8,3 +8,5 @@ spring.cloud.nacos.discovery.enabled=false
 goods.share.limit.percent=0.4
 
 server.servlet.context-path=/mallApi
+
+machine.generator.short.id=0

src/main/resources/mapper/AdminMapper.xml

@@ -96,6 +96,17 @@
         GROUP BY a.company_wechat_id
     </select>
 
+    <select id="list" resultType="com.gree.mall.manager.bean.admin.AdminDeptWebsitVO">
+        SELECT
+        ${ex.selected}
+        FROM admin_dept_websit a
+        ${ex.query}
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
+
     <resultMap id="pageCompanyWechatResultMap" autoMapping="true" type="com.gree.mall.manager.bean.admin.respDto.AdminCompanyWechatRespPageBean">
 
         <id column="company_wechat_id1" property="companyWechatId"/>