From b0c11789e1beda8d13b53c33a8fbaafa8b2d8bd2 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 16 May 2024 21:41:49 +0800 Subject: [PATCH] fix --- .../impl/WxRaffleActivityServiceImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index 3c8d4e2ef..06c550f70 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -473,13 +473,15 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { final IdWorker idWorker = IdWorker.get(); for (int i = 0 ;i < record.getRecordItemList().size() ; 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.setMallRate(item.getMallBackRate()); record.setMerchantRate(item.getMerchantBackRate()); + if (null == record.getItemSize()) { + record.setItemSize(1); + } if (moneyRule == EnumCashBackActivityItemRule.MALL_ONLY) { record.setMallCashMoney(record.getCashMoney().multiply(new BigDecimal(record.getItemSize()))); record.setMerchantCashMoney(new BigDecimal(0));