diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/orderspacecapsule/OrderSpaceCapsuleController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/orderspacecapsule/OrderSpaceCapsuleController.java index b38c2dd2..699958f0 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/orderspacecapsule/OrderSpaceCapsuleController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/orderspacecapsule/OrderSpaceCapsuleController.java @@ -32,7 +32,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.* @Tag(name = "管理后台 - 太空舱订单") @RestController -@RequestMapping("/t/order-space-capsule") +@RequestMapping("/order-space-capsule") @Validated public class OrderSpaceCapsuleController { diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/combo/ComboController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/combo/ComboController.java new file mode 100644 index 00000000..33237fbe --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/combo/ComboController.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.member.controller.app.combo; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import cn.iocoder.yudao.module.member.controller.admin.combo.vo.ComboPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.combo.vo.ComboRespVO; +import cn.iocoder.yudao.module.member.controller.admin.combo.vo.ComboSaveReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.combo.ComboDO; +import cn.iocoder.yudao.module.member.service.combo.ComboService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; + + +@Tag(name = "管理后台 - 套餐") +@RestController +@RequestMapping("/combo") +@Validated +public class ComboController { + + @Resource + private ComboService comboService; + + @GetMapping("/get") + @Operation(summary = "获得套餐") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getCombo(@RequestParam("id") Long id) { + ComboDO combo = comboService.getCombo(id); + return success(BeanUtils.toBean(combo, ComboRespVO.class)); + } + @GetMapping("/page") + @Operation(summary = "获得套餐分页") + @PreAuthorize("@ss.hasPermission('t:combo:query')") + public CommonResult> getComboPage(@Valid ComboPageReqVO pageReqVO) { + PageResult pageResult = comboService.getComboPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ComboRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderspacecapsule/AppOrderSpaceCapsuleController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderspacecapsule/AppOrderSpaceCapsuleController.java new file mode 100644 index 00000000..0abec5fa --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderspacecapsule/AppOrderSpaceCapsuleController.java @@ -0,0 +1,70 @@ +package cn.iocoder.yudao.module.member.controller.app.orderspacecapsule; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.member.controller.admin.orderspacecapsule.vo.OrderSpaceCapsulePageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.orderspacecapsule.vo.OrderSpaceCapsuleRespVO; +import cn.iocoder.yudao.module.member.controller.admin.orderspacecapsule.vo.OrderSpaceCapsuleSaveReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.orderspacecapsule.OrderSpaceCapsuleDO; +import cn.iocoder.yudao.module.member.service.orderspacecapsule.OrderSpaceCapsuleService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + + +@Tag(name = "小程序 - 太空舱订单") +@RestController +@RequestMapping("/order-space-capsule") +@Validated +public class AppOrderSpaceCapsuleController { + + @Resource + private OrderSpaceCapsuleService orderSpaceCapsuleService; + + @PostMapping("/create") + @Operation(summary = "创建太空舱订单") + public CommonResult createOrderSpaceCapsule(@Valid @RequestBody OrderSpaceCapsuleSaveReqVO createReqVO) { + return success(orderSpaceCapsuleService.createOrderSpaceCapsule(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新太空舱订单") + public CommonResult updateOrderSpaceCapsule(@Valid @RequestBody OrderSpaceCapsuleSaveReqVO updateReqVO) { + orderSpaceCapsuleService.updateOrderSpaceCapsule(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除太空舱订单") + @Parameter(name = "id", description = "编号", required = true) + public CommonResult deleteOrderSpaceCapsule(@RequestParam("id") Long id) { + orderSpaceCapsuleService.deleteOrderSpaceCapsule(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得太空舱订单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getOrderSpaceCapsule(@RequestParam("id") Long id) { + OrderSpaceCapsuleDO orderSpaceCapsule = orderSpaceCapsuleService.getOrderSpaceCapsule(id); + return success(BeanUtils.toBean(orderSpaceCapsule, OrderSpaceCapsuleRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得太空舱订单分页") + public CommonResult> getOrderSpaceCapsulePage(@Valid OrderSpaceCapsulePageReqVO pageReqVO) { + PageResult pageResult = orderSpaceCapsuleService.getOrderSpaceCapsulePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, OrderSpaceCapsuleRespVO.class)); + } + + + +} \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/spacecapsule/SpaceCapsuleController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/spacecapsule/AppSpaceCapsuleController.java similarity index 96% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/spacecapsule/SpaceCapsuleController.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/spacecapsule/AppSpaceCapsuleController.java index 21bcb884..7c3eadc5 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/spacecapsule/SpaceCapsuleController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/spacecapsule/AppSpaceCapsuleController.java @@ -17,11 +17,11 @@ import javax.validation.Valid; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 太空舱") +@Tag(name = "小程序 - 太空舱") @RestController @RequestMapping("/space-capsule") @Validated -public class SpaceCapsuleController { +public class AppSpaceCapsuleController { @Resource private SpaceCapsuleService spaceCapsuleService;