Browse Source

//bug

release_toaliyun_real
xiaohu 1 year ago
parent
commit
0ce5949ec5
1 changed files with 18 additions and 18 deletions
  1. +18
    -18
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java

+ 18
- 18
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java View File

@@ -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);
// }
}
}
}


Loading…
Cancel
Save