|
@@ -1045,6 +1045,11 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
|
|
|
//剩余积分
|
|
//剩余积分
|
|
|
BigDecimal remainPoints = points.subtract(needSubPoints);
|
|
BigDecimal remainPoints = points.subtract(needSubPoints);
|
|
|
distributeWaitingSendPoints.setPoints(remainPoints);
|
|
distributeWaitingSendPoints.setPoints(remainPoints);
|
|
|
|
|
+ //原先获取积分也扣除
|
|
|
|
|
+ if (distributeWaitingSendPoints.getOriPoints().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
|
+ BigDecimal oriNeedSubPoints = distributeWaitingSendPoints.getOriPoints().multiply(refundRate);
|
|
|
|
|
+ distributeWaitingSendPoints.setOriPoints(distributeWaitingSendPoints.getOriPoints().subtract(oriNeedSubPoints));
|
|
|
|
|
+ }
|
|
|
distributeWaitingSendPointsMapper.updateById(distributeWaitingSendPoints);
|
|
distributeWaitingSendPointsMapper.updateById(distributeWaitingSendPoints);
|
|
|
}
|
|
}
|
|
|
} else if (sendStatus == DistributeWaitingSendPoints.Status.success) {
|
|
} else if (sendStatus == DistributeWaitingSendPoints.Status.success) {
|
|
@@ -1071,6 +1076,11 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
|
|
|
//部分退款
|
|
//部分退款
|
|
|
distributeWaitingSendPoints.setRefundPoints(needSubPoints);
|
|
distributeWaitingSendPoints.setRefundPoints(needSubPoints);
|
|
|
distributeWaitingSendPoints.setPoints(points.subtract(needSubPoints));
|
|
distributeWaitingSendPoints.setPoints(points.subtract(needSubPoints));
|
|
|
|
|
+ //原先获取积分也扣除
|
|
|
|
|
+ if (distributeWaitingSendPoints.getOriPoints().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
|
+ BigDecimal oriNeedSubPoints = distributeWaitingSendPoints.getOriPoints().multiply(refundRate);
|
|
|
|
|
+ distributeWaitingSendPoints.setOriPoints(distributeWaitingSendPoints.getOriPoints().subtract(oriNeedSubPoints));
|
|
|
|
|
+ }
|
|
|
distributeWaitingSendPointsMapper.updateById(distributeWaitingSendPoints);
|
|
distributeWaitingSendPointsMapper.updateById(distributeWaitingSendPoints);
|
|
|
}
|
|
}
|
|
|
|
|
|