diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 0ec878896..f69552e2f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1215,43 +1215,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } } - // public List> calculateUnfreezeAmountOld(BigDecimal orderAmount, List payRecordList) { - // List> resultList = Lists.newArrayList(); - // - // BigDecimal tempAmount = new BigDecimal(orderAmount.toString()); // 临时金额 - // for (OrderPayRecord record : payRecordList) { - // JSONObject jsonObject = JSON.parseObject(record.getDeductionRecord()); - // String paymentId = jsonObject.getString("paymentId"); - // // BigDecimal amount = jsonObject.getBigDecimal("amount"); - // BigDecimal payAmount = record.getPayAmount(); // 此交易单支付的金额 - // // 该笔支付扣除金额 - // BigDecimal deductionAmount; - // // 该笔支付解冻金额 - // BigDecimal unfreezeAmount = null; - // // 临时消费金额 = 临时消费金额 - 该笔交易的剩余金额 - // tempAmount = tempAmount.subtract(payAmount); - // if (tempAmount.compareTo(BigDecimal.ZERO) >= 0) { - // // 计算以后,大于等于0,说明这笔支付剩余金额需要扣完,还要继续扣下一笔 - // deductionAmount = payAmount; - // unfreezeAmount = payAmount.subtract(deductionAmount); // 支付金额 - 扣除金额 = 需要退回的金额 - // Map map = Maps.newHashMap(); - // map.put("paymentId", paymentId); - // map.put("unfreezeAmount", unfreezeAmount); - // resultList.add(map); - // } else { - // // 如果小于0,则说明该笔交易的剩余金额用不完,扣除金额等于临时消费金额,并结束循环 - // deductionAmount = payAmount.add(tempAmount); // 该笔交易的剩余金额加上一个负数临时消费金额,就是该笔交易扣除金额 - // unfreezeAmount = payAmount.subtract(deductionAmount); // 支付金额 - 扣除金额 = 需要退回的金额 - // Map map = Maps.newHashMap(); - // map.put("paymentId", paymentId); - // map.put("unfreezeAmount", unfreezeAmount); - // resultList.add(map); - // // break; - // } - // } - // return resultList; - // } - /** * 计算解冻金额 * @param orderAmount 订单消费金额