소스 검색

Merge remote-tracking branch 'origin/master'

wangming 21 시간 전
부모
커밋
612383f412
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

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

@@ -1132,13 +1132,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                                 npr.setPoints(BigDecimal.valueOf(totalRefundScore));
                                 npr.setVariablePoints(BigDecimal.valueOf(0));
                                 npr.setPointsAudit(2);
-                                totalRefundScore=0;
                                 if (pointsRecord.getExpiryStatus()==1){//当过期状态等于1时才进行变更可用金额 否则不变更
                                     BigDecimal bigDecimal = BigDecimal.valueOf(totalRefundScore);
                                     npr.setCurrentlyAvailablePoints(bigDecimal.add(BigDecimal.valueOf(l)));
                                 } else {
                                     npr.setCurrentlyAvailablePoints(BigDecimal.valueOf(0.0).add(BigDecimal.valueOf(l)));
                                 }
+                                totalRefundScore=0;
+
                             }
 
                             if (pointsRecord.getExpiryStatus()==2){