diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java index 4462c442..22a52f1e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java @@ -36,9 +36,6 @@ import java.util.List; /** * 门票主表 前端控制器 - * - * @author hzs - * @since 2025-01-09 */ @RestController @RequestMapping("/api/ticket") @@ -52,11 +49,9 @@ public class ApiSaTicketController extends ParentOrderController { private IAcTicketService acTicketService; /** + * 支付购买订单 + * * @param orderParam 订单参数 - * @Description: 支付购买订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @RepeatSubmitSimple @PostMapping("/pay-ticket") @@ -113,15 +108,13 @@ public class ApiSaTicketController extends ParentOrderController { } /** + * 支付购买订单 + * * @param orderParam 订单参数 - * @Description: 支付购买订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/cancel-pay-ticket") public AjaxResult cancelPaySaTicket(@RequestBody OrderParam orderParam) { - if(orderParam.getOrderCode() == null ) { + if (orderParam.getOrderCode() == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } // 查询门票 @@ -134,11 +127,9 @@ public class ApiSaTicketController extends ParentOrderController { } /** + * 支付购买订单 + * * @param orderParam 订单参数 - * @Description: 支付购买订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/pay-online") public AjaxResult paySaTicketOnline(@RequestBody OrderParam orderParam) { @@ -174,11 +165,9 @@ public class ApiSaTicketController extends ParentOrderController { } /** + * 支付购买订单 + * * @param orderParam 订单参数 - * @Description: 支付购买订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/pay-back") public AjaxResult payBackSaTicketOnline(@RequestBody OrderParam orderParam) { @@ -187,10 +176,8 @@ public class ApiSaTicketController extends ParentOrderController { } /** - * @description: 会员前台查询门票活动列表 - * @param: [acTicket] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ + * 会员前台查询门票活动列表 + */ @GetMapping("/query") public TableDataInfo querySaTick() { SaTicketParam saTicketParam = SaTicketParam.builder() @@ -225,11 +212,9 @@ public class ApiSaTicketController extends ParentOrderController { } /** + * 支付购买订单 + * * @param ticketParam 订单参数 - * @Description: 支付购买订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/update-ticket") public AjaxResult update(@RequestBody BuyTicketParam ticketParam) { @@ -251,9 +236,7 @@ public class ApiSaTicketController extends ParentOrderController { } /** - * @description: 会员前台查询门票活动列表 - * @param: [acTicket] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 会员前台查询门票活动列表 **/ @GetMapping("/query-ac") public TableDataInfo queryAcTick() { @@ -267,11 +250,7 @@ public class ApiSaTicketController extends ParentOrderController { } /** - * @param fieldList 需要验证的字段 - * @Description: 验证字段是否必输 - * @return: boolean - * @Author: sui q - * @Date: 2022/8/29 11:13 + * 验证字段是否必输 */ private boolean validateFieldNotNull(BuyTicketParam buyTicketParam, List fieldList) { return fieldList.stream().anyMatch(field -> { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/vo/SaTicketVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/vo/SaTicketVO.java index 0157f89e..364d3c07 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/vo/SaTicketVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/vo/SaTicketVO.java @@ -1,7 +1,7 @@ package com.hzs.sale.ticket.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; @@ -15,12 +15,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @description: 返回到前台页面 - * @author: sui q - * @time: 2025/1/10 13:36 - * @classname: SaTicketVO - * @package_name: com.hzs.sale.ticket.vo - * version 1.0.0 + * 返回到前台页面 */ @Data @Builder @@ -51,13 +46,13 @@ public class SaTicketVO implements Serializable { * 活动开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间",dateFormat = "yyyy-MM-dd") + @Excel(name = "开始时间", dateFormat = "yyyy-MM-dd") private Date actStartDate; /** * 活动结束时间 */ - @Excel(name = "结束时间",dateFormat = "yyyy-MM-dd") + @Excel(name = "结束时间", dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date actEndDate; @@ -70,12 +65,14 @@ public class SaTicketVO implements Serializable { /** * 订单金额 */ + @BigDecimalFormat @Excel(name = "订单金额") private BigDecimal orderAmount; /** * 单价 */ + @BigDecimalFormat @Excel(name = "单价") private BigDecimal price; @@ -144,7 +141,7 @@ public class SaTicketVO implements Serializable { /** * 支付时间 */ - @Excel(name = "支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime;