|
|
@@ -1144,7 +1144,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
refundExpiredScore += variablePoints;
|
|
|
}
|
|
|
totalRefundScore -= variablePoints;
|
|
|
- } else {//574>188,应退188
|
|
|
+ } else if(totalRefundScore>0){//574>188,应退188
|
|
|
npr.setPoints(BigDecimal.valueOf(totalRefundScore));
|
|
|
npr.setVariablePoints(BigDecimal.valueOf(0));
|
|
|
npr.setPointsAudit(1);
|
|
|
@@ -1159,8 +1159,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
}
|
|
|
totalRefundScore=0;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
pointsRecordMapper.insert(npr);
|
|
|
if (totalRefundScore==0 && shoppingScore>=refundOffsetPoints) {
|
|
|
orderRefund.setRefundAmount(refundActual.doubleValue());
|