From 3a23ca344c023425de4e80a35aebb803937c1398 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Mon, 10 Mar 2025 10:59:09 +0800 Subject: [PATCH] //offline --- .../service/impl/WxOfflineActivityGrantAwardServiceImpl.java | 5 +++++ .../impl/WxOfflineActivityGrantSettlementServiceImpl.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index c11b1069e..dfb3c4904 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -475,6 +475,11 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity if(prop.compareTo(BigDecimal.ONE) < 0){ for (WxOfflineActivityGrantItem grantItem:grantItemList){ grantItem.setAwardPrice(awardsRulePrice(grantItem.getAwardPrice().multiply(prop),activityItem.getAwardsItemRule())); + + grantItem.setMallSharePrice(grantItem.getAwardPrice() + .multiply(grantItem.getMallShareRate().divide(new BigDecimal(100))) + .setScale(2, RoundingMode.HALF_UP)); + grantItem.setMerchantSharePrice(grantItem.getAwardPrice().subtract(grantItem.getMallSharePrice())); } } activityItem.setActivityGrantItemList(grantItemList); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java index 8ee18471e..4cac04fd6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java @@ -98,6 +98,10 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct } for (WxOfflineActivityGrantItem wxOfflineActivityGrantItem : activityItem.getActivityGrantItemList()) { + if(wxOfflineActivityGrantItem.getAwardPrice().compareTo(BigDecimal.ZERO) == 0){ + continue; + } + List itemSettlementList = new ArrayList<>(); if(wxOfflineActivityGrantItem.getRecordId() != null){ WxOfflineActivityGrantSettlement settlement = new WxOfflineActivityGrantSettlement();