Selaa lähdekoodia

feat(app): 优化课程和场地相关功能

- 在 CourseInfoVO 中添加教练相关信息
- 优化场地列表查询,增加票务判断逻辑
- 调整课程详情查询 SQL
- 新增 OrderController 和 OrderServiceImpl
SheepHy 2 viikkoa sitten
vanhempi
commit
75ab950e75

+ 2 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PlaceVO.java

@@ -24,6 +24,8 @@ public class PlaceVO extends Page<PlaceVO> {
     private String comments;
     @Schema(description = "地址")
     private String address;
+    @Schema(description = "图片")
+    private String cover;
     @Schema(description = "距离(KM)")
     private double km;
     @Schema(description = "是否有票")

+ 6 - 6
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppSitePriceRulesController.java

@@ -67,7 +67,7 @@ public class AppSitePriceRulesController extends JeecgController<AppSitePriceRul
 	 */
 	@AutoLog(value = "场地价格规则表-添加")
 	@Operation(summary="场地价格规则表-添加")
-	@RequiresPermissions("org.jeecg.modules.app:nm_site_peice_rules:add")
+	@RequiresPermissions("org.jeecg.modules.app:nm_site_price_rules:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody AppSitePriceRules appSitePriceRules) {
 		appSitePriceRulesService.save(appSitePriceRules);
@@ -83,7 +83,7 @@ public class AppSitePriceRulesController extends JeecgController<AppSitePriceRul
 	 */
 	@AutoLog(value = "场地价格规则表-编辑")
 	@Operation(summary="场地价格规则表-编辑")
-	@RequiresPermissions("org.jeecg.modules.app:nm_site_peice_rules:edit")
+	@RequiresPermissions("org.jeecg.modules.app:nm_site_price_rules:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody AppSitePriceRules appSitePriceRules) {
 		appSitePriceRulesService.updateById(appSitePriceRules);
@@ -98,7 +98,7 @@ public class AppSitePriceRulesController extends JeecgController<AppSitePriceRul
 	 */
 	@AutoLog(value = "场地价格规则表-通过id删除")
 	@Operation(summary="场地价格规则表-通过id删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_site_peice_rules:delete")
+	@RequiresPermissions("org.jeecg.modules.app:nm_site_price_rules:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		appSitePriceRulesService.removeById(id);
@@ -113,7 +113,7 @@ public class AppSitePriceRulesController extends JeecgController<AppSitePriceRul
 	 */
 	@AutoLog(value = "场地价格规则表-批量删除")
 	@Operation(summary="场地价格规则表-批量删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_site_peice_rules:deleteBatch")
+	@RequiresPermissions("org.jeecg.modules.app:nm_site_price_rules:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.appSitePriceRulesService.removeByIds(Arrays.asList(ids.split(",")));
@@ -143,7 +143,7 @@ public class AppSitePriceRulesController extends JeecgController<AppSitePriceRul
     * @param request
     * @param appSitePriceRules
     */
-    @RequiresPermissions("org.jeecg.modules.app:nm_site_peice_rules:exportXls")
+    @RequiresPermissions("org.jeecg.modules.app:nm_site_price_rules:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AppSitePriceRules appSitePriceRules) {
         return super.exportXls(request, appSitePriceRules, AppSitePriceRules.class, "场地价格规则表");
@@ -156,7 +156,7 @@ public class AppSitePriceRulesController extends JeecgController<AppSitePriceRul
     * @param response
     * @return
     */
-    @RequiresPermissions("org.jeecg.modules.app:nm_site_peice_rules:importExcel")
+    @RequiresPermissions("org.jeecg.modules.app:nm_site_price_rules:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AppSitePriceRules.class);

+ 18 - 14
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppSiteMapper.xml

@@ -3,28 +3,32 @@
 <mapper namespace="org.jeecg.modules.system.app.mapper.AppSiteMapper">
     <select id="getPlaceList" resultType="org.jeecg.modules.app.vo.PlaceVO">
         SELECT
-            a.id,
-            a.name,
-            a.good_rate AS goodRate,
-            a.address,
-            a.category_id,
-            a.latitude,
-            a.longitude
-        FROM nm_site a LEFT JOIN sys_depart b ON a.tenant_id = b.id WHERE 1=1
+        b.id,
+        b.NAME,
+        b.good_rate AS goodRate,
+        b.address,
+        b.category_id,
+        b.latitude,
+        b.longitude,
+        a.cover
+        FROM
+        nm_site_place a
+        LEFT JOIN nm_site b ON a.site_id = b.id
+        LEFT JOIN sys_depart c ON b.tenant_id = c.id
         <if test="venueType != null and venueType == '0-1'">
-            ORDER BY a.good_rate DESC
+            ORDER BY b.good_rate DESC
         </if>
         <if test="venueType != null and venueType == '1-1'">
-            AND b.org_category = 2
+            AND c.org_category = 2
         </if>
         <if test="venueType != null and venueType == '1-2'">
-            AND b.org_category = 2 ORDER BY  a.good_rate DESC
+            AND c.org_category = 2 ORDER BY  b.good_rate DESC
         </if>
         <if test="venueType != null and venueType == '2-1'">
-            AND b.org_category = 3
+            AND c.org_category = 3
         </if>
         <if test="venueType != null and venueType == '2-2'">
-            AND b.org_category = 3 ORDER BY  a.good_rate DESC
+            AND c.org_category = 3 ORDER BY  b.good_rate DESC
         </if>
     </select>
 
@@ -39,7 +43,7 @@
         CASE
         WHEN EXISTS (
         SELECT SUM(inventory)
-        FROM nm_site_peice_rules e
+        FROM nm_site_price_rules e
         WHERE e.site_place_id = a.id
         ) THEN 1
         ELSE 0