|
...
|
...
|
@@ -2,6 +2,7 @@ package com.yohoufo.order.service.impl; |
|
|
|
|
|
|
|
import com.google.common.annotations.VisibleForTesting;
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
import com.yohoufo.common.utils.DateUtil;
|
|
|
|
import com.yohoufo.dal.order.InviteSettlementItemMapper;
|
|
|
|
import com.yohoufo.dal.order.InviteSettlementMapper;
|
|
|
|
import com.yohoufo.dal.order.InviterMapper;
|
|
...
|
...
|
@@ -146,7 +147,7 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { |
|
|
|
.setOrderAmount(formatAmount("%s%s", RMB_FLAG, item.getOrderAmount()))
|
|
|
|
.setOrderCreateTime(formatYYMMddHHmmssPoint(item.getOrderCreateTime()))
|
|
|
|
.setSettleAmount(formatAmount("%s%s", RMB_FLAG, item.getSettleAmount()))
|
|
|
|
.setStatusDesc(itemHasPaid.test(item) ? "已付款" : "待付款"))
|
|
|
|
.setStatusDesc(itemHasPaid.test(item) ? "已打款" : "待打款"))
|
|
|
|
.collect(Collectors.toList()))
|
|
|
|
.build();
|
|
|
|
}
|
|
...
|
...
|
@@ -210,6 +211,7 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { |
|
|
|
List<InviteSettlement> settlements = inviteSettlementMapper.selectByIds(ids);
|
|
|
|
settlements.stream().forEach(settlement -> {
|
|
|
|
log.info("mark settlement to paid, settle id is {}", settlement.getId());
|
|
|
|
settlement.setPaidTime(DateUtil.getCurrentTimeSecond());
|
|
|
|
settlement.setStatus(InviteSettlement.STATUS_PAID);
|
|
|
|
inviteSettlementMapper.updateByUidAndId(settlement);
|
|
|
|
inviteSettlementItemMapper.updateStatusByUidAndInviteSettlementId(settlement.getUid(), settlement.getId(), InviteSettlementItem.STATUS_PAID);
|
...
|
...
|
|
