解决部分退积分bug

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

@@ -1066,7 +1066,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     List<OrderRefundSku> orderRefundSkus = orderRefundSkuMapper.selectList(new LambdaQueryWrapper<OrderRefundSku>()
                             .eq(OrderRefundSku::getOrderRefundId, orderRefund.getRefundId()));
                     List<PointsRecord> pointsRecords = pointsRecordMapper.selectList(new LambdaQueryWrapper<PointsRecord>()
-                            .eq(PointsRecord::getOrderNumber, order.getOrderNumber()).eq(PointsRecord::getPointsType, 2).and(wrapper -> wrapper
+                            .eq(PointsRecord::getOrderNumber, order.getOrderNumber())
+                            .eq(PointsRecord::getPointsType, 2)
+                            .and(wrapper -> wrapper
                                     .gt(PointsRecord::getExpiryDate, LocalDateTime.now())
                                     .or()
                                     .isNull(PointsRecord::getExpiryDate)
@@ -1093,7 +1095,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         refundExpiredScore = order.getOffsetPoints() - refundScore;
                         for (PointsRecord pointsRecord : pointsRecords) {
                             //下单支付的金额
-                            int variablePoints = pointsRecord.getVariablePoints().intValue();
+                            int variablePoints = pointsRecord.getVariablePoints().intValue();//574
                             PointsRecord npr = new PointsRecord();
                             BeanUtils.copyProperties(pointsRecord, npr);
                             npr.setId(null);
@@ -1108,12 +1110,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                                 npr.setCurrentlyAvailablePoints(BigDecimal.valueOf(0.0).add(BigDecimal.valueOf(l)));
                             }
                             npr.setCreationDate(new Date());
+                            //574>188
                             if (variablePoints < totalRefundScore) {//下单金额全退
                                 npr.setPoints(pointsRecord.getVariablePoints());
                                 npr.setVariablePoints(BigDecimal.valueOf(0));
                                 totalRefundScore -= variablePoints;
-                            } else {
-                                npr.setPoints(pointsRecord.getVariablePoints().subtract(BigDecimal.valueOf(totalRefundScore)));
+                            } else {//574>188,应退188
+                                npr.setPoints(BigDecimal.valueOf(totalRefundScore));
                                 npr.setVariablePoints(BigDecimal.valueOf(0));
                             }
                             pointsRecordMapper.insert(npr);