Augcl
/
massage-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

接口上传： 

1、商家模块
2、积分模块
3、个人中心基础数据
master
Aug 2 months ago
parent
91fde444d1
commit
b710429ac9
40 changed files with 1685 additions and 203 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +85
    -187
      .idea/workspace.xml
  2. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
  3. +3
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java
  4. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
  6. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
  7. +3
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue
  8. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue
  9. +5
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts
  10. +171
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/controller/MassageScoreController.java
  11. +67
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/entity/MassageScore.java
  12. +17
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/MassageScoreMapper.java
  13. +5
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/xml/MassageScoreMapper.xml
  14. +14
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/IMassageScoreService.java
  15. +19
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/impl/MassageScoreServiceImpl.java
  16. +190
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/MassageScoreList.vue
  17. +119
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreForm.vue
  18. +84
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.Style#Drawer.vue
  19. +60
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.vue
  20. +61
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.api.ts
  21. +56
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.data.ts
  22. +162
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScoreList.vue
  23. +58
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/components/MassageScoreModal.vue
  24. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java
  25. +10
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java
  26. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java
  27. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java
  28. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java
  29. +12
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue
  30. +10
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue
  31. +23
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts
  32. +44
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java
  33. +59
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java
  34. +7
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java
  35. +18
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java
  36. +19
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShopService.java
  37. +3
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java
  38. +130
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java
  39. +133
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java
  40. +29
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java

+ 85
- 187
.idea/workspace.xml View File

@ -2,156 +2,27 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8b88b979-c3fa-4858-8fa6-d3a5d334cf69" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/admin-hanhai-vue/yarn.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/controller/MassageAreaController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/entity/MassageArea.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/mapper/MassageAreaMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/mapper/xml/MassageAreaMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/service/IMassageAreaService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/service/impl/MassageAreaServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/vue/MassageAreaList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/vue/modules/MassageAreaModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/vue3/MassageArea.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/vue3/MassageArea.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/vue3/MassageAreaList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageArea/vue3/components/MassageAreaModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/controller/MassageBannerController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/entity/MassageBanner.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/mapper/MassageBannerMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/mapper/xml/MassageBannerMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/service/IMassageBannerService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/service/impl/MassageBannerServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue/MassageBannerList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue/modules/MassageBannerForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue/modules/MassageBannerModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue/modules/MassageBannerModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue3/MassageBanner.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue3/MassageBanner.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue3/MassageBannerList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageBanner/vue3/components/MassageBannerModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/controller/MassageCategoryController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/entity/MassageCategory.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/mapper/MassageCategoryMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/mapper/xml/MassageCategoryMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/service/IMassageCategoryService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/service/impl/MassageCategoryServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/vue/MassageCategoryList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/vue/modules/MassageCategoryModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/vue3/MassageCategory.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/vue3/MassageCategory.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/vue3/MassageCategoryList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageCategory/vue3/components/MassageCategoryModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/controller/MassageConfigController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/entity/MassageConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/mapper/MassageConfigMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/mapper/xml/MassageConfigMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/service/IMassageConfigService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/service/impl/MassageConfigServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue/MassageConfigList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue/modules/MassageConfigForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue/modules/MassageConfigModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue/modules/MassageConfigModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue3/MassageConfig.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue3/MassageConfig.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue3/MassageConfigList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageConfig/vue3/components/MassageConfigModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/controller/MassageFeedbackController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/entity/MassageFeedback.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/mapper/MassageFeedbackMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/mapper/xml/MassageFeedbackMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/service/IMassageFeedbackService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/service/impl/MassageFeedbackServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue/MassageFeedbackList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue/modules/MassageFeedbackForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue/modules/MassageFeedbackModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue/modules/MassageFeedbackModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue3/MassageFeedback.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue3/MassageFeedback.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue3/MassageFeedbackList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageFeedback/vue3/components/MassageFeedbackModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/controller/MassageItemController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/entity/MassageItem.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/mapper/MassageItemMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/mapper/xml/MassageItemMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/service/IMassageItemService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/service/impl/MassageItemServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue/MassageItemList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue/modules/MassageItemForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue/modules/MassageItemModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue/modules/MassageItemModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue3/MassageItem.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue3/MassageItem.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue3/MassageItemList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageItem/vue3/components/MassageItemModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/controller/MassageNoticeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/entity/MassageNotice.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/mapper/MassageNoticeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/mapper/xml/MassageNoticeMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/service/IMassageNoticeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/service/impl/MassageNoticeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue/MassageNoticeList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue/modules/MassageNoticeForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue/modules/MassageNoticeModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue/modules/MassageNoticeModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue3/MassageNotice.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue3/MassageNotice.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue3/MassageNoticeList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageNotice/vue3/components/MassageNoticeModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/controller/MassageOrderController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/entity/MassageOrder.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/mapper/MassageOrderMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/mapper/xml/MassageOrderMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/IMassageOrderService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/impl/MassageOrderServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/MassageOrderList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/modules/MassageOrderForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/modules/MassageOrderModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/modules/MassageOrderModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/MassageOrder.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/MassageOrder.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/MassageOrderList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/components/MassageOrderModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/xml/MassageShopMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShopList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/components/MassageShopModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ConfigController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ItemController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/NoticeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BannerService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ItemService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NoticeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BannerServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ItemServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NoticeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/controller/MassageScoreController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/entity/MassageScore.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/MassageScoreMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/xml/MassageScoreMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/IMassageScoreService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/impl/MassageScoreServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/MassageScoreList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreForm.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.Style#Drawer.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.api.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.data.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScoreList.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/components/MassageScoreModal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShopService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java" 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" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/public/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/TabLayout.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/TabLayout.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/UserLayout.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/UserLayout.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/page/GlobalHeader.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/page/GlobalHeader.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/tools/Logo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/tools/Logo.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.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" />
@ -160,9 +31,17 @@
<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-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/BannerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/BannerController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -314,7 +193,7 @@
<updated>1741573014101</updated>
<workItem from="1741573016746" duration="4323000" />
<workItem from="1741580646045" duration="5038000" />
<workItem from="1741852577555" duration="19886000" />
<workItem from="1741852577555" duration="27615000" />
</task>
<task id="LOCAL-00001" summary="1、项目初始化">
<created>1741919155045</created>
@ -323,7 +202,14 @@
<option name="project" value="LOCAL" />
<updated>1741919155045</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="接口上传：&#10;1、轮播图模块&#10;2、公告模块&#10;3、配置信息模块&#10;4、推拿项目模块&#10;5、订单模块&#10;6、个人信息模块">
<created>1742212951761</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1742212951761</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -343,17 +229,18 @@
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="1、项目初始化" />
<option name="LAST_COMMIT_MESSAGE" value="1、项目初始化" />
<MESSAGE value="接口上传：&#10;1、轮播图模块&#10;2、公告模块&#10;3、配置信息模块&#10;4、推拿项目模块&#10;5、订单模块&#10;6、个人信息模块" />
<option name="LAST_COMMIT_MESSAGE" value="接口上传：&#10;1、轮播图模块&#10;2、公告模块&#10;3、配置信息模块&#10;4、推拿项目模块&#10;5、订单模块&#10;6、个人信息模块" />
</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="1742210292501">
<state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1742294248753">
<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="1742210292501" />
<state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1742294248753" />
<state x="1033" y="316" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1742212198783">
<screen x="0" y="0" width="2560" height="1400" />
</state>
@ -362,70 +249,70 @@
<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="1741919145003">
<state x="679" y="297" key="CommitChangelistDialog2" timestamp="1742212949592">
<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="1741919145003" />
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1742201933217">
<state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1742212949592" />
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1742212685827">
<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="1742201933217" />
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1742212659703">
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1742212685827" />
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1742295892005">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1742212659702">
<state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742295892005" />
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1742295892005">
<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="1742212659702" />
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1742212659702">
<state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742295892005" />
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1742295892005">
<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="1742212659702" />
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742295892005" />
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1742295892005">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742295892005" />
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1742295964980">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742295964980" />
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1742295964980">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742295964980" />
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1742295964980">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742295964980" />
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1742295964980">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742295964980" />
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1742295891932">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742295891932" />
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1742295891932">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742295891932" />
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1742295891931">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1742212659703">
<state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742295891931" />
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1742295891932">
<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="1742212659703" />
<state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742295891932" />
<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="1741919166133">
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1742212959053">
<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="1741919166133" />
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1742212959053" />
<state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988">
<screen x="0" y="0" width="2560" height="1400" />
</state>
@ -439,4 +326,15 @@
</state>
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1742211424843" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java</url>
<line>92</line>
<option name="timeStamp" value="7" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java View File

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


+ 3
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: han_hai_member
* @Author: jeecg-boot
* @Date: 2025-03-17
* @Date: 2025-03-18
* @Version: V1.0
*/
@Data
@ -87,7 +87,8 @@ public class HanHaiMember implements Serializable {
@ApiModelProperty(value = "店铺名称备注")
private java.lang.String shopName;
/**角色*/
@Excel(name = "角色", width = 15)
@Excel(name = "角色", width = 15, dicCode = "role")
@Dict(dicCode = "role")
@ApiModelProperty(value = "角色")
private java.lang.String role;
/**ID标识号码*/


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java View File

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


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java View File

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


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

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


+ 3
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue View File

@ -99,6 +99,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import HanHaiMemberModal from './modules/HanHaiMemberModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'HanHaiMemberList',
@ -165,7 +166,7 @@
{
title:'角色',
align:"center",
dataIndex: 'role'
dataIndex: 'role_dictText'
},
{
title:'ID标识号码',
@ -347,7 +348,7 @@
fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''})
fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''})
fieldList.push({type:'string',value:'shopName',text:'店铺名称备注',dictCode:''})
fieldList.push({type:'string',value:'role',text:'角色',dictCode:''})
fieldList.push({type:'string',value:'role',text:'角色',dictCode:'role'})
fieldList.push({type:'string',value:'cardId',text:'ID标识号码',dictCode:''})
fieldList.push({type:'string',value:'frozenFlag',text:'是否冻结',dictCode:''})
fieldList.push({type:'string',value:'deleteFlag',text:'是否删除',dictCode:''})


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue View File

@ -45,7 +45,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
<a-input v-model="model.role" placeholder="请输入角色" ></a-input>
<j-dict-select-tag type="list" v-model="model.role" dictCode="role" placeholder="请选择角色" />
</a-form-model-item>
</a-col>
<a-col :span="24">


+ 5
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts View File

@ -48,7 +48,7 @@ export const columns: BasicColumn[] = [
{
title: '角色',
align:"center",
dataIndex: 'role'
dataIndex: 'role_dictText'
},
{
title: 'ID标识号码',
@ -239,7 +239,10 @@ export const formSchema: FormSchema[] = [
{
label: '角色',
field: 'role',
component: 'Input',
component: 'JDictSelectTag',
componentProps:{
dictCode:"role"
},
},
{
label: 'ID标识号码',


+ 171
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/controller/MassageScoreController.java View File

@ -0,0 +1,171 @@
package org.jeecg.modules.massageScore.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.massageScore.entity.MassageScore;
import org.jeecg.modules.massageScore.service.IMassageScoreService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 积分记录表
* @Author: jeecg-boot
* @Date: 2025-03-18
* @Version: V1.0
*/
@Api(tags="积分记录表")
@RestController
@RequestMapping("/massageScore/massageScore")
@Slf4j
public class MassageScoreController extends JeecgController<MassageScore, IMassageScoreService> {
@Autowired
private IMassageScoreService massageScoreService;
/**
* 分页列表查询
*
* @param massageScore
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "积分记录表-分页列表查询")
@ApiOperation(value="积分记录表-分页列表查询", notes="积分记录表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MassageScore>> queryPageList(MassageScore massageScore,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MassageScore> queryWrapper = QueryGenerator.initQueryWrapper(massageScore, req.getParameterMap());
Page<MassageScore> page = new Page<MassageScore>(pageNo, pageSize);
IPage<MassageScore> pageList = massageScoreService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param massageScore
* @return
*/
@AutoLog(value = "积分记录表-添加")
@ApiOperation(value="积分记录表-添加", notes="积分记录表-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MassageScore massageScore) {
massageScoreService.save(massageScore);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param massageScore
* @return
*/
@AutoLog(value = "积分记录表-编辑")
@ApiOperation(value="积分记录表-编辑", notes="积分记录表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody MassageScore massageScore) {
massageScoreService.updateById(massageScore);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "积分记录表-通过id删除")
@ApiOperation(value="积分记录表-通过id删除", notes="积分记录表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
massageScoreService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "积分记录表-批量删除")
@ApiOperation(value="积分记录表-批量删除", notes="积分记录表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.massageScoreService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "积分记录表-通过id查询")
@ApiOperation(value="积分记录表-通过id查询", notes="积分记录表-通过id查询")
@GetMapping(value = "/queryById")
public Result<MassageScore> queryById(@RequestParam(name="id",required=true) String id) {
MassageScore massageScore = massageScoreService.getById(id);
if(massageScore==null) {
return Result.error("未找到对应数据");
}
return Result.OK(massageScore);
}
/**
* 导出excel
*
* @param request
* @param massageScore
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MassageScore massageScore) {
return super.exportXls(request, massageScore, MassageScore.class, "积分记录表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MassageScore.class);
}
}

+ 67
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/entity/MassageScore.java View File

@ -0,0 +1,67 @@
package org.jeecg.modules.massageScore.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 积分记录表
* @Author: jeecg-boot
* @Date: 2025-03-18
* @Version: V1.0
*/
@Data
@TableName("massage_score")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="massage_score对象", description="积分记录表")
public class MassageScore implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**标题*/
@Excel(name = "标题", width = 15)
@ApiModelProperty(value = "标题")
private java.lang.String title;
/**积分*/
@Excel(name = "积分", width = 15)
@ApiModelProperty(value = "积分")
private java.math.BigDecimal score;
/**类型*/
@Excel(name = "类型", width = 15, dicCode = "score_type")
@Dict(dicCode = "score_type")
@ApiModelProperty(value = "类型")
private java.lang.String type;
/**关联用户id*/
@Excel(name = "关联用户id", width = 15)
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
}

+ 17
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/MassageScoreMapper.java View File

@ -0,0 +1,17 @@
package org.jeecg.modules.massageScore.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.massageScore.entity.MassageScore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 积分记录表
* @Author: jeecg-boot
* @Date: 2025-03-18
* @Version: V1.0
*/
public interface MassageScoreMapper extends BaseMapper<MassageScore> {
}

+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/xml/MassageScoreMapper.xml View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.massageScore.mapper.MassageScoreMapper">
</mapper>

+ 14
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/IMassageScoreService.java View File

@ -0,0 +1,14 @@
package org.jeecg.modules.massageScore.service;
import org.jeecg.modules.massageScore.entity.MassageScore;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 积分记录表
* @Author: jeecg-boot
* @Date: 2025-03-18
* @Version: V1.0
*/
public interface IMassageScoreService extends IService<MassageScore> {
}

+ 19
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/impl/MassageScoreServiceImpl.java View File

@ -0,0 +1,19 @@
package org.jeecg.modules.massageScore.service.impl;
import org.jeecg.modules.massageScore.entity.MassageScore;
import org.jeecg.modules.massageScore.mapper.MassageScoreMapper;
import org.jeecg.modules.massageScore.service.IMassageScoreService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 积分记录表
* @Author: jeecg-boot
* @Date: 2025-03-18
* @Version: V1.0
*/
@Service
public class MassageScoreServiceImpl extends ServiceImpl<MassageScoreMapper, MassageScore> implements IMassageScoreService {
}

+ 190
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/MassageScoreList.vue View File

@ -0,0 +1,190 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('积分记录表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<massage-score-modal ref="modalForm" @ok="modalFormOk"></massage-score-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MassageScoreModal from './modules/MassageScoreModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'MassageScoreList',
mixins:[JeecgListMixin, mixinDevice],
components: {
MassageScoreModal
},
data () {
return {
description: '积分记录表管理页面',
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'标题',
align:"center",
dataIndex: 'title'
},
{
title:'积分',
align:"center",
dataIndex: 'score'
},
{
title:'类型',
align:"center",
dataIndex: 'type_dictText'
},
{
title:'关联用户id',
align:"center",
dataIndex: 'userId'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/massageScore/massageScore/list",
delete: "/massageScore/massageScore/delete",
deleteBatch: "/massageScore/massageScore/deleteBatch",
exportXlsUrl: "/massageScore/massageScore/exportXls",
importExcelUrl: "massageScore/massageScore/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'BigDecimal',value:'score',text:'积分',dictCode:''})
fieldList.push({type:'string',value:'type',text:'类型',dictCode:'score_type'})
fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 119
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreForm.vue View File

@ -0,0 +1,119 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入标题" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="积分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="score">
<a-input-number v-model="model.score" placeholder="请输入积分" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<j-dict-select-tag type="list" v-model="model.type" dictCode="score_type" placeholder="请选择类型" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<a-input v-model="model.userId" placeholder="请输入关联用户id" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'MassageScoreForm',
components: {
},
props: {
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/massageScore/massageScore/add",
edit: "/massageScore/massageScore/edit",
queryById: "/massageScore/massageScore/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
// 触发表单验证
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<massage-score-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></massage-score-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import MassageScoreForm from './MassageScoreForm'
export default {
name: 'MassageScoreModal',
components: {
MassageScoreForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<massage-score-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></massage-score-form>
</j-modal>
</template>
<script>
import MassageScoreForm from './MassageScoreForm'
export default {
name: 'MassageScoreModal',
components: {
MassageScoreForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.api.ts View File

@ -0,0 +1,61 @@
import {defHttp} from '/@/utils/http/axios';
import {Modal} from 'ant-design-vue';
enum Api {
list = '/massageScore/massageScore/list',
save='/massageScore/massageScore/add',
edit='/massageScore/massageScore/edit',
deleteOne = '/massageScore/massageScore/delete',
deleteBatch = '/massageScore/massageScore/deleteBatch',
importExcel = '/massageScore/massageScore/importExcel',
exportXls = '/massageScore/massageScore/exportXls',
}
/**
* 导出api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* 导入api
*/
export const getImportUrl = Api.importExcel;
/**
* 列表接口
* @param params
*/
export const list = (params) =>
defHttp.get({url: Api.list, params});
/**
* 删除单个
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
* 批量删除
* @param params
*/
export const batchDelete = (params, handleSuccess) => {
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
* 保存或者更新
* @param params
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}

+ 56
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.data.ts View File

@ -0,0 +1,56 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '标题',
align:"center",
dataIndex: 'title'
},
{
title: '积分',
align:"center",
dataIndex: 'score'
},
{
title: '类型',
align:"center",
dataIndex: 'type_dictText'
},
{
title: '关联用户id',
align:"center",
dataIndex: 'userId'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '标题',
field: 'title',
component: 'Input',
},
{
label: '积分',
field: 'score',
component: 'InputNumber',
},
{
label: '类型',
field: 'type',
component: 'JDictSelectTag',
componentProps:{
dictCode:"score_type"
},
},
{
label: '关联用户id',
field: 'userId',
component: 'Input',
},
];

+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScoreList.vue View File

@ -0,0 +1,162 @@
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="checkedKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<MassageScoreModal @register="registerModal" @success="handleSuccess"></MassageScoreModal>
</div>
</template>
<script lang="ts" name="massageScore-massageScore" setup>
import {ref, computed, unref} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'
import MassageScoreModal from './components/MassageScoreModal.vue'
import {columns, searchFormSchema} from './massageScore.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './massageScore.api';
const checkedKeys = ref<Array<string | number>>([]);
//注册model
const [registerModal, {openModal}] = useModal();
//注册table数据
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{
title: '积分记录表',
api: list,
columns,
canResize:false,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter:true,
showAdvancedButton:true,
fieldMapToTime: [
],
},
actionColumn: {
width: 120,
},
},
exportConfig: {
name:"积分记录表",
url: getExportUrl,
},
importConfig: {
url: getImportUrl
},
})
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({id: record.id}, reload);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ids: checkedKeys.value}, reload);
}
/**
* 成功回调
*/
function handleSuccess() {
reload();
}
/**
* 操作栏
*/
function getTableAction(record){
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record){
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
</script>
<style scoped>
</style>

+ 58
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/components/MassageScoreModal.vue View File

@ -0,0 +1,58 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../massageScore.data';
import {saveOrUpdate} from '../massageScore.api';
// Emits声明
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
//表单配置
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
});
//表单赋值
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//重置表单
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//表单赋值
await setFieldsValue({
...data.record,
});
}
// 隐藏底部时禁用整个表单
setProps({ disabled: !data?.showFooter })
});
//设置标题
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
//表单提交事件
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//提交表单
await saveOrUpdate(values, isUpdate.value);
//关闭弹窗
closeModal();
//刷新列表
emit('success');
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
</style>

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java View File

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


+ 10
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 商户信息表
* @Author: jeecg-boot
* @Date: 2025-03-17
* @Date: 2025-03-18
* @Version: V1.0
*/
@Data
@ -79,6 +79,15 @@ public class MassageShop implements Serializable {
@Excel(name = "纬度", width = 15)
@ApiModelProperty(value = "纬度")
private java.lang.Double latitude;
/**审核状态*/
@Excel(name = "审核状态", width = 15, dicCode = "audit_status")
@Dict(dicCode = "audit_status")
@ApiModelProperty(value = "审核状态")
private java.lang.String status;
/**审核备注*/
@Excel(name = "审核备注", width = 15)
@ApiModelProperty(value = "审核备注")
private java.lang.String remark;
/**关联用户id*/
@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 商户信息表
* @Author: jeecg-boot
* @Date: 2025-03-17
* @Date: 2025-03-18
* @Version: V1.0
*/
public interface MassageShopMapper extends BaseMapper<MassageShop> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 商户信息表
* @Author: jeecg-boot
* @Date: 2025-03-17
* @Date: 2025-03-18
* @Version: V1.0
*/
public interface IMassageShopService extends IService<MassageShop> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 商户信息表
* @Author: jeecg-boot
* @Date: 2025-03-17
* @Date: 2025-03-18
* @Version: V1.0
*/
@Service


+ 12
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue View File

@ -163,6 +163,16 @@
align:"center",
dataIndex: 'latitude'
},
{
title:'审核状态',
align:"center",
dataIndex: 'status_dictText'
},
{
title:'审核备注',
align:"center",
dataIndex: 'remark'
},
{
title:'关联用户id',
align:"center",
@ -210,6 +220,8 @@
fieldList.push({type:'string',value:'address',text:'详细地址',dictCode:''})
fieldList.push({type:'double',value:'longitude',text:'经度',dictCode:''})
fieldList.push({type:'double',value:'latitude',text:'纬度',dictCode:''})
fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'audit_status'})
fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''})
fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
this.superFieldList = fieldList
}


+ 10
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue View File

@ -43,6 +43,16 @@
<a-input-number v-model="model.latitude" placeholder="请输入纬度" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<j-dict-select-tag type="list" v-model="model.status" dictCode="audit_status" placeholder="请选择审核状态" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="审核备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
<a-input v-model="model.remark" placeholder="请输入审核备注" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />


+ 23
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts View File

@ -45,6 +45,16 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'latitude'
},
{
title: '审核状态',
align:"center",
dataIndex: 'status_dictText'
},
{
title: '审核备注',
align:"center",
dataIndex: 'remark'
},
{
title: '关联用户id',
align:"center",
@ -101,6 +111,19 @@ export const formSchema: FormSchema[] = [
field: 'latitude',
component: 'InputNumber',
},
{
label: '审核状态',
field: 'status',
component: 'JDictSelectTag',
componentProps:{
dictCode:"audit_status"
},
},
{
label: '审核备注',
field: 'remark',
component: 'Input',
},
{
label: '关联用户id',
field: 'userId',


+ 44
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java View File

@ -0,0 +1,44 @@
package org.jeecg.modules.api.massageController;
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.apiBean.PageBean;
import org.jeecg.modules.apiService.ScoreService;
import org.jeecg.modules.apiService.ShopService;
import org.jeecg.modules.massageScore.entity.MassageScore;
import org.jeecg.modules.massageShop.entity.MassageShop;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@Api(tags="积分-积分相关接口")
@RestController
@RequestMapping("/massage/score")
@Slf4j
public class ScoreController {
/******************************************************************************************************************/
//积分
@Resource
private ScoreService scoreService;
/******************************************************************************************************************/
//查看积分列表
@ApiOperation(value="积分-查询积分列表", notes="积分-查询积分列表")
@RequestMapping(value = "/queryScoreList", method = {RequestMethod.GET})
public Result<?> queryScoreList(@RequestHeader("X-Access-Token") String token, MassageScore massageScore, PageBean pageBean){
return scoreService.queryScoreList(token, massageScore, pageBean);
}
//签到获取积分
@ApiOperation(value="积分-签到获取积分", notes="积分-签到获取积分")
@RequestMapping(value = "/sign", method = {RequestMethod.POST})
public Result<?> sign(@RequestHeader("X-Access-Token") String token){
return scoreService.sign(token);
}
}

+ 59
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java View File

@ -0,0 +1,59 @@
package org.jeecg.modules.api.massageController;
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.apiBean.PageBean;
import org.jeecg.modules.apiService.OrderService;
import org.jeecg.modules.apiService.ShopService;
import org.jeecg.modules.massageOrder.entity.MassageOrder;
import org.jeecg.modules.massageShop.entity.MassageShop;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@Api(tags="商家合作-商家相关接口")
@RestController
@RequestMapping("/massage/shop")
@Slf4j
public class ShopController {
/******************************************************************************************************************/
//商家
@Resource
private ShopService shopService;
/******************************************************************************************************************/
//查看商家列表
@ApiOperation(value="商家-查询商家列表", notes="商家-查询商家列表")
@RequestMapping(value = "/queryShopList", method = {RequestMethod.GET})
public Result<?> queryShopList(@RequestHeader("X-Access-Token") String token, MassageShop massageShop, PageBean pageBean){
return shopService.queryShopList(token, massageShop, pageBean);
}
//查看商家详情
@ApiOperation(value="商家-查询商家详情", notes="商家-查询商家详情")
@RequestMapping(value = "/queryShopById", method = {RequestMethod.GET})
public Result<?> queryShopById(@RequestHeader("X-Access-Token") String token, String id){
return shopService.queryShopById(token, id);
}
//新增商家信息
@ApiOperation(value="商家-新增商家信息", notes="商家-新增商家信息")
@RequestMapping(value = "/addShop", method = {RequestMethod.POST})
public Result<?> addShop(@RequestHeader("X-Access-Token") String token, MassageShop massageShop){
return shopService.addShop(token, massageShop);
}
//修改商家信息
@ApiOperation(value="商家-修改商家信息", notes="商家-修改商家信息")
@RequestMapping(value = "/updateShop", method = {RequestMethod.POST})
public Result<?> updateShop(@RequestHeader("X-Access-Token") String token, MassageShop massageShop){
return shopService.updateShop(token, massageShop);
}
}

+ 7
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java View File

@ -36,4 +36,11 @@ public class UserInfoController {
return userInfoService.updateUserInfo(token, nickName, phone, headImage);
}
//获取个人中心基础数据信息
@ApiOperation(value="获取个人中心基础数据信息", notes="获取个人中心基础数据信息")
@RequestMapping(value = "/getUserCenterData", method = {RequestMethod.GET})
public Result<?> getUserCenterData(@RequestHeader("X-Access-Token") String token){
return userInfoService.getUserCenterData(token);
}
}

+ 18
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java View File

@ -0,0 +1,18 @@
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.jeecg.modules.massageScore.entity.MassageScore;
import org.jeecg.modules.massageShop.entity.MassageShop;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
public interface ScoreService {
//查看积分列表
public Result<?> queryScoreList(@RequestHeader("X-Access-Token") String token, MassageScore massageScore, PageBean pageBean);
//签到获取积分
public Result<?> sign(@RequestHeader("X-Access-Token") String token);
}

+ 19
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShopService.java View File

@ -0,0 +1,19 @@
package org.jeecg.modules.apiService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.massageShop.entity.MassageShop;
public interface ShopService {
//查看商家列表
public Result<?> queryShopList(String token, MassageShop massageShop, PageBean pageBean);
//查看商家详情
public Result<?> queryShopById(String token, String id);
//新增商家信息
public Result<?> addShop(String token, MassageShop massageShop);
//修改商家信息
public Result<?> updateShop(String token, MassageShop massageShop);
}

+ 3
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java View File

@ -8,4 +8,7 @@ public interface UserInfoService {
//修改个人信息接口
Result<?> updateUserInfo(String token,String nickName,String phone,String headImage);
//获取个人中心基础数据信息
Result<?> getUserCenterData(String token);
}

+ 130
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java View File

@ -0,0 +1,130 @@
package org.jeecg.modules.apiService.impl;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.config.shiro.ShiroRealm;
import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.apiService.ScoreService;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
import org.jeecg.modules.massageConfig.entity.MassageConfig;
import org.jeecg.modules.massageConfig.service.IMassageConfigService;
import org.jeecg.modules.massageScore.entity.MassageScore;
import org.jeecg.modules.massageScore.service.IMassageScoreService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
@Service
public class ScoreServiceImpl implements ScoreService {
/******************************************************************************************************************/
//权限验证
@Resource
private ShiroRealm shiroRealm;
//积分信息
@Resource
private IMassageScoreService massageScoreService;
//配置信息
@Resource
private IMassageConfigService massageConfigService;
//配置信息
@Resource
private IHanHaiMemberService hanHaiMemberService;
/******************************************************************************************************************/
//查看积分列表
@Override
public Result<?> queryScoreList(String token, MassageScore massageScore, PageBean pageBean) {
//权限验证
//HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
//返回信息
String massege = "";
//分页信息
Page<MassageScore> page = null;
//查询信息
LambdaQueryChainWrapper<MassageScore> query = null;
//返回信息
Page<MassageScore> pageList = null;
try{
//分页
page = new Page<MassageScore>(pageBean.getPageNo(), pageBean.getPageSize());
query = massageScoreService
.lambdaQuery();
//组装查询条件
if(StringUtils.isNotBlank(massageScore.getType())){
//积分类型
query.eq(MassageScore::getType, massageScore.getType());
}
//积分所属
query.eq(MassageScore::getUserId, hanHaiMember.getId());
//按照排序编号降序排列
query.orderByDesc(MassageScore::getCreateTime);
//获取商家信息
pageList = query.page(page);
return Result.OK("积分列表", pageList);
}catch (Exception e){
e.printStackTrace();
return Result.error("积分列表查询失败");
}
}
//签到获取积分
@Override
public Result<?> sign(String token) {
//权限验证
//HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
//返回信息
String massege = "";
try{
//获取签到积分数量
MassageConfig config = massageConfigService
.lambdaQuery()
.eq(MassageConfig::getParamCode, "config_sign_score")
.one();
//积分对象
MassageScore score = new MassageScore();
score.setUserId(hanHaiMember.getId());
score.setTitle("签到积分");
score.setType("0");
int configScore = Integer.parseInt(config.getParamValueText());
BigDecimal addScore = BigDecimal.valueOf(configScore);
score.setScore(addScore);
//新增积分记录
boolean result1 = massageScoreService.save(score);
//判断是否新增成功
if(!result1){
return Result.error("签到失败");
}
//修改用户积分
BigDecimal oldScore = hanHaiMember.getIntegerPrice();
BigDecimal newScore = oldScore.add(addScore);
hanHaiMember.setIntegerPrice(newScore);
boolean result2 = hanHaiMemberService.updateById(hanHaiMember);
if(result2){
return Result.OK("签到成功");
}else {
return Result.error("签到失败");
}
}catch (Exception e){
e.printStackTrace();
return Result.error("签到失败");
}
}
}

+ 133
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java View File

@ -0,0 +1,133 @@
package org.jeecg.modules.apiService.impl;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.apiService.ShopService;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.jeecg.modules.massageItem.entity.MassageItem;
import org.jeecg.modules.massageItem.service.IMassageItemService;
import org.jeecg.modules.massageOrder.entity.MassageOrder;
import org.jeecg.modules.massageShop.entity.MassageShop;
import org.jeecg.modules.massageShop.service.IMassageShopService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class ShopServiceImpl implements ShopService {
/******************************************************************************************************************/
//推拿项目信息
@Resource
private IMassageShopService massageShopService;
/******************************************************************************************************************/
//查看商家列表
@Override
public Result<?> queryShopList(String token, MassageShop massageShop, PageBean pageBean) {
//返回信息
String massege = "";
//分页信息
Page<MassageShop> page = null;
//查询信息
LambdaQueryChainWrapper<MassageShop> query = null;
//返回信息
Page<MassageShop> pageList = null;
try{
//分页
page = new Page<MassageShop>(pageBean.getPageNo(), pageBean.getPageSize());
query = massageShopService
.lambdaQuery();
//组装查询条件
if(StringUtils.isNotBlank(massageShop.getShop())){
//店铺名称
query.like(MassageShop::getShop, massageShop.getShop());
}
if(StringUtils.isNotBlank(massageShop.getStatus())){
//审核状态
query.eq(MassageShop::getStatus, massageShop.getStatus());
}
//按照排序编号升序排列
query.orderByDesc(MassageShop::getCreateTime);
//获取商家信息
pageList = query.page(page);
return Result.OK("商家列表", pageList);
}catch (Exception e){
e.printStackTrace();
return Result.error("商家列表查询失败");
}
}
//查看商家详情
@Override
public Result<?> queryShopById(String token, String id) {
//返回信息
String massege = "";
try{
MassageShop one = massageShopService
.lambdaQuery()
.eq(MassageShop::getId, id)
.one();
return Result.OK("商家详情", one);
}catch (Exception e){
e.printStackTrace();
return Result.error("商家详情查询失败");
}
}
//新增商家信息
@Override
public Result<?> addShop(String token, MassageShop massageShop) {
//返回信息
String massege = "";
try{
//执行新增操作
boolean result = massageShopService.save(massageShop);
//判断是否新增成功
if(result){
return Result.OK("商家信息添加成功");
}else {
return Result.OK("商家信息添加失败");
}
}catch (Exception e){
e.printStackTrace();
return Result.error("商家信息添加失败");
}
}
//修改商家信息
@Override
public Result<?> updateShop(String token, MassageShop massageShop) {
//返回信息
String massege = "";
try{
//执行新增操作
boolean result = massageShopService.updateById(massageShop);
//判断是否新增成功
if(result){
return Result.OK("商家信息修改成功");
}else {
return Result.OK("商家信息修改失败");
}
}catch (Exception e){
e.printStackTrace();
return Result.error("商家信息修改失败");
}
}
}

+ 29
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java View File

@ -9,6 +9,8 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@Service
public class UserInfoServiceImpl implements UserInfoService {
@ -62,4 +64,31 @@ public class UserInfoServiceImpl implements UserInfoService {
return Result.error("修改失败");
}
}
//获取个人中心基础数据信息
@Override
public Result<?> getUserCenterData(String token){
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//返回信息
Map map = new HashMap();
try{
//组装个人基础数据
map.put("member",hanHaiMember);//用户基础信息
map.put("score",hanHaiMember.getIntegerPrice());//积分
map.put("balance",hanHaiMember.getPrice());//余额
//推广佣金
//优惠券
return Result.OK("获取个人中心基础数据信息",map);
}catch (Exception e){
e.printStackTrace();
return Result.error("获取个人中心基础数据信息失败",map);
}
}
}

Write Preview
Loading…
Cancel
Save