Browse Source

refactor(app): 移除订单人员详细表相关代码

- 删除了 AppOrderUserController、AppOrderUserServiceImpl 和 IAppOrderUserService 类- 在 OrderController 中添加了新的学校场地预约创建方法
- 在
SheepHy 1 week ago
parent
commit
3f18fcab6a

+ 14 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/OrderController.java

@@ -73,4 +73,18 @@ public class OrderController {
     public Result<OrderVO.PreviewOrderPlaceGymnasiumChartered> previewOrderPlaceGymnasiumChartered(@RequestParam("courseId") @Schema(description = "课程ID")List<String> rulesId){
         return Result.ok(appOrderService.previewOrderPlaceGymnasiumChartered(rulesId));
     }
+
+    /**
+     * @Author SheepHy
+     * @Description 学校场地预约-创建
+     * @Date 10:10 2025/7/14
+     * @Param rulesId 时间段ID
+     * @return OrderVO.createOrderPlaceSchool
+     **/
+    @Operation(summary="学校场地预约-创建")
+    @PostMapping("/createOrderPlaceSchool")
+    public Result<OrderVO.createOrderPlaceSchool> createOrderPlaceSchool(@RequestParam("rulesId") @Schema(description = "场次IDS多个逗号拼接")String rulesId,
+                                                                         @RequestParam("userIds") @Schema(description = "使用用户IDS多个逗号拼接")String userIds){
+        return Result.ok(appOrderService.createOrderPlaceSchool(rulesId, userIds));
+    }
 }

+ 5 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -44,6 +44,8 @@ public class OrderServiceImpl implements IOrderService {
     private AppSiteMapper appSiteMapper;
     @Resource
     private AppIsinMapper appIsinMapper;
+    @Resource
+    private FamilyMembersMapper familyMembersMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -63,7 +65,8 @@ public class OrderServiceImpl implements IOrderService {
             information.setId(appIsin.getId())
                     .setCouponCode(appIsin.getIsinCode())
                     .setCouponStatus(appIsin.getIsinStatus())
-                    .setExpireTime(appIsin.getExpireTime());
+                    .setExpireTime(appIsin.getExpireTime())
+                    .setUserName(familyMembersMapper.selectById(appIsin.getFamilyId()).getFullName());
             couponNumberInformation.add(information);
         });
         result.setId(order.getId())
@@ -80,7 +83,7 @@ public class OrderServiceImpl implements IOrderService {
                 .setCreateTime(order.getCreateTime())
                 .setPayTime(order.getPayTime())
                 .setCouponNumberInformation(couponNumberInformation);
-        return null;
+        return result;
     }
 
     @Override

+ 0 - 164
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppOrderUserController.java

@@ -1,164 +0,0 @@
-package org.jeecg.modules.system.app.controller;
-
-import java.util.Arrays;
-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.modules.system.app.service.IAppOrderUserService;
-
-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.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
- /**
- * @Description: 订单人员详细表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-@Tag(name="订单人员详细表")
-@RestController
-@RequestMapping("/app/appOrderUser")
-@Slf4j
-public class AppOrderUserController extends JeecgController<AppOrderUser, IAppOrderUserService> {
-	@Autowired
-	private IAppOrderUserService appOrderUserService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param appOrderUser
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "订单人员详细表-分页列表查询")
-	@Operation(summary="订单人员详细表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<AppOrderUser>> queryPageList(AppOrderUser appOrderUser,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-
-
-        QueryWrapper<AppOrderUser> queryWrapper = QueryGenerator.initQueryWrapper(appOrderUser, req.getParameterMap());
-		Page<AppOrderUser> page = new Page<AppOrderUser>(pageNo, pageSize);
-		IPage<AppOrderUser> pageList = appOrderUserService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param appOrderUser
-	 * @return
-	 */
-	@AutoLog(value = "订单人员详细表-添加")
-	@Operation(summary="订单人员详细表-添加")
-	@RequiresPermissions("org.jeecg.modules.app:nm_order_user:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody AppOrderUser appOrderUser) {
-		appOrderUserService.save(appOrderUser);
-
-		return Result.OK("添加成功!");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param appOrderUser
-	 * @return
-	 */
-	@AutoLog(value = "订单人员详细表-编辑")
-	@Operation(summary="订单人员详细表-编辑")
-	@RequiresPermissions("org.jeecg.modules.app:nm_order_user:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody AppOrderUser appOrderUser) {
-		appOrderUserService.updateById(appOrderUser);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "订单人员详细表-通过id删除")
-	@Operation(summary="订单人员详细表-通过id删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_order_user:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		appOrderUserService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "订单人员详细表-批量删除")
-	@Operation(summary="订单人员详细表-批量删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_order_user:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.appOrderUserService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "订单人员详细表-通过id查询")
-	@Operation(summary="订单人员详细表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<AppOrderUser> queryById(@RequestParam(name="id",required=true) String id) {
-		AppOrderUser appOrderUser = appOrderUserService.getById(id);
-		if(appOrderUser==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(appOrderUser);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param appOrderUser
-    */
-    @RequiresPermissions("org.jeecg.modules.app:nm_order_user:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, AppOrderUser appOrderUser) {
-        return super.exportXls(request, appOrderUser, AppOrderUser.class, "订单人员详细表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequiresPermissions("org.jeecg.modules.app:nm_order_user:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, AppOrderUser.class);
-    }
-
-}

+ 0 - 13
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppOrderUserService.java

@@ -1,13 +0,0 @@
-package org.jeecg.modules.system.app.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 订单人员详细表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-public interface IAppOrderUserService extends IService<AppOrderUser> {
-
-}

+ 0 - 17
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppOrderUserServiceImpl.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.system.app.service.impl;
-
-import org.jeecg.modules.system.app.service.IAppOrderUserService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 订单人员详细表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-@Service
-public class AppOrderUserServiceImpl extends ServiceImpl<AppOrderUserMapper, AppOrderUser> implements IAppOrderUserService {
-
-}