From 0ce5949ec5b74da94413c66a475bf2c1b384a3fa Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Fri, 25 Apr 2025 14:37:37 +0800 Subject: [PATCH] //bug --- ...xOfflineActivityGrantAwardServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 4a3ca0292..333acfea0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -241,24 +241,24 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity activityItem.setIsMeet(true); handleCashback(activity,activityItem,wxOfflineActivityGrantAward.getRecordList()); - WxOfflineActivityGrantCashBack activityGrantCashBack = activityItem.getActivityGrantCashBack(); - - WxOfflineActivityGrantCashBack lastActivityGrantCashBack = getLastActivityGrantCashBack(wxOfflineActivityGrantAward, activity.getId(), activityItem.getId()); - if(lastActivityGrantCashBack != null){ - BigDecimal subtracted = lastActivityGrantCashBack.getCashBackPrice().subtract(lastActivityGrantCashBack.getTaxPointsAmount()); - String msg = "已返现:"+subtracted+"元 "; - if(subtracted.compareTo(activityItem.getCashBackPrice()) > 0){ - msg += "顾客应退:"+subtracted.subtract(activityItem.getCashBackPrice())+"元 "; - }else{ - msg += "应补顾客:"+activityItem.getCashBackPrice().subtract(subtracted)+"元 "; - } - if(lastActivityGrantCashBack.getTaxPointsAmount().compareTo(activityGrantCashBack.getTaxPointsAmount()) > 0){ - msg += "税款退还:"+lastActivityGrantCashBack.getTaxPointsAmount().subtract(activityGrantCashBack.getTaxPointsAmount())+"元 "; - }else{ - msg += "顾客补税:"+activityGrantCashBack.getTaxPointsAmount().subtract(lastActivityGrantCashBack.getTaxPointsAmount())+"元 "; - } - activityItem.setCashBackMsg(msg); - } +// WxOfflineActivityGrantCashBack activityGrantCashBack = activityItem.getActivityGrantCashBack(); +// +// WxOfflineActivityGrantCashBack lastActivityGrantCashBack = getLastActivityGrantCashBack(wxOfflineActivityGrantAward, activity.getId(), activityItem.getId()); +// if(lastActivityGrantCashBack != null){ +// BigDecimal subtracted = lastActivityGrantCashBack.getCashBackPrice().subtract(lastActivityGrantCashBack.getTaxPointsAmount()); +// String msg = "已返现:"+subtracted+"元 "; +// if(subtracted.compareTo(activityItem.getCashBackPrice()) > 0){ +// msg += "顾客应退:"+subtracted.subtract(activityItem.getCashBackPrice())+"元 "; +// }else{ +// msg += "应补顾客:"+activityItem.getCashBackPrice().subtract(subtracted)+"元 "; +// } +// if(lastActivityGrantCashBack.getTaxPointsAmount().compareTo(activityGrantCashBack.getTaxPointsAmount()) > 0){ +// msg += "税款退还:"+lastActivityGrantCashBack.getTaxPointsAmount().subtract(activityGrantCashBack.getTaxPointsAmount())+"元 "; +// }else{ +// msg += "顾客补税:"+activityGrantCashBack.getTaxPointsAmount().subtract(lastActivityGrantCashBack.getTaxPointsAmount())+"元 "; +// } +// activityItem.setCashBackMsg(msg); +// } } } }