Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-admin/src/main/java/com/fs/task/FsCourseTask.java

@@ -1,6 +1,7 @@
 package com.fs.task;
 
 import com.fs.course.service.IFsCourseWatchLogService;
+import com.fs.qw.service.ICustomerTransferApprovalService;
 import com.fs.qw.service.IHyWorkTaskService;
 import com.fs.qw.service.IQwWorkTaskService;
 import com.fs.statis.service.FsStatisSalerWatchService;
@@ -20,6 +21,10 @@ public class FsCourseTask {
     private IHyWorkTaskService hyWorkTaskService;
     @Autowired
     private FsStatisSalerWatchService fsStatisSalerWatchService;
+    @Autowired
+    private ICustomerTransferApprovalService customerTransferApprovalService;
+
+
     /**
      * 添加会员观看日志
      * @throws Exception
@@ -61,4 +66,11 @@ public class FsCourseTask {
     public void watchCourseStatisToday(){
         fsStatisSalerWatchService.writeDataToday();
     }
+
+    /**
+     * 客户转移审批自动通过
+     */
+    public void fsUserTransferAutoPass(){
+        customerTransferApprovalService.autoApprovePass();
+    }
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -7,7 +7,10 @@ import com.fs.company.domain.*;
 import com.fs.company.mapper.*;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.service.ICompanyService;
-import com.fs.company.vo.*;
+import com.fs.company.vo.CompanyCrmVO;
+import com.fs.company.vo.CompanyNameVO;
+import com.fs.company.vo.CompanyVO;
+import com.fs.company.vo.DeptDataVO;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.his.vo.OptionsVO;
 import com.fs.store.config.StoreConfig;
@@ -24,7 +27,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -163,6 +169,7 @@ public class CompanyServiceImpl implements ICompanyService
             user.setSex("0");
             user.setStatus("0");
             user.setIsDel(0);
+            user.setIsAudit(1);
             userMapper.insertCompanyUser(user);
             //添加用户角色表
             CompanyUserRole userRole=new CompanyUserRole();

fs-service-system/src/main/java/com/fs/qw/mapper/CustomerTransferApprovalMapper.java

@@ -59,4 +59,7 @@ public interface CustomerTransferApprovalMapper
      * @return 结果
      */
     public int deleteCustomerTransferApprovalByIds(Long[] ids);
+
+    List<CustomerTransferApproval> queryPendingData();
+
 }

fs-service-system/src/main/java/com/fs/qw/service/ICustomerTransferApprovalService.java

@@ -20,6 +20,12 @@ public interface ICustomerTransferApprovalService
      */
     public CustomerTransferApproval selectCustomerTransferApprovalById(Long id);
 
+    public List<CustomerTransferApproval> queryPendingData();
+
+    /**
+     * 自动审批通过
+     */
+    public void autoApprovePass();
     /**
      * 查询客户转移审批列表
      *

fs-service-system/src/main/java/com/fs/qw/service/impl/CustomerTransferApprovalServiceImpl.java

@@ -1,9 +1,6 @@
 package com.fs.qw.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.ObjectUtil;
@@ -120,6 +117,23 @@ public class CustomerTransferApprovalServiceImpl implements ICustomerTransferApp
         return item;
     }
 
+    @Override
+    public List<CustomerTransferApproval> queryPendingData() {
+        return customerTransferApprovalMapper.queryPendingData();
+    }
+
+    @Override
+    public void autoApprovePass() {
+        List<CustomerTransferApproval> customerTransferApprovals = customerTransferApprovalMapper.queryPendingData();
+        for (CustomerTransferApproval approval : customerTransferApprovals) {
+            approval.setApprovalStatus(1);
+            approval.setApprovalRemark("自动审批");
+            approval.setApproverUserId(1L);
+            ICustomerTransferApprovalService service = (ICustomerTransferApprovalService) AopContext.currentProxy();
+            service.updateCustomerTransferApproval(approval);
+        }
+    }
+
     private List<TransferCustomDTO> getCustomerList(List<Long> customerIds, CustomerTransferApproval item) {
         List<TransferCustomDTO> customerList = new ArrayList<>();
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -9,6 +9,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.DateUtils;
+import com.fs.common.utils.DictUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.cache.ICompanyTagCacheService;
 import com.fs.company.cache.ICompanyUserCacheService;
@@ -509,6 +510,12 @@ public class FsUserServiceImpl implements IFsUserService
                     item.setCompanyUserNickName(companyUserName);
                 }
             }
+            if(item.getStatus() != null) {
+                String userStatus = DictUtils.getDictLabel("user_status", String.valueOf(item.getStatus()));
+                if(StringUtils.isNotBlank(userStatus)){
+                    item.setStatusText(userStatus);
+                }
+            }
             if(item.getUserId() != null) {
                 FsUserCourseCount byUserId = fsUserCourseCountCacheService.findByUserId(item.getUserId());
                 if(byUserId != null) {

fs-service-system/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -29,6 +29,8 @@ public class FsUserPageListVO {
     @ApiModelProperty(value = "状态：1为正常，0为禁止")
     private Integer status;
 
+    private String statusText;
+
     @ApiModelProperty(value = "公司id")
     private Long companyId;
 

fs-service-system/src/main/resources/application-druid-zkzh.yml

@@ -3,11 +3,11 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: r-bp1lfyvfmjkz7jrs0m.redis.rds.aliyuncs.com
         # 端口，默认为6379
         port: 6379
         # 密码
-        password:
+        password: Zkhj951753@#
         # 连接超时时间
         timeout: 30s
         lettuce:
@@ -28,9 +28,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://127.0.0.1:3306/jz_store?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://rm-bp1l45210q9m4m83u.mysql.rds.aliyuncs.com:3306/jz_store?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: sP4dQO0BzgeNkKuJ
+                    password: Zkhj951753@#
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -83,9 +83,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://127.0.0.1:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://rm-bp1l45210q9m4m83u.mysql.rds.aliyuncs.com:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: sP4dQO0BzgeNkKuJ
+                    password: Zkhj951753@#
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量

fs-service-system/src/main/resources/mapper/qw/CustomerTransferApprovalMapper.xml

@@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCustomerTransferApprovalVo"/>
         where id = #{id}
     </select>
+    <select id="queryPendingData" resultType="com.fs.qw.domain.CustomerTransferApproval">
+        select * from customer_transfer_approval where approval_status=0
+    </select>
 
     <insert id="insertCustomerTransferApproval" parameterType="CustomerTransferApproval" useGeneratedKeys="true" keyProperty="id">
         insert into customer_transfer_approval