|
|
@@ -1937,7 +1937,11 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
grantItemObject.put("startingTaxPoint",grantItem.getStartingTaxPoint()); |
|
|
grantItemObject.put("startingTaxPoint",grantItem.getStartingTaxPoint()); |
|
|
grantItemObject.put("taxPoints",grantItem.getTaxPoints()); |
|
|
grantItemObject.put("taxPoints",grantItem.getTaxPoints()); |
|
|
grantItemObject.put("taxPointsAmount",grantItem.getTaxPointsAmount()); |
|
|
grantItemObject.put("taxPointsAmount",grantItem.getTaxPointsAmount()); |
|
|
grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice().subtract(grantItem.getTaxPointsAmount())); |
|
|
|
|
|
|
|
|
if(grantItem.getTaxPointsAmount() != null){ |
|
|
|
|
|
grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice().subtract(grantItem.getTaxPointsAmount())); |
|
|
|
|
|
}else{ |
|
|
|
|
|
grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if(grantItemCount != null){ |
|
|
if(grantItemCount != null){ |
|
|
List<String> orderNos = grantItemCountRecordMap.get(grantItemCount.getGrantItemId()); |
|
|
List<String> orderNos = grantItemCountRecordMap.get(grantItemCount.getGrantItemId()); |
|
|
|