| @@ -473,13 +473,15 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| for (int i = 0 ;i < record.getRecordItemList().size() ; i ++) { | for (int i = 0 ;i < record.getRecordItemList().size() ; i ++) { | ||||
| WxRaffleActivityRecordItem _ri = record.getRecordItemList().get(i); | WxRaffleActivityRecordItem _ri = record.getRecordItemList().get(i); | ||||
| _ri.setId(idWorker.nextId()); | |||||
| _ri.setActivityId(r.getActivityId()); | |||||
| _ri.setMerchantId(r.getMerchantId()); | |||||
| _ri.setRecordId(r.getId()); | |||||
| _ri.updateTenantInfo(r); | |||||
| calcuteMoney(_ri); | |||||
| wxActivityRecordItemMapper.insert(_ri); | |||||
| if (null != ri.getItemId()) { | |||||
| _ri.setId(idWorker.nextId()); | |||||
| _ri.setActivityId(r.getActivityId()); | |||||
| _ri.setMerchantId(r.getMerchantId()); | |||||
| _ri.setRecordId(r.getId()); | |||||
| _ri.updateTenantInfo(r); | |||||
| calcuteMoney(_ri); | |||||
| wxActivityRecordItemMapper.insert(_ri); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -491,6 +493,9 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { | |||||
| record.setCashMoney(item.getTotalMoney().setScale(3,BigDecimal.ROUND_HALF_UP)); | record.setCashMoney(item.getTotalMoney().setScale(3,BigDecimal.ROUND_HALF_UP)); | ||||
| record.setMallRate(item.getMallBackRate()); | record.setMallRate(item.getMallBackRate()); | ||||
| record.setMerchantRate(item.getMerchantBackRate()); | record.setMerchantRate(item.getMerchantBackRate()); | ||||
| if (null == record.getItemSize()) { | |||||
| record.setItemSize(1); | |||||
| } | |||||
| if (moneyRule == EnumCashBackActivityItemRule.MALL_ONLY) { | if (moneyRule == EnumCashBackActivityItemRule.MALL_ONLY) { | ||||
| record.setMallCashMoney(record.getCashMoney().multiply(new BigDecimal(record.getItemSize()))); | record.setMallCashMoney(record.getCashMoney().multiply(new BigDecimal(record.getItemSize()))); | ||||
| record.setMerchantCashMoney(new BigDecimal(0)); | record.setMerchantCashMoney(new BigDecimal(0)); | ||||