diff --git a/waynboot-common/src/main/java/com/wayn/common/core/domain/vo/OrderVO.java b/waynboot-common/src/main/java/com/wayn/common/core/domain/vo/OrderVO.java index 32971a1..2247f6a 100644 --- a/waynboot-common/src/main/java/com/wayn/common/core/domain/vo/OrderVO.java +++ b/waynboot-common/src/main/java/com/wayn/common/core/domain/vo/OrderVO.java @@ -4,6 +4,9 @@ import lombok.Data; import java.util.List; +/** + * 订单数据VO + */ @Data public class OrderVO { diff --git a/waynboot-message-core/src/main/java/com/wayn/message/core/messsage/OrderDTO.java b/waynboot-message-core/src/main/java/com/wayn/message/core/messsage/OrderDTO.java index cfb1190..abdbbef 100644 --- a/waynboot-message-core/src/main/java/com/wayn/message/core/messsage/OrderDTO.java +++ b/waynboot-message-core/src/main/java/com/wayn/message/core/messsage/OrderDTO.java @@ -5,6 +5,9 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +/** + * 订单数据传输对象 + */ @Data public class OrderDTO implements Serializable { diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java index 7be38e0..d1dff60 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java @@ -195,9 +195,6 @@ public class OrderServiceImpl extends ServiceImpl implements // 优惠卷抵扣费用 BigDecimal couponPrice = new BigDecimal("0.00"); - // 团购抵扣费用 - BigDecimal grouponPrice = new BigDecimal("0.00"); - // 订单费用 BigDecimal orderTotalPrice = checkedGoodsPrice.add(freightPrice).subtract(couponPrice).max(new BigDecimal("0.00")); @@ -208,7 +205,7 @@ public class OrderServiceImpl extends ServiceImpl implements map.put("order", orderDTO); map.put("notifyUrl", WaynConfig.getMobileUrl() + "/message/order/submit"); - // 异步发送邮件 + // 异步下单 rabbitTemplate.convertAndSend("OrderDirectExchange", "OrderDirectRouting", map); return R.success().add("actualPrice", actualPrice).add("orderSn", orderSn); } @@ -316,7 +313,7 @@ public class OrderServiceImpl extends ServiceImpl implements } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public R prepay(String orderSn, HttpServletRequest request) { // 获取订单详情 Order order = getOne(new QueryWrapper().eq("order_sn", orderSn)); @@ -357,7 +354,7 @@ public class OrderServiceImpl extends ServiceImpl implements @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public R h5pay(String orderSn, HttpServletRequest request) { // 获取订单详情 Order order = getOne(new QueryWrapper().eq("order_sn", orderSn));