|
|
|
@@ -247,6 +247,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
//计算返现金额 |
|
|
|
BigDecimal cashBackPrice = record.getOrderMoney() |
|
|
|
.multiply(grantAwardsItem.getCashBackRatio().divide(new BigDecimal(100))); |
|
|
|
if(grantAwardsItem.getLimitPrice() != null && grantAwardsItem.getLimitPrice().compareTo(BigDecimal.ZERO) > 0 |
|
|
|
&& grantAwardsItem.getLimitPrice().compareTo(cashBackPrice) < 0 ){ |
|
|
|
cashBackPrice = grantAwardsItem.getLimitPrice(); |
|
|
|
} |
|
|
|
cashBackPriceTotal = cashBackPriceTotal.add(cashBackPrice); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -782,6 +786,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
//计算返现金额 |
|
|
|
BigDecimal cashBackPrice = record.getOrderMoney() |
|
|
|
.multiply(grantAwardsItem.getCashBackRatio().divide(new BigDecimal(100))); |
|
|
|
if(grantAwardsItem.getLimitPrice() != null && grantAwardsItem.getLimitPrice().compareTo(BigDecimal.ZERO) > 0 |
|
|
|
&& grantAwardsItem.getLimitPrice().compareTo(cashBackPrice) < 0 ){ |
|
|
|
cashBackPrice = grantAwardsItem.getLimitPrice(); |
|
|
|
} |
|
|
|
|
|
|
|
grantAwardsItem.setPrice(cashBackPrice); |
|
|
|
handlerGrantItem(grantGrantItem,activity,activityItem,grantAwardsItem); |
|
|
|
@@ -1115,6 +1123,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
Map<String,Object> orderMap = new HashMap<>(); |
|
|
|
orderMap.put("orderNo",offlineActivityGrantRecord.getOrderNo()); |
|
|
|
orderMap.put("orderMoney",offlineActivityGrantRecord.getOrderMoney()); |
|
|
|
orderMap.put("orderAddress",offlineActivityGrantRecord.getCusAddress()); |
|
|
|
orderMap.put("merchantName",offlineActivityGrantRecord.getMerchantId()!=null?merchantMap.get(offlineActivityGrantRecord.getMerchantId()):""); |
|
|
|
orderMap.put("shopNumber",offlineActivityGrantRecord.getMerchantId()!=null?merchantShopNumberMap.get(offlineActivityGrantRecord.getMerchantId()):""); |
|
|
|
orderMap.put("businessName",offlineActivityGrantRecord.getBusinessId()!=null?bussinessMap.get(offlineActivityGrantRecord.getBusinessId()).getTitle():""); |
|
|
|
@@ -1354,6 +1363,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
entity13_list.add(entity13_1); |
|
|
|
ExcelExportEntity entity13_2 = new ExcelExportEntity("订单金额","orderMoney",20); |
|
|
|
entity13_list.add(entity13_2); |
|
|
|
|
|
|
|
ExcelExportEntity entity13_2_ = new ExcelExportEntity("订单地址","orderAddress",20); |
|
|
|
entity13_list.add(entity13_2_); |
|
|
|
|
|
|
|
ExcelExportEntity entity13_3 = new ExcelExportEntity("商户名称","merchantName",20); |
|
|
|
entity13_list.add(entity13_3); |
|
|
|
ExcelExportEntity entity13_4 = new ExcelExportEntity("铺位号","shopNumber",20); |
|
|
|
|