From 60e36fb1d13433e877ad9f610fd0240ff752b085 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 11 Nov 2025 11:45:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UShopUserController.java | 6 ++- .../user/UShopConsumeDiscountController.java | 20 ++----- .../czg/exception/CzgControllerAdvice.java | 12 ++++- .../com/czg/market/entity/SmsPushEvent.java | 2 +- .../czg/exception/OrderValidateException.java | 39 ++++++++++++++ .../service/impl/ShopUserFlowServiceImpl.java | 2 - .../service/impl/OrderInfoServiceImpl.java | 53 ++++++++++--------- 7 files changed, 85 insertions(+), 49 deletions(-) create mode 100644 cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java index aa193c677..abd891ed6 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java @@ -3,7 +3,10 @@ package com.czg.controller.user; import com.czg.account.dto.shopuser.ShopUserAddDTO; import com.czg.account.dto.shopuser.ShopUserDetailDTO; import com.czg.account.dto.shopuser.ShopUserVipCardDTO; -import com.czg.account.entity.*; +import com.czg.account.entity.MemberPointsLog; +import com.czg.account.entity.ShopInfo; +import com.czg.account.entity.ShopUser; +import com.czg.account.entity.ShopUserFlow; import com.czg.account.service.MemberPointsLogService; import com.czg.account.service.ShopUserFlowService; import com.czg.account.service.UShopUserService; @@ -16,7 +19,6 @@ import com.czg.sa.StpKit; import com.czg.utils.MyQueryWrapper; import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryCondition; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java index da06588bc..34e993874 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java @@ -1,26 +1,14 @@ package com.czg.controller.user; -import com.czg.account.dto.shopuser.ShopUserAddDTO; -import com.czg.account.dto.shopuser.ShopUserDetailDTO; -import com.czg.account.dto.shopuser.ShopUserVipCardDTO; -import com.czg.account.entity.MemberPointsLog; -import com.czg.account.entity.ShopUser; -import com.czg.account.entity.ShopUserFlow; -import com.czg.account.service.MemberPointsLogService; -import com.czg.account.service.PointsExchangeRecordService; -import com.czg.account.service.ShopUserFlowService; -import com.czg.account.service.ShopUserService; -import com.czg.annotation.Debounce; import com.czg.market.entity.MkShopConsumeDiscountRecord; import com.czg.market.service.MkShopConsumeDiscountRecordService; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; -import com.czg.utils.PageUtil; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * 新客立减相关 diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java index b674dd51a..352c205a3 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java @@ -113,6 +113,14 @@ public class CzgControllerAdvice { return CzgResult.failure(ex.getCode(), ex.getMsg()); } + @ResponseBody + @ExceptionHandler(OrderValidateException.class) + @ResponseStatus(HttpStatus.OK) + public CzgResult handleOrderValidateException(OrderValidateException ex) { + log.error("订单校验异常:{}", ex.getMessage()); + return CzgResult.failure(ex.getCode(), ex.getMsg()); + } + /** * 支付成功 * 支付金额为零的统一处理 @@ -127,7 +135,7 @@ public class CzgControllerAdvice { */ @ExceptionHandler(OrderCancelException.class) public CzgResult handleOrderCancelException() { - return CzgResult.failure(701,"订单已过期,请重新下单"); + return CzgResult.failure(701, "订单已过期,请重新下单"); } /** @@ -155,6 +163,6 @@ public class CzgControllerAdvice { private void setErrorLog(Exception ex) { log.error(ex.getMessage()); - log.error("错误",ex); + log.error("错误", ex); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEvent.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEvent.java index 056f6fbba..98efa890f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEvent.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEvent.java @@ -68,7 +68,7 @@ public class SmsPushEvent implements Serializable { private String userId; /** - * 0待发送 1 发送中 2发送成功 -1失败 + * 0待发送 1 发送中 2发送完成 -1失败 */ private Integer status; diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java b/cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java new file mode 100644 index 000000000..269637f85 --- /dev/null +++ b/cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java @@ -0,0 +1,39 @@ +package com.czg.exception; + +import com.czg.resp.CzgRespCode; + +import java.io.Serial; + +/** + * @author ww + * @description + */ +public class OrderValidateException extends RuntimeException{ + @Serial + private static final long serialVersionUID = 1L; + + private int code; + private String msg; + + public OrderValidateException(String msg) { + super(msg); + this.code = CzgRespCode.FAILURE.getCode(); + this.msg = msg; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } +} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserFlowServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserFlowServiceImpl.java index ec761f88e..b7e46ec12 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserFlowServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserFlowServiceImpl.java @@ -5,9 +5,7 @@ import cn.hutool.poi.excel.ExcelWriter; import com.czg.account.entity.ShopUserFlow; import com.czg.account.service.ShopInfoService; import com.czg.account.service.ShopUserFlowService; -import com.czg.account.service.ShopUserService; import com.czg.account.vo.ShopUserFlowVO; -import com.czg.account.vo.SysUserDetailVO; import com.czg.service.account.mapper.ShopUserFlowMapper; import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 60b11b976..0f49f40e2 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -23,6 +23,7 @@ import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.ApiNotPrintException; import com.czg.exception.CzgException; import com.czg.exception.OrderCancelException; +import com.czg.exception.OrderValidateException; import com.czg.market.dto.MkDiscountActivityDTO; import com.czg.market.entity.MkDiscountThreshold; import com.czg.market.entity.MkShopCouponRecord; @@ -342,17 +343,17 @@ public class OrderInfoServiceImpl extends ServiceImpl 0 || param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0; if (usePointsDeduction) { if (pointSetting == null || !pointSetting.getEnableDeduction().equals(1)) { - throw new ValidateException("生成支付订单失败，该店铺未开启积分抵扣"); + throw new OrderValidateException("生成支付订单失败，该店铺未开启积分抵扣"); } if (param.getUserId() == null) { - throw new ValidateException("生成支付订单失败，请选择用户后再使用积分抵扣"); + throw new OrderValidateException("生成支付订单失败，请选择用户后再使用积分抵扣"); } //霸王餐 if (param.isFreeDine() && !param.isWithPoints()) { - throw new ValidateException("生成支付订单失败，霸王餐不支持积分抵扣"); + throw new OrderValidateException("生成支付订单失败，霸王餐不支持积分抵扣"); } } else { if (param.getPointsNum() != 0 || param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) != 0) { - throw new ValidateException("生成支付订单失败，积分抵扣数量或金额不正确"); + throw new OrderValidateException("生成支付订单失败，积分抵扣数量或金额不正确"); } } if (param.getPointsNum() > 0 && (!param.isFreeDine() || param.isWithPoints())) { if (pointSetting == null || !pointSetting.getEnableDeduction().equals(1)) { - throw new ValidateException("生成支付订单失败，该店铺未开启积分抵扣"); + throw new OrderValidateException("生成支付订单失败，该店铺未开启积分抵扣"); } if (param.getUserId() == null) { - throw new ValidateException("生成支付订单失败，请选择用户后再使用积分抵扣"); + throw new OrderValidateException("生成支付订单失败，请选择用户后再使用积分抵扣"); } } else if (param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0) { - throw new ValidateException("生成支付订单失败，已使用积分抵扣，积分数量不正确"); + throw new OrderValidateException("生成支付订单失败，已使用积分抵扣，积分数量不正确"); } ShopUser shopUser = null; if (param.getUserId() != null) { @@ -399,14 +400,14 @@ public class OrderInfoServiceImpl extends ServiceImpl 0 && !shopUser.getIsVip().equals(1) && pointSetting.getDeductionGroup().contains("vip")) { - throw new ValidateException("生成支付订单失败，该店铺仅会员可使用积分抵扣"); + throw new OrderValidateException("生成支付订单失败，该店铺仅会员可使用积分抵扣"); } orderInfo.setUserId(userInfo.getId()); } //会员价校验 if (param.isVipPrice() && (shopUser == null || shopUser.getIsMemberPrice() == null || shopUser.getIsMemberPrice() == 0 || shopUser.getIsVip().equals(0))) { - throw new ValidateException("生成支付订单失败，仅会员可使用会员价"); + throw new OrderValidateException("生成支付订单失败，仅会员可使用会员价"); } List orderDetails = orderDetailService.queryChain().eq(OrderDetail::getOrderId, param.getOrderId()).select().list(); @@ -430,7 +431,7 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { if (pointSetting.getMinPaymentAmount().compareTo(newTotalAmount) > 0) { - throw new ValidateException("生成支付订单失败，未满足积分抵扣最低门槛"); + throw new OrderValidateException("生成支付订单失败，未满足积分抵扣最低门槛"); } if (pointSetting.getMaxDeductionRatio().multiply(newTotalAmount).compareTo(param.getPointsDiscountAmount()) < 0) { - throw new ValidateException("生成支付订单失败，积分抵扣金额已超出最大抵扣金额"); + throw new OrderValidateException("生成支付订单失败，积分抵扣金额已超出最大抵扣金额"); } BigDecimal pointAmount = new BigDecimal(param.getPointsNum()).divide(new BigDecimal(pointSetting.getEquivalentPoints()), 2, RoundingMode.DOWN); if (pointAmount.compareTo(param.getPointsDiscountAmount()) != 0) { - throw new ValidateException("生成支付订单失败，积分抵扣金额不正确"); + throw new OrderValidateException("生成支付订单失败，积分抵扣金额不正确"); } newTotalAmount = newTotalAmount.subtract(param.getPointsDiscountAmount()); } @@ -529,7 +530,7 @@ public class OrderInfoServiceImpl extends ServiceImpl list = couponRecordService.list(couponRecordQuery); if (CollUtil.isEmpty(list) || param.getCouponList().size() > list.size()) { - throw new ValidateException("生成支付订单失败，优惠券不可用"); + throw new OrderValidateException("生成支付订单失败，优惠券不可用"); } Map couponRecordMap = list.stream().collect(Collectors.toMap(MkShopCouponRecord::getType, t -> t)); AtomicBoolean otherCouponShare = new AtomicBoolean(true); @@ -636,7 +637,7 @@ public class OrderInfoServiceImpl extends ServiceImpl couponFoodIds = new ArrayList<>(); @@ -653,7 +654,7 @@ public class OrderInfoServiceImpl extends ServiceImpl Date: Tue, 11 Nov 2025 12:41:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/config/MybatisFlexConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java index 1025dd67f..bb8cbea42 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java @@ -17,7 +17,7 @@ public class MybatisFlexConfig { //设置 SQL 审计收集器 AuditManager.setMessageCollector(auditMessage -> log.info("[sql] time: {}, size: {},\n sql:{}", - auditMessage.getQueryTime(), auditMessage.getQueryCount(), auditMessage.getFullSql()) + auditMessage.getElapsedTime(), auditMessage.getQueryCount(), auditMessage.getFullSql()) ); } From 3836fba751448127765f8072303336fd6c176524 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 11 Nov 2025 13:49:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=9A=E4=BD=99=20=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ShopTableOrderStatistic.java | 67 ------------------- .../mapper/ShopTableOrderStatisticMapper.java | 21 ------ 2 files changed, 88 deletions(-) delete mode 100644 cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java delete mode 100644 cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableOrderStatisticMapper.java diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java deleted file mode 100644 index 1c7dc935a..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.czg.account.entity; - -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Date; - -/** - * 台桌订单统计表 实体类。 - * - * @author zs - * @since 2025-03-03 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Table("tb_shop_table_order_statistic") -public class ShopTableOrderStatistic implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Auto) - private Long id; - - private Long tableId; - - @Column(ignore = true) - private String name; - - /** - * 订单数量 - */ - private Long orderCount; - - /** - * 订单金额 - */ - private BigDecimal orderAmount; - /** - * 退款金额 - */ - private BigDecimal refundAmount; - /** - * 退款金额 - */ - private Long refundCount; - - /** - * 店铺id - */ - private Long shopId; - - /** - * 创建日期 年月日 - */ - private Date createDay; - -} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableOrderStatisticMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableOrderStatisticMapper.java deleted file mode 100644 index bba19c5fa..000000000 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableOrderStatisticMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.czg.service.account.mapper; - -import com.mybatisflex.core.BaseMapper; -import com.czg.account.entity.ShopTableOrderStatistic; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 台桌订单统计表 映射层。 - * - * @author zs - * @since 2025-03-03 - */ -public interface ShopTableOrderStatisticMapper extends BaseMapper { - - List selectSummary(@Param("shopId") Long shopId, @Param("startTime") String startTime, @Param("endTime") String endTime); - - boolean incrInfo(@Param("shopId") long shopId, @Param("tableId") long tableId, @Param("count") long count, @Param("amount") BigDecimal amount, @Param("date") String date); -} From b68f207eedb2aab473e049df2e49e1c5b04ace84 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 11 Nov 2025 14:31:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8A=B6=E6=80=81=20quer?= =?UTF-8?q?yChain=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/controller/OrderPayController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java index 280e8ab43..fdf05cbca 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java @@ -13,9 +13,9 @@ import com.czg.system.enums.SysParamCodeEnum; import com.czg.system.service.SysParamsService; import com.czg.utils.AssertUtil; import com.czg.utils.ServletUtil; +import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; -import lombok.NonNull; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -181,7 +181,7 @@ public class OrderPayController { @GetMapping("/queryOrderStatus") public CzgResult queryOrderStatus(Long orderId) { CzgResult result = CzgResult.success(); - String status = orderInfoService.queryChain().select(OrderInfo::getStatus).eq(OrderInfo::getId, orderId).oneAs(String.class); + String status = orderInfoService.getOneAs(QueryWrapper.create().select(OrderInfo::getStatus).eq(OrderInfo::getId, orderId), String.class); result.setData(status); switch (status) { case "unpaid" -> result.setMsg("等待用户付款"); From d33e177e29ffd4c64988def5fdafa0f1d2fcd856 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 11 Nov 2025 14:47:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/controller/OrderPayController.java | 8 ++++---- .../src/main/java/com/czg/order/dto/CheckOrderPay.java | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java index fdf05cbca..6d1fb87f2 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java @@ -142,17 +142,17 @@ public class OrderPayController { /** * 获取店铺订单支付URL */ - @GetMapping("/shopPayApi/orderPayUrl") + @PostMapping("/shopPayApi/orderPayUrl") @Debounce(value = "#checkOrderPay.orderId") - public CzgResult getOrderPayUrl(@RequestHeader Long shopId, @RequestParam(required = false) String extend, - CheckOrderPay checkOrderPay) { + public CzgResult getOrderPayUrl(@RequestHeader Long shopId, + @RequestBody CheckOrderPay checkOrderPay) { AssertUtil.isNull(shopId, "店铺id不能为空"); AssertUtil.isNull(checkOrderPay, "订单信息不能为空"); Map map = new HashMap<>(); map.put("shopId", shopId); map.put("orderId", checkOrderPay.getOrderId()); map.put("payAmount", checkOrderPay.getOrderAmount()); - map.put("extend", StrUtil.isEmpty(extend) ? "" : extend); + map.put("extend", StrUtil.isEmpty(checkOrderPay.getExtend()) ? "" : checkOrderPay.getExtend()); if (checkOrderPay.getOrderId() != null) { OrderInfo orderInfo = orderInfoService.checkOrderPay(checkOrderPay); map.put("payAmount", orderInfo.getOrderAmount()); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java index 479a724c4..846936d10 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java @@ -118,6 +118,8 @@ public class CheckOrderPay implements Serializable { private String remark; + private String extend; + public Integer getSeatNum() { return seatNum == null ? 0 : seatNum; @@ -138,7 +140,7 @@ public class CheckOrderPay implements Serializable { return newCustomerDiscountAmount == null ? BigDecimal.ZERO : newCustomerDiscountAmount; } - /** + /** * 满减活动抵扣金额 */ public BigDecimal getDiscountActAmount() { @@ -165,7 +167,7 @@ public class CheckOrderPay implements Serializable { return roundAmount == null ? BigDecimal.ZERO : roundAmount; } - public BigDecimal getVipDiscountAmount(){ + public BigDecimal getVipDiscountAmount() { return vipDiscountAmount == null ? BigDecimal.ZERO : vipDiscountAmount; }