From b551545a93686e87e4a3d41736d586bc1f0ad8e0 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 17 May 2024 07:37:00 +0800 Subject: [PATCH] fix --- .../market/WxRaffleActivityController.java | 3 +++ .../service/impl/WxRaffleActivityServiceImpl.java | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java index 6544b8eb9..e55912587 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java @@ -325,6 +325,9 @@ public class WxRaffleActivityController extends BaseController { public ResultData calRecordMoney(@RequestBody WxRaffleActivityRecordItem wxCashBackActivityRecord) { TenantEntity tenantEntity = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantEntity); + if (null == wxCashBackActivityRecord.getItemId() || null == wxCashBackActivityRecord.getItemSize()) { + return new ResultData(Result.ERROR,"请选择选项和数量"); + } wxCashBackActivityService.calcuteMoney(wxCashBackActivityRecord); return new ResultData(wxCashBackActivityRecord); } 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 06c550f70..68225dd00 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -473,15 +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); 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); } + wxActivityRecordItemMapper.insert(_ri); } } }