|
@@ -1117,7 +1117,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
//退积分
|
|
//退积分
|
|
|
if (totalRefundScore > 0) {
|
|
if (totalRefundScore > 0) {
|
|
|
refundScore = (long) totalRefundScore;
|
|
refundScore = (long) totalRefundScore;
|
|
|
- if (shoppingScore>=refundOffsetPoints){
|
|
|
|
|
for (PointsRecord pointsRecord : pointsRecords) {
|
|
for (PointsRecord pointsRecord : pointsRecords) {
|
|
|
//下单支付的金额
|
|
//下单支付的金额
|
|
|
int variablePoints = pointsRecord.getVariablePoints().intValue();//574
|
|
int variablePoints = pointsRecord.getVariablePoints().intValue();//574
|
|
@@ -1176,8 +1175,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
//退钱
|
|
//退钱
|
|
|
if (totalRefundActual > 0) {
|
|
if (totalRefundActual > 0) {
|