Browse Source

//offline

release_toaliyun_real
xiaohu 1 year ago
parent
commit
3a23ca344c
2 changed files with 9 additions and 0 deletions
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java View File

@@ -475,6 +475,11 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
if(prop.compareTo(BigDecimal.ONE) < 0){ if(prop.compareTo(BigDecimal.ONE) < 0){
for (WxOfflineActivityGrantItem grantItem:grantItemList){ for (WxOfflineActivityGrantItem grantItem:grantItemList){
grantItem.setAwardPrice(awardsRulePrice(grantItem.getAwardPrice().multiply(prop),activityItem.getAwardsItemRule())); 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); activityItem.setActivityGrantItemList(grantItemList);


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java View File

@@ -98,6 +98,10 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
} }


for (WxOfflineActivityGrantItem wxOfflineActivityGrantItem : activityItem.getActivityGrantItemList()) { for (WxOfflineActivityGrantItem wxOfflineActivityGrantItem : activityItem.getActivityGrantItemList()) {
if(wxOfflineActivityGrantItem.getAwardPrice().compareTo(BigDecimal.ZERO) == 0){
continue;
}

List<WxOfflineActivityGrantSettlement> itemSettlementList = new ArrayList<>(); List<WxOfflineActivityGrantSettlement> itemSettlementList = new ArrayList<>();
if(wxOfflineActivityGrantItem.getRecordId() != null){ if(wxOfflineActivityGrantItem.getRecordId() != null){
WxOfflineActivityGrantSettlement settlement = new WxOfflineActivityGrantSettlement(); WxOfflineActivityGrantSettlement settlement = new WxOfflineActivityGrantSettlement();


Loading…
Cancel
Save