1、推广模块

.idea/workspace.xml

@@ -2,39 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8b88b979-c3fa-4858-8fa6-d3a5d334cf69" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/controller/MassageVipComboController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/entity/MassageVipCombo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/MassageVipComboMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/xml/MassageVipComboMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/IMassageVipComboService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/impl/MassageVipComboServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/MassageVipComboList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.Style#Drawer.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.api.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipComboList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/components/MassageVipComboModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/controller/MassageVipRecordController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/entity/MassageVipRecord.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/MassageVipRecordMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/xml/MassageVipRecordMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/IMassageVipRecordService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/impl/MassageVipRecordServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/MassageVipRecordList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.Style#Drawer.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.api.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecordList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/components/MassageVipRecordModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/VipController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/RecommendController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.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/ShareServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -186,7 +165,7 @@
       <updated>1741573014101</updated>
       <workItem from="1741573016746" duration="4323000" />
       <workItem from="1741580646045" duration="5038000" />
-      <workItem from="1741852577555" duration="32701000" />
+      <workItem from="1741852577555" duration="35144000" />
     </task>
     <task id="LOCAL-00001" summary="1、项目初始化">
       <created>1741919155045</created>
@@ -230,7 +209,14 @@
       <option name="project" value="LOCAL" />
       <updated>1742348334919</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="1、会员中心模块">
+      <created>1742350758458</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1742350758458</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -255,89 +241,90 @@
     <MESSAGE value="1、积分模块修改" />
     <MESSAGE value="1、小程序推广二维码" />
     <MESSAGE value="1、接口备注规范调整" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、接口备注规范调整" />
+    <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="1741573453098">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1741573453098" />
-    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1742349989646">
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1742351338865">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1742349989646" />
-    <state x="1033" y="316" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1742212198783">
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1742351338865" />
+    <state x="1033" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1742351128151">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1033" y="316" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1742212198783" />
+    <state x="1033" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1742351128151" />
     <state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1741587414527">
       <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="1741587414527" />
-    <state x="679" y="297" key="CommitChangelistDialog2" timestamp="1742350723481">
+    <state x="679" y="297" key="CommitChangelistDialog2" timestamp="1742350757755">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1742350723481" />
+    <state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1742350757755" />
     <state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1742296412150">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1742296412150" />
-    <state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1742351850756">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850756" />
+    <state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1742351850756">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850756" />
+    <state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1742351850756">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850756" />
+    <state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1742351850756">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850756" />
+    <state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1742351850667">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850667" />
+    <state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1742351850667">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850667" />
+    <state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1742351850667">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850667" />
+    <state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1742351850667">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850667" />
+    <state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1742351850668">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850668" />
+    <state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1742351850667">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850667" />
+    <state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1742351850667">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
-    <state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1742350697137">
+    <state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850667" />
+    <state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1742351850667">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742350697137" />
+    <state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742351850667" />
     <state x="783" y="345" key="SettingsEditor" timestamp="1741573035388">
       <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="1741573035388" />
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1742348337399">
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1742350761290">
       <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="1742348337399" />
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1742350761290" />
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-18
+ * @Date:   2025-03-19
  * @Version: V1.0
  */
 @Api(tags="han_hai_member")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-18
+ * @Date:   2025-03-19
  * @Version: V1.0
  */
 @Data
@@ -160,7 +160,8 @@ public class HanHaiMember implements Serializable {
     @ApiModelProperty(value = "shareId")
     private java.lang.String shareId;
 	/**邀请人*/
-	@Excel(name = "邀请人", width = 15)
+	@Excel(name = "邀请人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "邀请人")
     private java.lang.String vid;
 	/**邀请时间*/
@@ -201,4 +202,12 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "是否分销商", width = 15)
     @ApiModelProperty(value = "是否分销商")
     private java.lang.String isDai;
+	/**推广佣金*/
+	@Excel(name = "推广佣金", width = 15)
+    @ApiModelProperty(value = "推广佣金")
+    private java.math.BigDecimal recommendAmount;
+	/**被推广佣金*/
+	@Excel(name = "被推广佣金", width = 15)
+    @ApiModelProperty(value = "被推广佣金")
+    private java.math.BigDecimal recommendedAmount;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-18
+ * @Date:   2025-03-19
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-18
+ * @Date:   2025-03-19
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-03-18
+ * @Date:   2025-03-19
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -256,7 +256,7 @@
           {
             title:'邀请人',
             align:"center",
-            dataIndex: 'vid'
+            dataIndex: 'vid_dictText'
           },
           {
             title:'邀请时间',
@@ -306,6 +306,16 @@
             align:"center",
             dataIndex: 'isDai'
           },
+          {
+            title:'推广佣金',
+            align:"center",
+            dataIndex: 'recommendAmount'
+          },
+          {
+            title:'被推广佣金',
+            align:"center",
+            dataIndex: 'recommendedAmount'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -366,7 +376,7 @@
         fieldList.push({type:'int',value:'successNum',text:'successNum',dictCode:''})
         fieldList.push({type:'int',value:'addNum',text:'addNum',dictCode:''})
         fieldList.push({type:'string',value:'shareId',text:'shareId',dictCode:''})
-        fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''})
+        fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'date',value:'vtime',text:'邀请时间'})
         fieldList.push({type:'int',value:'isPay',text:'兼兼街会员',dictCode:''})
         fieldList.push({type:'int',value:'follow',text:'是否关注公众号',dictCode:''})
@@ -376,6 +386,8 @@
         fieldList.push({type:'string',value:'appletAppid',text:'小程序appid',dictCode:''})
         fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
         fieldList.push({type:'string',value:'isDai',text:'是否分销商',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'recommendAmount',text:'推广佣金',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'recommendedAmount',text:'被推广佣金',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -135,7 +135,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="邀请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vid">
-              <a-input v-model="model.vid" placeholder="请输入邀请人"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.vid" dictCode="han_hai_member,nick_name,id" placeholder="请选择邀请人" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -183,6 +183,16 @@
               <a-input v-model="model.isDai" placeholder="请输入是否分销商"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="推广佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recommendAmount">
+              <a-input-number v-model="model.recommendAmount" placeholder="请输入推广佣金" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="被推广佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recommendedAmount">
+              <a-input-number v-model="model.recommendedAmount" placeholder="请输入被推广佣金" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -138,7 +138,7 @@ export const columns: BasicColumn[] = [
    {
     title: '邀请人',
     align:"center",
-    dataIndex: 'vid'
+    dataIndex: 'vid_dictText'
    },
    {
     title: '邀请时间',
@@ -188,6 +188,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'isDai'
    },
+   {
+    title: '推广佣金',
+    align:"center",
+    dataIndex: 'recommendAmount'
+   },
+   {
+    title: '被推广佣金',
+    align:"center",
+    dataIndex: 'recommendedAmount'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -332,7 +342,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '邀请人',
     field: 'vid',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
   },
   {
     label: '邀请时间',
@@ -379,4 +392,14 @@ export const formSchema: FormSchema[] = [
     field: 'isDai',
     component: 'Input',
   },
+  {
+    label: '推广佣金',
+    field: 'recommendAmount',
+    component: 'InputNumber',
+  },
+  {
+    label: '被推广佣金',
+    field: 'recommendedAmount',
+    component: 'InputNumber',
+  },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java → jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/RecommendController.java

@@ -4,7 +4,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiService.ShareService;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.RecommendService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -12,23 +14,32 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
-@Api(tags="我的-邀请好友相关接口")
+@Api(tags="我的-邀请好友&我的团队相关接口")
 @RestController
 @RequestMapping("/massage/share")
 @Slf4j
-public class ShareController {
+public class RecommendController {
 
     /******************************************************************************************************************/
     //邀请好友
     @Resource
-    private ShareService shareService;
+    private RecommendService recommendService;
     /******************************************************************************************************************/
 
-    //我的-邀请好友
-    @ApiOperation(value="我的-邀请好友", notes="我的-邀请好友")
+    //邀请好友-获取推荐二维码
+    @ApiOperation(value="邀请好友-获取推荐二维码", notes="邀请好友-获取推荐二维码")
     @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST})
     public Result<?> getInviteCode(@RequestHeader("X-Access-Token") String token){
-        return shareService.getInviteCode(token);
+        return recommendService.getInviteCode(token);
     }
 
+    //我的团队-查询直推用户列表
+    @ApiOperation(value="我的团队-查询直推用户列表", notes="我的-获取直推用户列表")
+    @RequestMapping(value = "/queryRecommendUserList", method = {RequestMethod.POST})
+    public Result<?> queryRecommendUserList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return recommendService.queryRecommendUserList(token, pageBean);
+    }
+
+
+
 }

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

@@ -0,0 +1,16 @@
+package org.jeecg.modules.apiService;
+
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public interface RecommendService {
+    //邀请好友-获取推荐二维码
+    public Result<?> getInviteCode(String token);
+
+    //我的团队-查询直推用户列表
+    public Result<?> queryRecommendUserList(String token, PageBean pageBean);
+}

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

@@ -1,8 +0,0 @@
-package org.jeecg.modules.apiService;
-
-import org.jeecg.common.api.vo.Result;
-
-public interface ShareService {
-    //我的-邀请好友
-    public Result<?> getInviteCode(String token);
-}

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

@@ -4,15 +4,20 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.HttpClientUtil;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiBean.WxQrCodeVo;
-import org.jeecg.modules.apiService.ShareService;
+import org.jeecg.modules.apiService.RecommendService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.massageBanner.entity.MassageBanner;
 import org.jeecg.modules.massageConfig.entity.MassageConfig;
 import org.jeecg.modules.massageConfig.service.IMassageConfigService;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,7 +36,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Service
-public class ShareServiceImpl implements ShareService {
+public class RecommendServiceImpl implements RecommendService {
     /*************************************************************************************/
     //权限验证
     @Resource
@@ -183,6 +188,42 @@ public class ShareServiceImpl implements ShareService {
         return null;
     }
 
+    //我的团队-查询直推用户列表
+    @Override
+    public Result<?> queryRecommendUserList(String token, PageBean pageBean) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<HanHaiMember> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<HanHaiMember> query = null;
+        //返回信息
+        Page<HanHaiMember> pageList = null;
+
+        try{
+            //分页
+            page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = hanHaiMemberService
+                    .lambdaQuery();
+
+            //组装查询条件
+            query.eq(HanHaiMember::getVid, hanHaiMember.getId());
+
+            //按照创建时间降序排列
+            query.orderByAsc(HanHaiMember::getCreateTime);
+
+            //获取直推用户信息
+            pageList = query.page(page);
+
+            return Result.OK("直推用户列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("直推用户列表查询失败");
+        }
+    }
+
     /**
      * 获取令牌
      *