From 3f4d737464fbb1905b7b779b8a50b7a1fa363f4c Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 3 Mar 2024 14:14:03 +0800 Subject: [PATCH] fix --- .../controller/market/WxCashBackActivityController.java | 2 ++ .../iformall/service/impl/WxCashBackActivityServiceImpl.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java index e44f162f3..81a09f4d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -278,6 +278,8 @@ public class WxCashBackActivityController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantEntity); if (wxCashBackActivityRecord.getAuditStatus().intValue() == EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode()) { + WxCashBackActivityRecord _r = wxCashBackActivityService.getActivityRecordById(wxCashBackActivityRecord.getId(), tenantEntity.getTenantId()); + wxCashBackActivityRecord.setOrderMoney(_r.getOrderMoney()); wxCashBackActivityService.calcuteMoney(wxCashBackActivityRecord); } wxCashBackActivityService.auditRecord(wxCashBackActivityRecord); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java index f8d046f56..9d1486a75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -358,6 +358,10 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService record.setMerchantCashMoney(record.getCashMoney().multiply(item.getMerchantBackRate()).setScale(2,BigDecimal.ROUND_HALF_UP)); } } + + public static void main(String[] args) { + BigDecimal om = new BigDecimal(67298.870); + } @Override public void saveOrUpdateRecord(WxCashBackActivityRecord record) {