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

1、商品信息添加审核状态、审核备注以及年限修改 

2、商品发布添加修改、删除、查询详情功能
3、预约订单添加修改、删除、查询详情功能
master
Aug 11 months ago
parent
f5c6e8e971
commit
51a0cc8536
18 changed files with 610 additions and 152 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +112
    -57
      .idea/workspace.xml
  2. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java
  3. +30
    -14
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java
  4. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java
  6. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java
  7. +42
    -13
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue
  8. +18
    -8
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue
  9. +56
    -18
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts
  10. +14
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java
  11. +6
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java
  12. +12
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java
  13. +16
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java
  14. +8
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java
  15. +16
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java
  16. +91
    -12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java
  17. +97
    -16
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java
  18. +88
    -9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java

+ 112
- 57
.idea/workspace.xml View File

@ -2,13 +2,25 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="74ae82f3-7b81-42e8-8b53-827e18cc7011" name="Default Changelist" comment="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)">
<change afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -75,7 +87,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/admin-hanhai-vue/src/assets" />
<property name="nodejs_package_manager_path" value="yarn" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" />
@ -94,6 +106,8 @@
<recent name="org.jeecg.modules.api.carrentController" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\Projects\carrent-admin\admin-hanhai-vue\src\assets" />
<recent name="D:\Projects\carrent-admin\admin-hanhai-vue\src\views" />
<recent name="D:\Projects\carrent-admin\jeecg-boot-module-system\src\main\java\org\jeecg\modules\apiBean" />
</key>
</component>
@ -148,7 +162,7 @@
<workItem from="1733103883735" duration="17631000" />
<workItem from="1733710180531" duration="11896000" />
<workItem from="1733968817518" duration="63976000" />
<workItem from="1735284739666" duration="277000" />
<workItem from="1735284739666" duration="62276000" />
</task>
<task id="LOCAL-00001" summary="1、项目初始化">
<created>1731385713383</created>
@ -227,7 +241,49 @@
<option name="project" value="LOCAL" />
<updated>1735225242451</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="1、添加推荐模块">
<created>1735285049727</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1735285049727</updated>
</task>
<task id="LOCAL-00013" summary="1、个人实名接口修复">
<created>1735570015599</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1735570015599</updated>
</task>
<task id="LOCAL-00014" summary="1、企业实名接口修正">
<created>1735615674903</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1735615674903</updated>
</task>
<task id="LOCAL-00015" summary="1、配置表描述修改&#10;2、商品/新闻列表按创建时间倒序查询">
<created>1735631439711</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1735631439711</updated>
</task>
<task id="LOCAL-00016" summary="1、金刚区模块补充">
<created>1735924191233</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1735924191233</updated>
</task>
<task id="LOCAL-00017" summary="1、修改后台图标&#10;2、一级分类去掉导入、导出、高级查询按钮&#10;3、补充个人/企业实名查询接口">
<created>1736255981275</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1736255981275</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -258,7 +314,13 @@
<MESSAGE value="1、接口添加" />
<MESSAGE value="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)" />
<MESSAGE value="1、接口补充" />
<option name="LAST_COMMIT_MESSAGE" value="1、接口补充" />
<MESSAGE value="1、添加推荐模块" />
<MESSAGE value="1、个人实名接口修复" />
<MESSAGE value="1、企业实名接口修正" />
<MESSAGE value="1、配置表描述修改&#10;2、商品/新闻列表按创建时间倒序查询" />
<MESSAGE value="1、金刚区模块补充" />
<MESSAGE value="1、修改后台图标&#10;2、一级分类去掉导入、导出、高级查询按钮&#10;3、补充个人/企业实名查询接口" />
<option name="LAST_COMMIT_MESSAGE" value="1、修改后台图标&#10;2、一级分类去掉导入、导出、高级查询按钮&#10;3、补充个人/企业实名查询接口" />
</component>
<component name="WindowStateProjectService">
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1731382591329">
@ -277,74 +339,74 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1733992136886" />
<state x="713" y="297" key="CommitChangelistDialog2" timestamp="1735225241244">
<state x="713" y="297" key="CommitChangelistDialog2" timestamp="1736420920282">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1735225241244" />
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1735225183505">
<state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1736420920282" />
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1736420918924">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1735225183505" />
<state width="2517" height="432" key="GridCell.Tab.0.bottom" timestamp="1735283158612">
<state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1736420918924" />
<state width="2517" height="432" key="GridCell.Tab.0.bottom" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
<state width="2517" height="432" key="GridCell.Tab.0.center" timestamp="1735283158612">
<state width="2517" height="432" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.0.center" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
<state width="2517" height="432" key="GridCell.Tab.0.left" timestamp="1735283158612">
<state width="2517" height="432" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.0.left" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
<state width="2517" height="432" key="GridCell.Tab.0.right" timestamp="1735283158612">
<state width="2517" height="432" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.0.right" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158612" />
<state width="2517" height="432" key="GridCell.Tab.1.bottom" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.1.bottom" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state width="2517" height="432" key="GridCell.Tab.1.center" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.1.center" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state width="2517" height="432" key="GridCell.Tab.1.left" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.1.left" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state width="2517" height="432" key="GridCell.Tab.1.right" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.1.right" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state width="2517" height="432" key="GridCell.Tab.2.bottom" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.2.bottom" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state width="2517" height="432" key="GridCell.Tab.2.center" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.2.center" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state width="2517" height="432" key="GridCell.Tab.2.left" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.2.left" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state width="2517" height="432" key="GridCell.Tab.2.right" timestamp="1735283158518">
<state width="2517" height="432" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state width="2517" height="432" key="GridCell.Tab.2.right" timestamp="1736420924827">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="2517" height="432" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735283158518" />
<state x="1079" y="413" key="RollbackChangesDialog" timestamp="1734501842073">
<state width="2517" height="432" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1736420924827" />
<state x="1079" y="413" key="RollbackChangesDialog" timestamp="1735568417191">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1079" y="413" key="RollbackChangesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1734501842073" />
<state x="1079" y="413" key="RollbackChangesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1735568417191" />
<state x="783" y="345" key="SettingsEditor" timestamp="1732701780265">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1732701780265" />
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1735225245214">
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1736255984876">
<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="1735225245214" />
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1736255984876" />
<state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1731750734819">
<screen x="0" y="0" width="2560" height="1400" />
</state>
@ -353,28 +415,21 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1074" y="618" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1735193649268" />
<state x="900" y="426" width="759" height="548" key="find.popup" timestamp="1734501255473">
<state x="834" y="439" width="892" height="566" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1736330759910">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1734501255473" />
<state x="834" y="439" width="892" height="566" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.2560.1400@0.0.2560.1400" timestamp="1736330759910" />
<state x="900" y="426" width="759" height="548" key="find.popup" timestamp="1735469231757">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1735469231757" />
<state x="921" y="426" width="700" height="530" key="recent.locations.popup" timestamp="1733992805258">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="921" y="426" width="700" height="530" key="recent.locations.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1733992805258" />
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1735224695948">
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1736326185586">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1735224695948" />
</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/ConfigServiceImpl.java</url>
<line>237</line>
<option name="timeStamp" value="6" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1736326185586" />
</component>
</project>

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

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


+ 30
- 14
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java View File

@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -20,7 +21,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 商品信息表
* @Author: jeecg-boot
* @Date: 2025-01-07
* @Date: 2025-01-08
* @Version: V1.0
*/
@Data
@ -67,12 +68,10 @@ public class CarrentGoods implements Serializable {
@Excel(name = "品牌", width = 15)
@ApiModelProperty(value = "品牌")
private java.lang.String brand;
/**时间*/
@Excel(name = "时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "时间")
private java.util.Date goodsTime;
/**年限*/
@Excel(name = "年限", width = 15)
@ApiModelProperty(value = "年限")
private java.lang.Integer goodsTime;
/**公里数*/
@Excel(name = "公里数", width = 15)
@ApiModelProperty(value = "公里数")
@ -81,14 +80,14 @@ public class CarrentGoods implements Serializable {
@Excel(name = "型号", width = 15)
@ApiModelProperty(value = "型号")
private java.lang.String model;
/**详情*/
@Excel(name = "详情", width = 15)
@ApiModelProperty(value = "详情")
private java.lang.String detail;
/**库存*/
@Excel(name = "库存", width = 15)
@ApiModelProperty(value = "库存")
private java.lang.Integer inventory;
/**详情*/
@Excel(name = "详情", width = 15)
@ApiModelProperty(value = "详情")
private java.lang.String detail;
/**车辆照片(前)*/
@Excel(name = "车辆照片(前)", width = 15)
@ApiModelProperty(value = "车辆照片(前)")
@ -121,10 +120,15 @@ public class CarrentGoods implements Serializable {
@Excel(name = "所在区域", width = 15)
@ApiModelProperty(value = "所在区域")
private java.lang.String area;
/**关联商品类型id*/
@Excel(name = "关联商品类型id", width = 15, dictTable = "carrent_categoryone", dicText = "name", dicCode = "id")
/**审核状态*/
@Excel(name = "审核状态", width = 15, dicCode = "authentic_status")
@Dict(dicCode = "authentic_status")
@ApiModelProperty(value = "审核状态")
private java.lang.String status;
/**关联一级分类id*/
@Excel(name = "关联一级分类id", width = 15, dictTable = "carrent_categoryone", dicText = "name", dicCode = "id")
@Dict(dictTable = "carrent_categoryone", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "关联商品类型id")
@ApiModelProperty(value = "关联一级分类id")
private java.lang.String cartypeId;
/**关联二级分类id*/
@Excel(name = "关联二级分类id", width = 15, dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id")
@ -136,4 +140,16 @@ public class CarrentGoods implements Serializable {
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
/**审核备注*/
@Excel(name = "审核备注", width = 15)
@ApiModelProperty(value = "审核备注")
private java.lang.String remark;
//一级分类名称
@TableField(exist = false)
private java.lang.String categoryoneName;
//二级分类名称
@TableField(exist = false)
private java.lang.String categorytwoName;
}

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

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 商品信息表
* @Author: jeecg-boot
* @Date: 2025-01-07
* @Date: 2025-01-08
* @Version: V1.0
*/
public interface CarrentGoodsMapper extends BaseMapper<CarrentGoods> {


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

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 商品信息表
* @Author: jeecg-boot
* @Date: 2025-01-07
* @Date: 2025-01-08
* @Version: V1.0
*/
public interface ICarrentGoodsService extends IService<CarrentGoods> {


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

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


+ 42
- 13
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue View File

@ -4,6 +4,26 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="审核状态">
<j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.status" dictCode="authentic_status"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="关联一级分类id">
<j-dict-select-tag placeholder="请选择关联一级分类id" v-model="queryParam.cartypeId" dictCode="carrent_categoryone,name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -149,12 +169,9 @@
dataIndex: 'brand'
},
{
title:'时间',
title:'年限',
align:"center",
dataIndex: 'goodsTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
dataIndex: 'goodsTime'
},
{
title:'公里数',
@ -167,14 +184,14 @@
dataIndex: 'model'
},
{
title:'详情',
title:'库存',
align:"center",
dataIndex: 'detail'
dataIndex: 'inventory'
},
{
title:'库存',
title:'详情',
align:"center",
dataIndex: 'inventory'
dataIndex: 'detail'
},
{
title:'车辆照片(前)',
@ -222,7 +239,12 @@
dataIndex: 'area'
},
{
title:'关联商品类型id',
title:'审核状态',
align:"center",
dataIndex: 'status_dictText'
},
{
title:'关联一级分类id',
align:"center",
dataIndex: 'cartypeId_dictText'
},
@ -236,6 +258,11 @@
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'审核备注',
align:"center",
dataIndex: 'remark'
},
{
title: '操作',
dataIndex: 'action',
@ -275,11 +302,11 @@
fieldList.push({type:'BigDecimal',value:'price',text:'商品价格',dictCode:''})
fieldList.push({type:'int',value:'views',text:'浏览量',dictCode:''})
fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''})
fieldList.push({type:'date',value:'goodsTime',text:'时间'})
fieldList.push({type:'int',value:'goodsTime',text:'年限',dictCode:''})
fieldList.push({type:'int',value:'mileage',text:'公里数',dictCode:''})
fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
fieldList.push({type:'Text',value:'detail',text:'详情',dictCode:''})
fieldList.push({type:'int',value:'inventory',text:'库存',dictCode:''})
fieldList.push({type:'Text',value:'detail',text:'详情',dictCode:''})
fieldList.push({type:'Text',value:'imageFront',text:'车辆照片(前)',dictCode:''})
fieldList.push({type:'Text',value:'imageBack',text:'车辆照片(后)',dictCode:''})
fieldList.push({type:'Text',value:'imageLeft',text:'车辆照片(左)',dictCode:''})
@ -288,9 +315,11 @@
fieldList.push({type:'string',value:'userName',text:'联系人',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'联系人电话',dictCode:''})
fieldList.push({type:'string',value:'area',text:'所在区域',dictCode:''})
fieldList.push({type:'string',value:'cartypeId',text:'关联商品类型id',dictCode:"carrent_categoryone,name,id"})
fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'authentic_status'})
fieldList.push({type:'string',value:'cartypeId',text:'关联一级分类id',dictCode:"carrent_categoryone,name,id"})
fieldList.push({type:'string',value:'categorytwoId',text:'关联二级分类id',dictCode:"carrent_categorytwo,name,id"})
fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''})
this.superFieldList = fieldList
}
}


+ 18
- 8
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue View File

@ -29,8 +29,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsTime">
<j-date placeholder="请选择时间" v-model="model.goodsTime" style="width: 100%" />
<a-form-model-item label="年限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsTime">
<a-input-number v-model="model.goodsTime" placeholder="请输入年限" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -44,13 +44,13 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
<a-input v-model="model.detail" placeholder="请输入详情" ></a-input>
<a-form-model-item label="库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventory">
<a-input-number v-model="model.inventory" placeholder="请输入库存" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventory">
<a-input-number v-model="model.inventory" placeholder="请输入库存" style="width: 100%" />
<a-form-model-item label="详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
<a-input v-model="model.detail" placeholder="请输入详情" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -94,8 +94,13 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联商品类型id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cartypeId">
<j-dict-select-tag type="list" v-model="model.cartypeId" dictCode="carrent_categoryone,name,id" placeholder="请选择关联商品类型id" />
<a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<j-dict-select-tag type="list" v-model="model.status" dictCode="authentic_status" placeholder="请选择审核状态" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联一级分类id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cartypeId">
<j-dict-select-tag type="list" v-model="model.cartypeId" dictCode="carrent_categoryone,name,id" placeholder="请选择关联一级分类id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -108,6 +113,11 @@
<j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
</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-row>
</a-form-model>
</j-form-container>


+ 56
- 18
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts View File

@ -31,12 +31,9 @@ export const columns: BasicColumn[] = [
dataIndex: 'brand'
},
{
title: '时间',
title: '年限',
align:"center",
dataIndex: 'goodsTime',
customRender:({text}) =>{
return !text?"":(text.length>10?text.substr(0,10):text)
},
dataIndex: 'goodsTime'
},
{
title: '公里数',
@ -49,14 +46,14 @@ export const columns: BasicColumn[] = [
dataIndex: 'model'
},
{
title: '详情',
title: '库存',
align:"center",
dataIndex: 'detail'
dataIndex: 'inventory'
},
{
title: '库存',
title: '详情',
align:"center",
dataIndex: 'inventory'
dataIndex: 'detail'
},
{
title: '车辆照片(前)',
@ -104,7 +101,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'area'
},
{
title: '关联商品类型id',
title: '审核状态',
align:"center",
dataIndex: 'status_dictText'
},
{
title: '关联一级分类id',
align:"center",
dataIndex: 'cartypeId_dictText'
},
@ -118,9 +120,32 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'userId_dictText'
},
{
title: '审核备注',
align:"center",
dataIndex: 'remark'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
label: "审核状态",
field: "status",
component: 'JDictSelectTag',
componentProps:{
dictCode:"authentic_status"
},
colProps: {span: 6},
},
{
label: "关联一级分类id",
field: "cartypeId",
component: 'JDictSelectTag',
componentProps:{
dictCode:"carrent_categoryone,name,id"
},
colProps: {span: 6},
},
];
//表单数据
export const formSchema: FormSchema[] = [
@ -152,9 +177,9 @@ export const formSchema: FormSchema[] = [
component: 'Input',
},
{
label: '时间',
label: '年限',
field: 'goodsTime',
component: 'DatePicker',
component: 'InputNumber',
},
{
label: '公里数',
@ -166,16 +191,16 @@ export const formSchema: FormSchema[] = [
field: 'model',
component: 'Input',
},
{
label: '详情',
field: 'detail',
component: 'Input',
},
{
label: '库存',
field: 'inventory',
component: 'InputNumber',
},
{
label: '详情',
field: 'detail',
component: 'Input',
},
{
label: '车辆照片(前)',
field: 'imageFront',
@ -227,7 +252,15 @@ export const formSchema: FormSchema[] = [
component: 'Input',
},
{
label: '关联商品类型id',
label: '审核状态',
field: 'status',
component: 'JDictSelectTag',
componentProps:{
dictCode:"authentic_status"
},
},
{
label: '关联一级分类id',
field: 'cartypeId',
component: 'JDictSelectTag',
componentProps:{
@ -250,4 +283,9 @@ export const formSchema: FormSchema[] = [
dictCode:"han_hai_member,nick_name,id"
},
},
{
label: '审核备注',
field: 'remark',
component: 'Input',
},
];

+ 14
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java View File

@ -32,8 +32,14 @@ public class ApplyController {
return applyService.queryApplyList(token, pageBean);
}
// @ApiOperation(value="寻车申请-申请详情", notes="寻车申请-申请详情")
// @RequestMapping(value = "/queryApplyById", method = {RequestMethod.GET})
// public Result<?> queryApplyById(@RequestHeader("X-Access-Token") String token, String applyId){
// return applyService.queryApplyById(token, applyId);
// }
@ApiOperation(value="寻车申请-添加申请", notes="寻车申请-添加申请")
@RequestMapping(value = "/addApply", method = {RequestMethod.GET})
@RequestMapping(value = "/addApply", method = {RequestMethod.POST})
public Result<?> addApply(@RequestHeader("X-Access-Token") String token, CarrentApply carrentApply){
String message = "";
@ -58,4 +64,11 @@ public class ApplyController {
}
// @ApiOperation(value="寻车申请-删除申请", notes="寻车申请-删除申请")
// @RequestMapping(value = "/deleteApply", method = {RequestMethod.POST})
// public Result<?> deleteApply(@RequestHeader("X-Access-Token") String token, String applyId){
// return applyService.deleteApply(token, applyId);
//
// }
}

+ 6
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java View File

@ -79,4 +79,10 @@ public class GoodsController {
return Result.error(message);
}
@ApiOperation(value="商品信息-车辆信息删除", notes="商品信息-车辆信息删除")
@RequestMapping(value = "/deleteGoods", method = {RequestMethod.POST})
public Result<?> deleteGoods(@RequestHeader("X-Access-Token") String token, String goodsId){
return goodsService.deleteGoods(token, goodsId);
}
}

+ 12
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java View File

@ -32,6 +32,12 @@ public class OrderController {
return orderService.queryOrderList(token, typeId, pageBean);
}
// @ApiOperation(value="车辆预约-车辆预约详情", notes="车辆预约-车辆预约详情")
// @RequestMapping(value = "/queryOrderById", method = {RequestMethod.GET})
// public Result<?> queryOrderById(@RequestHeader("X-Access-Token") String token, String orderId){
// return orderService.queryOrderById(token, orderId);
// }
@ApiOperation(value="车辆预约-提交预约信息", notes="车辆预约-提交预约信息")
@RequestMapping(value = "/addOrder", method = {RequestMethod.POST})
public Result<?> addOrder(@RequestHeader("X-Access-Token") String token, CarrentOrder carrentOrder){
@ -53,4 +59,10 @@ public class OrderController {
return Result.error(message);
}
// @ApiOperation(value="车辆预约-删除预约信息", notes="车辆预约-删除预约信息")
// @RequestMapping(value = "/deleteOrder", method = {RequestMethod.POST})
// public Result<?> deleteOrder(@RequestHeader("X-Access-Token") String token, String orderId){
// return orderService.deleteOrder(token, orderId);
// }
}

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

@ -15,6 +15,14 @@ public interface ApplyService {
*/
public Result<?> queryApplyList(@RequestHeader("X-Access-Token") String token, PageBean pageBean);
/**
* 寻车申请-申请详情
* @param token
* @param applyId
* @return
*/
public Result<?> queryApplyById(String token, String applyId);
/**
* 寻车申请-添加申请
* @param token
@ -23,4 +31,12 @@ public interface ApplyService {
*/
public Result<?> addApply(@RequestHeader("X-Access-Token") String token, CarrentApply carrentApply);
/**
* 寻车申请-删除申请
* @param token
* @param applyId
* @return
*/
public Result<?> deleteApply(String token, String applyId);
}

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

@ -30,4 +30,12 @@ public interface GoodsService {
*/
public Result<?> addGoods(String token, CarrentGoods goods);
/**
* 商品信息-车辆信息删除
* @param token
* @param goodsId
* @return
*/
public Result<?> deleteGoods(String token, String goodsId);
}

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

@ -16,6 +16,14 @@ public interface OrderService {
*/
public Result<?> queryOrderList(@RequestHeader("X-Access-Token") String token, String typeId, PageBean pageBean);
/**
* 商品预约-查看预约详情
* @param token
* @param orderId
* @return
*/
public Result<?> queryOrderById(String token, String orderId);
/**
* 商品预约-提交预约信息
* @param token
@ -24,4 +32,12 @@ public interface OrderService {
*/
public Result<?> addOrder(String token, CarrentOrder carrentOrder);
/**
* 商品预约-删除预约信息
* @param token
* @param orderId
* @return
*/
public Result<?> deleteOrder(String token, String orderId);
}

+ 91
- 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java View File

@ -7,6 +7,9 @@ import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.apiService.ApplyService;
import org.jeecg.modules.carrentApply.entity.CarrentApply;
import org.jeecg.modules.carrentApply.service.ICarrentApplyService;
import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
import org.jeecg.modules.carrentOrder.service.ICarrentOrderService;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.springframework.stereotype.Service;
@ -28,12 +31,12 @@ public class ApplyServiceImpl implements ApplyService {
//寻车申请-申请列表
@Override
public Result<?> queryApplyList(String token, PageBean pageBean) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//返回信息
String message = "寻车申请列表查询失败!";
//新闻列表
Page<CarrentApply> pageList = null;
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
try{
//分页
@ -60,30 +63,106 @@ public class ApplyServiceImpl implements ApplyService {
}
}
//寻车申请-根据id获取申请详情
@Override
public Result<?> queryApplyById(String token, String applyId) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//返回信息
String message = "获取寻车申请详情失败！";
//寻车申请详情
CarrentApply one = null;
try{
//获取寻车申请详情
one = carrentApplyService
.lambdaQuery()
.eq(CarrentApply::getUserId, hanHaiMember.getId())
.eq(CarrentApply::getId, applyId)
.one();
//判断执行结果
if(null != one){
message = "寻车申请详情信息";
}else {
message = "寻车申请详情信息为空";
}
//返回执行结果
return Result.OK(message, one);
}catch (Exception e){
//错误信息打印
e.printStackTrace();
return Result.error(message, one);
}
}
//寻车申请-添加申请
@Override
public Result<?> addApply(String token, CarrentApply carrentApply) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//返回信息
String message = "添加申请失败";
String message = "寻车申请添加失败";
//执行结果
boolean result = false;
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
carrentApply.setUserId(hanHaiMember.getId());
try{
//执行寻车申请添加
result = carrentApplyService.save(carrentApply);
CarrentApply apply = null;
//判断执行结果
if(result){
message = "添加申请成功！";
if(null != carrentApply.getId()){
//查询商品信息
apply = carrentApplyService.getById(carrentApply.getId());
}
if(null != apply){
//修改商品信息
carrentApply.setId(apply.getId());
result = carrentApplyService.updateById(carrentApply);
message = "寻车申请信息修改成功！";
}else {
message = "添加申请失败！";
//添加商品信息
carrentApply.setUserId(hanHaiMember.getId());
result = carrentApplyService.save(carrentApply);
message = "寻车申请信息提交成功！";
}
//返回执行结果
if(result){
return Result.OK(message);
}else {
return Result.error(message);
}
}catch (Exception e){
//错误信息打印
e.printStackTrace();
return Result.OK(message);
}
}
//寻车申请-删除申请
@Override
public Result<?> deleteApply(String token, String applyId) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//返回信息
String message = "寻车申请删除失败";
//执行结果
boolean result = false;
try{
//执行删除申请操作
result = carrentApplyService.removeById(applyId);
//返回执行结果
if(result){
message = "寻车申请删除成功";
return Result.OK(message);
}else {
return Result.error(message);
}
}catch (Exception e){
//错误信息打印


+ 97
- 16
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java View File

@ -6,12 +6,21 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.config.shiro.ShiroRealm;
import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.apiService.GoodsService;
import org.jeecg.modules.carrentCategoryone.entity.CarrentCategoryone;
import org.jeecg.modules.carrentCategoryone.service.ICarrentCategoryoneService;
import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo;
import org.jeecg.modules.carrentCategorytwo.service.ICarrentCategorytwoService;
import org.jeecg.modules.carrentCompany.entity.CarrentCompany;
import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
import org.jeecg.modules.carrentGoods.service.ICarrentGoodsService;
import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
import org.jeecg.modules.carrentOrder.service.ICarrentOrderService;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@Service
public class GoodsServiceImpl implements GoodsService {
@ -24,6 +33,18 @@ public class GoodsServiceImpl implements GoodsService {
@Resource
private ICarrentGoodsService carrentGoodsService;
//一级分类信息
@Resource
private ICarrentCategoryoneService carrentCategoryoneService;
//一级分类信息
@Resource
private ICarrentCategorytwoService carrentCategorytwoService;
//车辆预约信息
@Resource
private ICarrentOrderService carrentOrderService;
/*************************************************************************************/
//商品信息-获取商品列表
@Override
@ -50,17 +71,21 @@ public class GoodsServiceImpl implements GoodsService {
query.eq(CarrentGoods::getCategorytwoId, goods.getCategorytwoId());
}
if(null != goods.getGoodsTime()){
//时间
query.le(CarrentGoods::getGoodsTime, goods.getGoodsTime());
//时间 大于：ge、gt
query.ge(CarrentGoods::getGoodsTime, goods.getGoodsTime());
}
if(null != goods.getMileage()){
//公里数
query.between(CarrentGoods::getMileage, 0, goods.getMileage());
//公里数 小于：le、lt
query.le(CarrentGoods::getMileage, goods.getMileage());
}
if(null != goods.getGoodsName()){
//商品名称
query.like(CarrentGoods::getGoodsName, goods.getGoodsName());
}
if(null != goods.getStatus()){
//审核状态(0-审核中 1-已通过 2-未通过)
query.eq(CarrentGoods::getStatus, goods.getStatus());
}
if(null != token){
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
@ -102,6 +127,24 @@ public class GoodsServiceImpl implements GoodsService {
//获取商品信息详情
one = carrentGoodsService.getById(goodsId);
//获取一级分类列表
List<CarrentCategoryone> categoryoneList = carrentCategoryoneService.list();
for (CarrentCategoryone categoryone : categoryoneList) {
if(one.getCartypeId().equals(categoryone.getId())){
one.setCategoryoneName(categoryone.getName());
break;
}
}
//获取二级分类列表
List<CarrentCategorytwo> categorytwoList = carrentCategorytwoService.list();
for (CarrentCategorytwo categorytwo : categorytwoList) {
if(one.getCategorytwoId().equals(categorytwo.getId())){
one.setCategorytwoName(categorytwo.getName());
break;
}
}
//判断执行结果
if(null != one){
message = "商品详情信息";
@ -122,30 +165,68 @@ public class GoodsServiceImpl implements GoodsService {
@Override
public Result<?> addGoods(String token, CarrentGoods goods) {
//返回信息
String message = "车辆信息发布失败！";
//执行结果
boolean flag = false;
String message = "车辆信息发布失败";
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
goods.setUserId(hanHaiMember.getId());
try{
//获取商品信息详情
flag = carrentGoodsService.save(goods);
//判断执行结果
if(flag){
message = "车辆信息发布成功";
CarrentGoods carrentGoods = null;
if(null != goods.getId()){
//查询商品信息
carrentGoods = carrentGoodsService.getById(goods.getId());
}
if(null != carrentGoods){
//修改商品信息
goods.setId(carrentGoods.getId());
goods.setStatus("0");
carrentGoodsService.updateById(goods);
message = "车辆发布信息修改成功！";
}else {
message = "车辆信息发布失败";
//添加商品信息
goods.setUserId(hanHaiMember.getId());
boolean result = carrentGoodsService.save(goods);
message = "车辆发布成功！";
}
return Result.OK(message);
}catch (Exception e){
e.printStackTrace();
return Result.error(message);
}
}
//商品信息-车辆信息删除
@Override
public Result<?> deleteGoods(String token, String goodsId) {
String message = "车辆删除失败";
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
try{
//1、删除车辆相关的预约信息
List<CarrentOrder> orderList = carrentOrderService
.lambdaQuery()
.eq(CarrentOrder::getGoodsId, goodsId)
.list();
List<String> orderIds = new ArrayList<>();
for (CarrentOrder order : orderList) {
orderIds.add(order.getId());
}
carrentOrderService.removeByIds(orderIds);
//2、执行车辆删除操作
boolean result = carrentGoodsService.removeById(goodsId);
message = "车辆删除成功";
//返回执行结果
return Result.OK(message);
}catch (Exception e){
//错误信息打印
e.printStackTrace();
return Result.error(message);
}
}
}

+ 88
- 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java View File

@ -6,6 +6,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.config.shiro.ShiroRealm;
import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.apiService.OrderService;
import org.jeecg.modules.carrentApply.entity.CarrentApply;
import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
import org.jeecg.modules.carrentGoods.service.ICarrentGoodsService;
import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
@ -63,32 +64,110 @@ public class OrderServiceImpl implements OrderService {
return Result.OK("预约列表", pageList);
}
//寻车申请-根据id获取预约信息详情
@Override
public Result<?> queryOrderById(String token, String orderId) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//返回信息
String message = "获取预约信息详情失败！";
//预约信息详情
CarrentOrder one = null;
try{
//获取预约信息详情
one = carrentOrderService
.lambdaQuery()
.eq(CarrentOrder::getUserId, hanHaiMember.getId())
.eq(CarrentOrder::getId, orderId)
.one();
//判断执行结果
if(null != one){
//获取预约车辆信息
CarrentGoods carrentGoods = carrentGoodsService.getById(one.getGoodsId());
one.setCarrentGoods(carrentGoods);
message = "预约信息详情";
}else {
message = "预约信息详情为空";
}
//返回执行结果
return Result.OK(message, one);
}catch (Exception e){
//错误信息打印
e.printStackTrace();
return Result.error(message, one);
}
}
//商品预约-提交预约信息
@Override
public Result<?> addOrder(String token, CarrentOrder carrentOrder) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
carrentOrder.setUserId(hanHaiMember.getId());
//返回信息
String message = "预约信息提交失败";
//执行结果
boolean result = false;
try{
//执行预约信息提交
result = carrentOrderService.save(carrentOrder);
CarrentOrder order = null;
//判断执行结果
if(null != carrentOrder.getId()){
//查询商品信息
order = carrentOrderService.getById(carrentOrder.getId());
}
if(null != order){
//修改商品信息
carrentOrder.setId(order.getId());
result = carrentOrderService.updateById(carrentOrder);
message = "预约信息修改成功！";
}else {
//添加商品信息
carrentOrder.setUserId(hanHaiMember.getId());
result = carrentOrderService.save(carrentOrder);
message = "预约提交成功！";
}
//返回执行结果
if(result){
message = "预约信息提交成功！";
return Result.OK(message);
}else {
message = "预约信息提交失败！";
return Result.error(message);
}
}catch (Exception e){
//错误信息打印
e.printStackTrace();
return Result.error(message);
}
}
//商品预约-提交预约信息
@Override
public Result<?> deleteOrder(String token, String orderId) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//返回信息
String message = "预约信息删除失败";
//执行结果
boolean result = false;
try{
//执行预约信息删除操作
result = carrentOrderService.removeById(orderId);
//返回执行结果
return Result.OK(message);
if(result){
message = "预约信息删除成功";
return Result.OK(message);
}else {
return Result.error(message);
}
}catch (Exception e){
//错误信息打印


Write Preview
Loading…
Cancel
Save