| @@ -1408,9 +1408,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPoints_c",grantItem.getTaxPoints()); | activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPoints_c",grantItem.getTaxPoints()); | ||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPointsAmount_c",grantItem.getTaxPointsAmount()); | activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPointsAmount_c",grantItem.getTaxPointsAmount()); | ||||
| if(grantItem.getTaxPointsAmount() != null){ | if(grantItem.getTaxPointsAmount() != null){ | ||||
| activityGrantObject.put("_realCashBackPrice_c",grantItem.getAwardPrice().subtract(grantItem.getTaxPointsAmount())); | |||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_realCashBackPrice_c",grantItem.getAwardPrice().subtract(grantItem.getTaxPointsAmount())); | |||||
| }else{ | }else{ | ||||
| activityGrantObject.put("_realCashBackPrice_c",grantItem.getAwardPrice()); | |||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_realCashBackPrice_c",grantItem.getAwardPrice()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1421,9 +1421,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPoints_s",cashBack.getTaxPoints()); | activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPoints_s",cashBack.getTaxPoints()); | ||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPointsAmount_s",cashBack.getTaxPointsAmount()); | activityGrantObject.put(String.valueOf(activityItem.getId())+"_taxPointsAmount_s",cashBack.getTaxPointsAmount()); | ||||
| if(cashBack.getTaxPointsAmount() != null){ | if(cashBack.getTaxPointsAmount() != null){ | ||||
| activityGrantObject.put("_realCashBackPrice_s",cashBack.getCashBackPrice().subtract(cashBack.getTaxPointsAmount())); | |||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_realCashBackPrice_s",cashBack.getCashBackPrice().subtract(cashBack.getTaxPointsAmount())); | |||||
| }else{ | }else{ | ||||
| activityGrantObject.put("_realCashBackPrice_s",cashBack.getCashBackPrice()); | |||||
| activityGrantObject.put(String.valueOf(activityItem.getId())+"_realCashBackPrice_s",cashBack.getCashBackPrice()); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||