fhKeeper/.idea/workspace.xml

@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="cb73d8d0-9c49-4c8b-8fdc-51c4a9bc4409" name="Default Changelist" comment="官网修改">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Company.java" beforeDir="false" afterPath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Company.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/resources/mapper/CompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/resources/mapper/CompanyMapper.xml" afterDir="false" />
-    </list>
+    <list default="true" id="cb73d8d0-9c49-4c8b-8fdc-51c4a9bc4409" name="Default Changelist" comment="" />
     <ignored path="$PROJECT_DIR$/formulahousekeeper/target/" />
     <ignored path="$PROJECT_DIR$/formulahousekeeper/management-platform/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,8 +21,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="301">
-              <caret line="47" column="34" lean-forward="true" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="34" />
+            <state relative-caret-position="228">
+              <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
             </state>
           </provider>
         </entry>
@@ -38,7 +30,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="208">
+            <state relative-caret-position="195">
               <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
             </state>
           </provider>
@@ -47,8 +39,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1031">
-              <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
+            <state relative-caret-position="306">
+              <caret line="120" column="52" lean-forward="true" selection-start-line="120" selection-start-column="52" selection-end-line="120" selection-end-column="52" />
             </state>
           </provider>
         </entry>
@@ -187,7 +179,7 @@
       <select />
     </treeState>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="200" />
     <option name="y" value="150" />
     <option name="width" value="1190" />
@@ -263,48 +255,6 @@
               <item name="platform" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="fhKeeper" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fhKeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="formulahousekeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="management-platform" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="platform" type="462c0819:PsiDirectoryNode" />
-              <item name="entity" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="fhKeeper" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fhKeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="formulahousekeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="management-platform" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="platform" type="462c0819:PsiDirectoryNode" />
-              <item name="entity" type="462c0819:PsiDirectoryNode" />
-              <item name="vo" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="fhKeeper" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fhKeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="formulahousekeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="management-platform" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="fhKeeper" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fhKeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="formulahousekeeper" type="462c0819:PsiDirectoryNode" />
-              <item name="management-platform" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -353,7 +303,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.CodeGenerator">
+  <component name="RunManager" selected="Spring Boot.PlatformStartApplication">
     <configuration name="AuthService" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.management.platform.util.AuthService" />
       <module name="management-platform" />
@@ -438,8 +388,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.CodeGenerator" />
         <item itemvalue="Spring Boot.PlatformStartApplication" />
+        <item itemvalue="Application.CodeGenerator" />
         <item itemvalue="JUnit.TestApplicationTests.contextLoads" />
         <item itemvalue="JUnit.TestApplicationTests" />
         <item itemvalue="Application.AuthService" />
@@ -466,7 +416,7 @@
       <workItem from="1580712530176" duration="1479000" />
       <workItem from="1580714920655" duration="1048000" />
       <workItem from="1580716496483" duration="548000" />
-      <workItem from="1580802425044" duration="3235000" />
+      <workItem from="1580802425044" duration="6364000" />
     </task>
     <task id="LOCAL-00001" summary="构建">
       <created>1577760711854</created>
@@ -559,7 +509,14 @@
       <option name="project" value="LOCAL" />
       <updated>1580714103728</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="添加公司用户注册的时候，三天试用时间，修改登录逻辑，检测会员是否到期。修改数据库company的字段">
+      <created>1580805783046</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1580805783046</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -586,13 +543,13 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="30344000" />
+    <option name="totallyTimeSpent" value="33473000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18923241" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18923241" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -603,7 +560,7 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32890365" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49840087" weight="0.37635574" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4978678" weight="0.30585682" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.2978959" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -611,10 +568,10 @@
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5021322" side_tool="true" visible="true" weight="0.2657267" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5021322" side_tool="true" weight="0.37635574" />
       <window_info anchor="bottom" id="Java Enterprise" order="11" />
       <window_info anchor="bottom" id="Database Changes" order="12" />
-      <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4978678" visible="true" weight="0.2657267" />
+      <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4978678" weight="0.2657267" />
       <window_info anchor="bottom" id="JRebel Executor" order="14" sideWeight="0.8566058" weight="0.45071983" />
       <window_info anchor="bottom" id="JRebel Console" order="15" sideWeight="0.50107414" side_tool="true" weight="0.2580288" />
       <window_info anchor="bottom" id="Messages" order="16" sideWeight="0.49946696" weight="0.3286334" />
@@ -622,7 +579,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" visible="true" weight="0.09328358" />
+      <window_info active="true" anchor="right" id="Maven" order="3" visible="true" weight="0.09328358" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Maven Projects" order="6" />
@@ -656,7 +613,8 @@
     <MESSAGE value="暂停定时任务" />
     <MESSAGE value="官网修改完成" />
     <MESSAGE value="官网修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="官网修改" />
+    <MESSAGE value="添加公司用户注册的时候，三天试用时间，修改登录逻辑，检测会员是否到期。修改数据库company的字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加公司用户注册的时候，三天试用时间，修改登录逻辑，检测会员是否到期。修改数据库company的字段" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/formulahousekeeper/formulahousekeeper.iml">
@@ -872,38 +830,38 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java">
+    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/ScreenshotVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="47" column="34" lean-forward="true" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="34" />
+        <state relative-caret-position="278">
+          <caret line="14" column="31" lean-forward="true" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java">
+    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/UserVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
+        <state relative-caret-position="296">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/ScreenshotVO.java">
+    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="278">
-          <caret line="14" column="31" lean-forward="true" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
+        <state relative-caret-position="228">
+          <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/UserVO.java">
+    <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        <state relative-caret-position="195">
+          <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1031">
-          <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
+        <state relative-caret-position="306">
+          <caret line="120" column="52" lean-forward="true" selection-start-line="120" selection-start-column="52" selection-end-line="120" selection-end-column="52" />
         </state>
       </provider>
     </entry>

fhKeeper/formulahousekeeper/.gitignore

@@ -23,3 +23,11 @@ gen
 /.idea/modules.xml
 
 target/
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Company.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-02-04
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -40,8 +40,8 @@ public class Company extends Model<Company> {
     /**
      * 公司规模
      */
-    @TableField("staff_count")
-    private Integer staffCount;
+    @TableField("staff_count_max")
+    private Integer staffCountMax;
 
     /**
      * 会员到期时间
@@ -49,12 +49,6 @@ public class Company extends Model<Company> {
     @TableField("expiration_date")
     private LocalDateTime expirationDate;
 
-    /**
-     * 试用到期时间
-     */
-    @TableField("trial_expiration_time")
-    private LocalDateTime trialExpirationTime;
-
     /**
      * 选择的套餐（单位：/年）
      */

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.management.platform.service.impl;
-import	java.time.LocalDateTime;
-import	java.time.LocalDate;
+
+import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Company;
@@ -64,19 +65,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //查看该公司非会员公司，只能允许试用三天，超时不可登录
             Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", userList.get(0).getCompanyId()));
             //公司未办理会员
-            if(null != company.getTrialExpirationTime()){
-                if(0 == company.getSetMeal()){
+            if (null != company.getExpirationDate()) {
+                if (0 == company.getSetMeal()) {
                     //未办理会员
-                    if(company.getTrialExpirationTime().isBefore(LocalDateTime.now())){
+                    if (company.getExpirationDate().isBefore(LocalDateTime.now())) {
                         httpRespMsg.setError("账号试用已到期，请联系公司负责人开通会员套餐");
                         return httpRespMsg;
                     }
-                }else{
-                    if(company.getExpirationDate().isBefore(LocalDateTime.now())){
-                        if(company.getTrialExpirationTime().isBefore(LocalDateTime.now())) {
-                            httpRespMsg.setError("账号会员已到期，请联系公司负责人续费会员套餐");
-                            return httpRespMsg;
-                        }
+                } else {
+                    if (company.getExpirationDate().isBefore(LocalDateTime.now())) {
+                        httpRespMsg.setError("账号会员已到期，请联系公司负责人续费会员套餐");
+                        return httpRespMsg;
                     }
                 }
             }
@@ -108,19 +107,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //查看该公司非会员公司，只能允许试用三天，超时不可登录
             Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", userList.get(0).getCompanyId()));
             //公司未办理会员
-            if(null != company.getTrialExpirationTime()){
-                if(0 == company.getSetMeal()){
+            if (null != company.getExpirationDate()) {
+                if (0 == company.getSetMeal()) {
                     //未办理会员
-                    if(company.getTrialExpirationTime().isBefore(LocalDateTime.now())){
+                    if (company.getExpirationDate().isBefore(LocalDateTime.now())) {
                         httpRespMsg.setError("账号试用已到期，请联系公司负责人开通会员套餐");
                         return httpRespMsg;
                     }
-                }else{
-                    if(company.getExpirationDate().isBefore(LocalDateTime.now())){
-                        if(company.getTrialExpirationTime().isBefore(LocalDateTime.now())) {
+                } else {
+                    if (company.getExpirationDate().isBefore(LocalDateTime.now())) {
                             httpRespMsg.setError("账号会员已到期，请联系公司负责人续费会员套餐");
                             return httpRespMsg;
-                        }
                     }
                 }
             }
@@ -220,7 +217,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         } else {
             //首先生成一个新公司,增加会员的试用天数
             Company company = new Company().setCompanyName(companyName)
-                    .setTrialExpirationTime(LocalDateTime.now().plusDays(3));
+                    .setExpirationDate(LocalDateTime.now().plusDays(3));
             companyMapper.insert(company);
             //然后生成一个负责人
             Long id = SnowFlake.nextId();
@@ -322,7 +319,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 XSSFCell phoneCell = row.getCell(1);
                 nameCell.setCellType(CellType.STRING);
                 phoneCell.setCellType(CellType.STRING);
-                if("姓名".equals(nameCell.getStringCellValue()) && "手机号".equals(phoneCell.getStringCellValue()) && rowIndex==0){
+                if ("姓名".equals(nameCell.getStringCellValue()) && "手机号".equals(phoneCell.getStringCellValue()) && rowIndex == 0) {
                     continue;
                 }
                 String name = nameCell.getStringCellValue();
@@ -361,10 +358,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             e.printStackTrace();
             httpRespMsg.setError("发生其他错误");
             return httpRespMsg;
-        }finally {
+        } finally {
             //关闭流
             try {
-                if(outputStream != null && inputStream != null){
+                if (outputStream != null && inputStream != null) {
                     outputStream.close();
                     inputStream.close();
                     System.out.println("流已关闭");

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/CompanyMapper.xml

@@ -6,15 +6,14 @@
     <resultMap id="BaseResultMap" type="com.management.platform.entity.Company">
         <id column="id" property="id" />
         <result column="company_name" property="companyName" />
-        <result column="staff_count" property="staffCount" />
+        <result column="staff_count_max" property="staffCountMax" />
         <result column="expiration_date" property="expirationDate" />
-        <result column="trial_expiration_time" property="trialExpirationTime" />
         <result column="set_meal" property="setMeal" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_name, staff_count, expiration_date, trial_expiration_time, set_meal
+        id, company_name, staff_count_max, expiration_date, set_meal
     </sql>
 
 </mapper>