1、添加推荐模块

.idea/workspace.xml

@@ -3,60 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="74ae82f3-7b81-42e8-8b53-827e18cc7011" name="Default Changelist" comment="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)">
       <change afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -195,7 +147,8 @@
       <workItem from="1731750561470" duration="9951000" />
       <workItem from="1733103883735" duration="17631000" />
       <workItem from="1733710180531" duration="11896000" />
-      <workItem from="1733968817518" duration="58456000" />
+      <workItem from="1733968817518" duration="63976000" />
+      <workItem from="1735284739666" duration="277000" />
     </task>
     <task id="LOCAL-00001" summary="1、项目初始化">
       <created>1731385713383</created>
@@ -267,7 +220,14 @@
       <option name="project" value="LOCAL" />
       <updated>1734431528564</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="1、接口补充">
+      <created>1735225242451</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1735225242451</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -297,7 +257,8 @@
     <MESSAGE value="1、登录接口添加" />
     <MESSAGE value="1、接口添加" />
     <MESSAGE value="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)" />
+    <MESSAGE value="1、接口补充" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、接口补充" />
   </component>
   <component name="WindowStateProjectService">
     <state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1731382591329">
@@ -316,62 +277,62 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1733992136886" />
-    <state x="713" y="297" key="CommitChangelistDialog2" timestamp="1735225082873">
+    <state x="713" y="297" key="CommitChangelistDialog2" timestamp="1735225241244">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1735225082873" />
-    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1734432960075">
+    <state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1735225241244" />
+    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1735225183505">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1734432960075" />
-    <state width="2517" height="292" key="GridCell.Tab.0.bottom" timestamp="1735225123112">
+    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1735225183505" />
+    <state width="2517" height="432" key="GridCell.Tab.0.bottom" timestamp="1735283158612">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
-    <state width="2517" height="292" key="GridCell.Tab.0.center" timestamp="1735225123112">
+    <state width="2517" height="432" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
+    <state width="2517" height="432" key="GridCell.Tab.0.center" timestamp="1735283158612">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
-    <state width="2517" height="292" key="GridCell.Tab.0.left" timestamp="1735225123112">
+    <state width="2517" height="432" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
+    <state width="2517" height="432" key="GridCell.Tab.0.left" timestamp="1735283158612">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
-    <state width="2517" height="292" key="GridCell.Tab.0.right" timestamp="1735225123112">
+    <state width="2517" height="432" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
+    <state width="2517" height="432" key="GridCell.Tab.0.right" timestamp="1735283158612">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
-    <state width="2517" height="292" key="GridCell.Tab.1.bottom" timestamp="1735225123113">
+    <state width="2517" height="432" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
+    <state width="2517" height="432" key="GridCell.Tab.1.bottom" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
-    <state width="2517" height="292" key="GridCell.Tab.1.center" timestamp="1735225123112">
+    <state width="2517" height="432" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
+    <state width="2517" height="432" key="GridCell.Tab.1.center" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
-    <state width="2517" height="292" key="GridCell.Tab.1.left" timestamp="1735225123112">
+    <state width="2517" height="432" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
+    <state width="2517" height="432" key="GridCell.Tab.1.left" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
-    <state width="2517" height="292" key="GridCell.Tab.1.right" timestamp="1735225123113">
+    <state width="2517" height="432" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
+    <state width="2517" height="432" key="GridCell.Tab.1.right" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
-    <state width="2517" height="292" key="GridCell.Tab.2.bottom" timestamp="1735225123113">
+    <state width="2517" height="432" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
+    <state width="2517" height="432" key="GridCell.Tab.2.bottom" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
-    <state width="2517" height="292" key="GridCell.Tab.2.center" timestamp="1735225123113">
+    <state width="2517" height="432" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
+    <state width="2517" height="432" key="GridCell.Tab.2.center" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
-    <state width="2517" height="292" key="GridCell.Tab.2.left" timestamp="1735225123113">
+    <state width="2517" height="432" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
+    <state width="2517" height="432" key="GridCell.Tab.2.left" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
-    <state width="2517" height="292" key="GridCell.Tab.2.right" timestamp="1735225123113">
+    <state width="2517" height="432" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
+    <state width="2517" height="432" key="GridCell.Tab.2.right" timestamp="1735283158518">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="292" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
+    <state width="2517" height="432" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
     <state x="1079" y="413" key="RollbackChangesDialog" timestamp="1734501842073">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -380,10 +341,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1732701780265" />
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1734431532869">
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1735225245214">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1734431532869" />
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1735225245214" />
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1731750734819">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java

@@ -74,6 +74,9 @@ public class AppletLoginServiceImpl implements AppletLoginService {
             member.setAppletOpenid(wxOpenid);
             member.setNickName(loginReq.getNickName());
             member.setHeadImage(loginReq.getHeadimgurl());
+            if(null != loginReq.getShareId()){
+                member.setShareId(loginReq.getShareId());
+            }
             // 生成token返回给小程序端
             String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
             memberService.save(member);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java

@@ -32,7 +32,7 @@ public class RecommendController {
     @ApiOperation(value="我的推荐-获取推荐用户信息", notes="我的推荐-获取推荐用户信息")
     @RequestMapping(value = "/getInviteUser", method = {RequestMethod.GET})
     public Result<?> getInviteUser(@RequestHeader("X-Access-Token") String token){
-        return recommendService.getInviteCode(token);
+        return recommendService.getInviteUser(token);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java

@@ -11,4 +11,7 @@ public class WxQrCodeVo {
 
     @ApiModelProperty(value = "小程序名称")
     private String name;
+
+    @ApiModelProperty(value = "分享人id")
+    private String shareId;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java

@@ -11,4 +11,11 @@ public interface RecommendService {
      */
     public Result<?> getInviteCode(String token);
 
+    /**
+     * 获取个人推荐用户
+     * @param token
+     * @return
+     */
+    public Result<?> getInviteUser(String token);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java

@@ -14,6 +14,7 @@ import org.jeecg.modules.apiService.RecommendService;
 import org.jeecg.modules.carrentConfig.entity.CarrentConfig;
 import org.jeecg.modules.carrentConfig.service.ICarrentConfigService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -25,7 +26,9 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
 import java.io.*;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -40,6 +43,10 @@ public class RecommendServiceImpl implements RecommendService {
     @Resource
     private ICarrentConfigService carrentConfigService;
 
+    //配置信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
     private String appid = "wx1c95690b8180a150";//小程序appid
     private String secret = "7a686fb5308cca9ac0bc8cab14130cee";//小程序密钥
     private String endpoint = "oss-cn-guangzhou.aliyuncs.com";
@@ -47,7 +54,45 @@ public class RecommendServiceImpl implements RecommendService {
     private String secretKey = "XxExGallsV4O9nERHpVsQg2XtPCU7r";
     private String bucketName = "augcl";
     private String staticDomain = "https://img.augcl.com/";
+
     /*************************************************************************************/
+    @Override
+    public Result<?> getInviteUser(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String message = "";
+        //返回数据
+        Map<String, Object> map = new HashMap<>();
+        
+        try{
+            //获取直推用户
+            List<HanHaiMember> directUserList = hanHaiMemberService
+                    .lambdaQuery()
+                    .eq(HanHaiMember::getShareId, hanHaiMember.getId())
+                    .list();
+            map.put("directUserList", directUserList);
+
+            //获取间推用户
+            List<String> ids = new ArrayList<>();
+            for (HanHaiMember member : directUserList) {
+                ids.add(member.getId());
+            }
+            List<HanHaiMember> indirectUserList = hanHaiMemberService
+                    .lambdaQuery()
+                    .in(HanHaiMember::getShareId, ids)
+                    .list();
+            map.put("indirectUserList", indirectUserList);
+
+            return Result.OK(message, map);
+            
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.OK(message, map);
+        }
+
+    }
+    
 
     //获取个人推荐二维码
     @Override
@@ -142,6 +187,7 @@ public class RecommendServiceImpl implements RecommendService {
             WxQrCodeVo wxCodeVo = new WxQrCodeVo();
             wxCodeVo.setUrl(staticDomain+this.uploadAliYunOss(mf));
             wxCodeVo.setName("老环卫欢迎您");
+            wxCodeVo.setShareId(hanHaiMember.getId());
 
             return Result.OK(wxCodeVo);