Skip to content

G
gxpt_ht
Commit 3a875cf8 by 吕明尚
Options

Merge branch 'dev' into test

parents eae986dd 7255c7ce
Showing with 1 additions and 0 deletions
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
...@@ -2738,6 +2738,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -2738,6 +2738,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) { if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, byId, payPrice); totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, byId, payPrice);
} else { } else {
queryWrapper.eq(Activity::getLabelId, roomLabel.getLabelId());
queryWrapper.eq(Activity::getPackId, roomLabel.getPackId()); queryWrapper.eq(Activity::getPackId, roomLabel.getPackId());
activity = activityService.getOne(queryWrapper); activity = activityService.getOne(queryWrapper);
totalFee = getBigDecimal(request, activity, payPrice, user, consumerMember); totalFee = getBigDecimal(request, activity, payPrice, user, consumerMember);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment