添加退款时积分计算

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -1127,6 +1127,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                                 } else {
                                     npr.setCurrentlyAvailablePoints(BigDecimal.valueOf(0.0).add(BigDecimal.valueOf(l)));
                                 }
+                                if (pointsRecord.getExpiryStatus()==2){
+                                    refundExpiredScore += variablePoints;
+                                }
                                 totalRefundScore -= variablePoints;
                             } else {//574>188,应退188
                                 npr.setPoints(BigDecimal.valueOf(totalRefundScore));
@@ -1138,13 +1141,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                                 } else {
                                     npr.setCurrentlyAvailablePoints(BigDecimal.valueOf(0.0).add(BigDecimal.valueOf(l)));
                                 }
+                                if (pointsRecord.getExpiryStatus()==2){
+                                    refundExpiredScore += totalRefundScore;
+                                }
                                 totalRefundScore=0;
-
                             }
 
-                            if (pointsRecord.getExpiryStatus()==2){
-                                refundExpiredScore += totalRefundScore;
-                            }
+
                             pointsRecordMapper.insert(npr);
                             if (totalRefundScore==0 && shoppingScore>=refundOffsetPoints) {
                                 orderRefund.setRefundAmount(refundActual.doubleValue());