BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 94f9d3541053cfd15197f42ba367fe92f72b957c

Authored by YunaiV
1 parent 41ee2371

【功能修复】MALL：支付超时时间返回不正确的问题

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @94f9d35
@@ -176,7 +176,7 @@ public interface TradeOrderConvert { @@ -176,7 +176,7 @@ public interface TradeOrderConvert {
176 TradeOrderProperties tradeOrderProperties, 176 TradeOrderProperties tradeOrderProperties,
177 DeliveryExpressDO express) { 177 DeliveryExpressDO express) {
178 AppTradeOrderDetailRespVO orderVO = convert3(order, orderItems); 178 AppTradeOrderDetailRespVO orderVO = convert3(order, orderItems);
179 - orderVO.setPayExpireTime(addTime(tradeOrderProperties.getPayExpireTime())); 179 + orderVO.setPayExpireTime(order.getCreateTime().plus(tradeOrderProperties.getPayExpireTime()));
180 if (StrUtil.isNotEmpty(order.getPayChannelCode())) { 180 if (StrUtil.isNotEmpty(order.getPayChannelCode())) {
181 orderVO.setPayChannelName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.CHANNEL_CODE, order.getPayChannelCode())); 181 orderVO.setPayChannelName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.CHANNEL_CODE, order.getPayChannelCode()));
182 } 182 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageRecordMapper.java
  View file @94f9d35
@@ -63,7 +63,7 @@ public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> { @@ -63,7 +63,7 @@ public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> {
63 .selectCount(BrokerageRecordDO::getId, UserBrokerageSummaryRespBO::getCount) 63 .selectCount(BrokerageRecordDO::getId, UserBrokerageSummaryRespBO::getCount)
64 .selectSum(BrokerageRecordDO::getPrice) 64 .selectSum(BrokerageRecordDO::getPrice)
65 .in(BrokerageRecordDO::getUserId, userIds) 65 .in(BrokerageRecordDO::getUserId, userIds)
66 - .eq(BrokerageRecordDO::getBizId, bizType) 66 + .eq(BrokerageRecordDO::getBizType, bizType)
67 .eq(BrokerageRecordDO::getStatus, status) 67 .eq(BrokerageRecordDO::getStatus, status)
68 .groupBy(BrokerageRecordDO::getUserId)); // 按照 userId 聚合 68 .groupBy(BrokerageRecordDO::getUserId)); // 按照 userId 聚合
69 return BeanUtil.copyToList(list, UserBrokerageSummaryRespBO.class); 69 return BeanUtil.copyToList(list, UserBrokerageSummaryRespBO.class);
@@ -73,7 +73,7 @@ public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> { @@ -73,7 +73,7 @@ public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> {
73 // .selectCount(BrokerageRecordDO::getId, UserBrokerageSummaryBO::getCount) 73 // .selectCount(BrokerageRecordDO::getId, UserBrokerageSummaryBO::getCount)
74 // .selectSum(BrokerageRecordDO::getPrice) 74 // .selectSum(BrokerageRecordDO::getPrice)
75 // .in(BrokerageRecordDO::getUserId, userIds) 75 // .in(BrokerageRecordDO::getUserId, userIds)
76 -// .eq(BrokerageRecordDO::getBizId, bizType) 76 +// .eq(BrokerageRecordDO::getBizType, bizType)
77 // .eq(BrokerageRecordDO::getStatus, status) 77 // .eq(BrokerageRecordDO::getStatus, status)
78 // .groupBy(BrokerageRecordDO::getUserId)); 78 // .groupBy(BrokerageRecordDO::getUserId));
79 } 79 }