处理积分退款到账积分问题

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

@@ -1093,7 +1093,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 //                            ).orderByDesc(PointsRecord::getExpiryDate));
                     //TODO (int) Arith.mul(order.getFreightAmount(), 100),加在这里就是每次部分退单都要减掉，有可能会出现退的积分比下单总积分少。少的值恰好为一次运费
                     int totalRefundScore = 0;//需要退款的金额，部分退款时不需要退运费。
-                    int freightAmountScore = -(int) Arith.mul(order.getFreightAmount(), 100);//需要退的总积分,先把运费剔除掉
+//                    int freightAmountScore = -(int) Arith.mul(order.getFreightAmount(), 100);//需要退的总积分,先把运费剔除掉
                     double totalRefundActual = 0.0;//需要退的总金额
                     int shoppingScore= 0;
                     for (OrderRefundSku refundSkus : orderRefundSkus) {
@@ -1101,7 +1101,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         OrderItem orderItem = orderItemMapper.selectById(refundSkus.getOrderItemId());
                         Double actualTotal = orderItem.getActualTotal();//付的钱
                         Integer useScore = orderItem.getUseScore();//使用的总积分
-                        shoppingScore = useScore +freightAmountScore;//商品的总金额积分
+                        shoppingScore = useScore ;//商品的总金额积分 商品明细表不会包含运费
                         if (useScore > 0) {
                             //退的积分不一定等于下单的数量
                             totalRefundScore = (int) (totalRefundScore + Arith.mul(productCount * orderItem.getPrice(), 100));
@@ -1110,7 +1110,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                             totalRefundActual = Arith.add(totalRefundActual, productCount * orderItem.getPrice());
                         }
                     }
-
+                    log.info("退款积分：refundOffsetPoints："+refundOffsetPoints +";shoppingScore："+shoppingScore+";totalRefundScore:"+totalRefundScore);
                     //退积分
                     if (totalRefundScore > 0) {
                         refundScore = (long) totalRefundScore;
@@ -1144,6 +1144,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                                     refundExpiredScore += variablePoints;
                                 }
                                 totalRefundScore -= variablePoints;
+                                pointsRecordMapper.insert(npr);
                             } else if(totalRefundScore>0){//574>188,应退188
                                 npr.setPoints(BigDecimal.valueOf(totalRefundScore));
                                 npr.setVariablePoints(BigDecimal.valueOf(0));
@@ -1158,8 +1159,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                                     refundExpiredScore += totalRefundScore;
                                 }
                                 totalRefundScore=0;
+                                pointsRecordMapper.insert(npr);
                             }
-                            pointsRecordMapper.insert(npr);
+                            log.info("退积分：当前退款金额为：totalRefundScore："+totalRefundScore);
                             if (totalRefundScore==0 && shoppingScore>=refundOffsetPoints) {
                                 orderRefund.setRefundAmount(refundActual.doubleValue());
                                 orderRefund.setOffsetPoints(refundScore);