From 1140505c6e9aa4f7cdfb06d19e94a91fe8058a3e Mon Sep 17 00:00:00 2001 From: zhangsan <646228430@qq.com> Date: Mon, 14 Jul 2025 13:50:29 +0800 Subject: [PATCH] =?UTF-8?q?7.14=20=E5=87=86=E5=A4=87=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=B0=8F=E5=9E=8B=E5=95=86=E5=9F=8E+?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/LockMarketPayOrderResponseDTO.java | 4 ++++ .../src/main/resources/application.yml | 2 +- .../mybatis/mapper/group_buy_order_list_mapper.xml | 7 ++++--- .../trade/model/entity/MarketPayOrderEntity.java | 4 ++++ .../adapter/repository/TradeRepository.java | 14 ++++++++------ .../infrastructure/dao/po/GroupBuyOrderList.java | 2 ++ .../whut/trigger/http/MarketTradeController.java | 2 ++ .../edu/whut/trigger/job/GroupBuyNotifyJob.java | 4 ++-- 8 files changed, 27 insertions(+), 12 deletions(-) diff --git a/group-buying-sys-api/src/main/java/edu/whut/api/dto/LockMarketPayOrderResponseDTO.java b/group-buying-sys-api/src/main/java/edu/whut/api/dto/LockMarketPayOrderResponseDTO.java index 50d687a..f221589 100644 --- a/group-buying-sys-api/src/main/java/edu/whut/api/dto/LockMarketPayOrderResponseDTO.java +++ b/group-buying-sys-api/src/main/java/edu/whut/api/dto/LockMarketPayOrderResponseDTO.java @@ -18,8 +18,12 @@ public class LockMarketPayOrderResponseDTO { /** 预购订单ID */ private String orderId; + /** 原始价格 */ + private BigDecimal originalPrice; /** 折扣金额 */ private BigDecimal deductionPrice; + /** 支付金额 */ + private BigDecimal payPrice; /** 交易订单状态 */ private Integer tradeOrderStatus; diff --git a/group-buying-sys-app/src/main/resources/application.yml b/group-buying-sys-app/src/main/resources/application.yml index 9f96606..3d7808a 100644 --- a/group-buying-sys-app/src/main/resources/application.yml +++ b/group-buying-sys-app/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: prod + active: dev diff --git a/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml b/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml index b6a235f..777e952 100644 --- a/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml +++ b/group-buying-sys-app/src/main/resources/mybatis/mapper/group_buy_order_list_mapper.xml @@ -15,6 +15,7 @@ + @@ -26,19 +27,19 @@ insert into group_buy_order_list( user_id, team_id, order_id, activity_id, start_time, - end_time, goods_id, source, channel, original_price, + end_time, goods_id, source, channel, original_price, pay_price, deduction_price, status, out_trade_no, biz_id, create_time, update_time ) values( #{userId}, #{teamId}, #{orderId}, #{activityId}, #{startTime}, - #{endTime}, #{goodsId}, #{source}, #{channel}, #{originalPrice}, + #{endTime}, #{goodsId}, #{source}, #{channel}, #{originalPrice},#{payPrice} #{deductionPrice}, #{status}, #{outTradeNo}, #{bizId}, now(), now() ) diff --git a/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/model/entity/MarketPayOrderEntity.java b/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/model/entity/MarketPayOrderEntity.java index e87cc11..ba0613e 100644 --- a/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/model/entity/MarketPayOrderEntity.java +++ b/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/model/entity/MarketPayOrderEntity.java @@ -20,8 +20,12 @@ public class MarketPayOrderEntity { private String teamId; /** 预购订单ID */ private String orderId; + /** 原始价格 */ + private BigDecimal originalPrice; /** 折扣金额 */ private BigDecimal deductionPrice; + /** 支付金额 */ + private BigDecimal payPrice; /** 交易订单状态枚举 */ private TradeOrderStatusEnumVO tradeOrderStatusEnumVO; diff --git a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java index f01d373..2a8b087 100644 --- a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java +++ b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java @@ -63,17 +63,19 @@ public class TradeRepository implements ITradeRepository { query.setUserId(userId); query.setOutTradeNo(outTradeNo); - GroupBuyOrderList po = groupBuyOrderListDao.queryGroupBuyOrderRecordByOutTradeNo(query); - if (po == null) { + GroupBuyOrderList res = groupBuyOrderListDao.queryGroupBuyOrderRecordByOutTradeNo(query); + if (res == null) { return null; } // 组装领域对象返回，只返回上层真正关心的属性 return MarketPayOrderEntity.builder() - .teamId(po.getTeamId()) - .orderId(po.getOrderId()) - .deductionPrice(po.getDeductionPrice()) - .tradeOrderStatusEnumVO(TradeOrderStatusEnumVO.valueOf(po.getStatus())) + .teamId(res.getTeamId()) + .orderId(res.getOrderId()) + .originalPrice(res.getOriginalPrice()) + .deductionPrice(res.getDeductionPrice()) + .payPrice(res.getPayPrice()) + .tradeOrderStatusEnumVO(TradeOrderStatusEnumVO.valueOf(res.getStatus())) .build(); } diff --git a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dao/po/GroupBuyOrderList.java b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dao/po/GroupBuyOrderList.java index d41341e..9660759 100644 --- a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dao/po/GroupBuyOrderList.java +++ b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/dao/po/GroupBuyOrderList.java @@ -40,6 +40,8 @@ public class GroupBuyOrderList extends Page { private BigDecimal originalPrice; /** 折扣金额 */ private BigDecimal deductionPrice; + /** 支付金额 */ + private BigDecimal payPrice; /** 状态；0初始锁定、1消费完成 */ private Integer status; /** 外部交易单号-确保外部调用唯一幂等 */ diff --git a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketTradeController.java b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketTradeController.java index 8a1ecf4..00ab0d6 100644 --- a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketTradeController.java +++ b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketTradeController.java @@ -249,7 +249,9 @@ public class MarketTradeController implements IMarketTradeService { .info(ResponseCode.SUCCESS.getInfo()) .data(LockMarketPayOrderResponseDTO.builder() .orderId(entity.getOrderId()) + .originalPrice(entity.getOriginalPrice()) .deductionPrice(entity.getDeductionPrice()) + .payPrice(entity.getPayPrice()) .tradeOrderStatus(entity.getTradeOrderStatusEnumVO().getCode()) .build()) .build(); diff --git a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/GroupBuyNotifyJob.java b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/GroupBuyNotifyJob.java index 68ebec1..1d673ba 100644 --- a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/GroupBuyNotifyJob.java +++ b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/job/GroupBuyNotifyJob.java @@ -17,8 +17,8 @@ public class GroupBuyNotifyJob { private final ITradeSettlementOrderService tradeSettlementOrderService; - //每15秒执行一次 - @Scheduled(cron = "0/15 * * * * ?") + //每30秒执行一次 + @Scheduled(cron = "0/30 * * * * ?") public void exec() { try { Map result = tradeSettlementOrderService. execSettlementNotifyJob();