修改公司参数代码

ad-platform-pojo/src/main/java/com/baiye/model/dto/TreeUserDTO.java

@@ -15,5 +15,11 @@ public class TreeUserDTO extends UserDto {
 
     private Long templateId;
 
+
+    private Integer companyType;
+
+
+    private Boolean authorizationState;
+
     private List<TreeUserDTO> children;
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/User.java

@@ -121,6 +121,9 @@ public class User extends BaseEntity implements Serializable {
     @Transient
     private Long templateId;
 
+    @Transient
+    private Integer companyType;
+
     @Transient
     private String greetMessage;
 

manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java

@@ -81,6 +81,7 @@ public interface CompanyRepository extends JpaRepository<Company, Long>, JpaSpec
 
     /**
      * id修改公司模板
+     *
      * @param templateId
      * @param companyId
      */
@@ -88,6 +89,7 @@ public interface CompanyRepository extends JpaRepository<Company, Long>, JpaSpec
     @Query("UPDATE Company set templateId = ?1 where id = ?2")
     void updateCompanyTemplateIdById(Long templateId, Long companyId);
 
+
     /**
      * 用户id查询
      */
@@ -100,6 +102,16 @@ public interface CompanyRepository extends JpaRepository<Company, Long>, JpaSpec
      * @param id
      */
     @Modifying
-    @Query("UPDATE Company set authorizationState = ?2 where id = ?1")
+    @Query("UPDATE Company set authorizationState = ?1 where id = ?2")
     void updateAuthorizationStatusById(Boolean flag, Long id);
+
+    /**
+     * 修改公司授权状态
+     *
+     * @param companyType
+     * @param companyId
+     */
+    @Modifying
+    @Query("UPDATE Company set companyType = ?1 where id = ?2")
+    void updateCompanyTypeById(Integer companyType, Long companyId);
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/CompanyService.java

@@ -84,6 +84,7 @@ public interface CompanyService {
 
     /**
      * 修改公司id
+     *
      * @param templateId
      * @param companyId
      */
@@ -95,4 +96,11 @@ public interface CompanyService {
      * @param id
      */
     void updateCompanyAuthorizationStatus(Boolean aTrue, Long id);
+
+    /**
+     * 修改公司类型
+     * @param companyType
+     * @param companyId
+     */
+    void updateCompanyTypeById(Integer companyType, Long companyId);
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/CompanyDto.java

@@ -87,6 +87,9 @@ public class CompanyDto extends BaseDTO implements Serializable {
     @ApiModelProperty("公司类型")
     private Integer companyType;
 
+    @ApiModelProperty("是否授权成功")
+    private Boolean authorizationState;
+
 
 
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java

@@ -149,11 +149,17 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     @CacheEvict(cacheNames = "companyCache", key = "#companyId")
     public void updateCompanyTemplateId(Long templateId, Long companyId) {
-         companyRepository.updateCompanyTemplateIdById(templateId,companyId);
+        companyRepository.updateCompanyTemplateIdById(templateId, companyId);
     }
 
     @Override
     public void updateCompanyAuthorizationStatus(Boolean flag, Long id) {
         companyRepository.updateAuthorizationStatusById(flag, id);
     }
+
+    @Override
+    @CacheEvict(cacheNames = "companyCache", key = "#companyId")
+    public void updateCompanyTypeById(Integer companyType, Long companyId) {
+        companyRepository.updateCompanyTypeById(companyType, companyId);
+    }
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java

@@ -139,6 +139,8 @@ public class UserServiceImpl implements UserService {
                         user.setIsManager(Boolean.TRUE);
                         CompanyDto companyById = companyService.findCompanyById(user.getCompanyId());
                         user.setTemplateId(companyById.getTemplateId());
+                        user.setCompanyType(companyById.getCompanyType());
+                        user.setAuthorizationState(companyById.getAuthorizationState());
                     }
                     if (role.getId() == DefaultNumberConstants.ONE_NUMBER) {
                         user.setIsAdmin(Boolean.TRUE);
@@ -423,6 +425,9 @@ public class UserServiceImpl implements UserService {
         if (ObjectUtil.isNotNull(resources.getTemplateId())) {
             companyService.updateCompanyTemplateId(resources.getTemplateId(), user.getCompanyId());
         }
+        if(ObjectUtil.isNotNull(resources.getCompanyType())){
+            companyService.updateCompanyTypeById(resources.getCompanyType(), user.getCompanyId());
+        }
 
         user.setIsReview(resources.getIsReview());
         user.setEmail(resources.getEmail());

manage/ad-platform-management/src/main/java/com/baiye/timed/WeChatAddFriendSync.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.modules.system.domain.AddWeChatFriendRecord;
-import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.service.AddWeChatFriendRecordService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +12,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Enzo
@@ -48,7 +46,7 @@ public class WeChatAddFriendSync {
                 // 偏移三天
                 DateTime dateTime = DateUtil.offsetDay(DateUtil.date(),
                         DefaultNumberConstants.MINUS_THREE_NUMBER);
-                if (dateTime.after(friendRecord.getAddFriendTime())) {
+                if (friendRecord.getAddFriendTime() != null && dateTime.after(friendRecord.getAddFriendTime())) {
                     friendRecord.setStatus(DefaultNumberConstants.MINUS_TWO_NUMBER);
                     addWeChatFriendRecordService.save(friendRecord);
                 }