ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 5f6ad8d2fc602b93950eb1eb98e80977df8a76f3 2 parents 2c6aa6e7 0ac46cd0

Merge branch 'hotfix-invite-activity-2' into test6.9.1

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
@@ -2,6 +2,7 @@ package com.yohoufo.order.service.impl; @@ -2,6 +2,7 @@ package com.yohoufo.order.service.impl;
2 2
3 import com.google.common.annotations.VisibleForTesting; 3 import com.google.common.annotations.VisibleForTesting;
4 import com.google.common.collect.Lists; 4 import com.google.common.collect.Lists;
  5 +import com.yohoufo.common.utils.DateUtil;
5 import com.yohoufo.dal.order.InviteSettlementItemMapper; 6 import com.yohoufo.dal.order.InviteSettlementItemMapper;
6 import com.yohoufo.dal.order.InviteSettlementMapper; 7 import com.yohoufo.dal.order.InviteSettlementMapper;
7 import com.yohoufo.dal.order.InviterMapper; 8 import com.yohoufo.dal.order.InviterMapper;
@@ -146,7 +147,7 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -146,7 +147,7 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
146 .setOrderAmount(formatAmount("%s%s", RMB_FLAG, item.getOrderAmount())) 147 .setOrderAmount(formatAmount("%s%s", RMB_FLAG, item.getOrderAmount()))
147 .setOrderCreateTime(formatYYMMddHHmmssPoint(item.getOrderCreateTime())) 148 .setOrderCreateTime(formatYYMMddHHmmssPoint(item.getOrderCreateTime()))
148 .setSettleAmount(formatAmount("%s%s", RMB_FLAG, item.getSettleAmount())) 149 .setSettleAmount(formatAmount("%s%s", RMB_FLAG, item.getSettleAmount()))
149 - .setStatusDesc(itemHasPaid.test(item) ? "已付款" : "待付款")) 150 + .setStatusDesc(itemHasPaid.test(item) ? "已打款" : "待打款"))
150 .collect(Collectors.toList())) 151 .collect(Collectors.toList()))
151 .build(); 152 .build();
152 } 153 }
@@ -210,6 +211,7 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -210,6 +211,7 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
210 List<InviteSettlement> settlements = inviteSettlementMapper.selectByIds(ids); 211 List<InviteSettlement> settlements = inviteSettlementMapper.selectByIds(ids);
211 settlements.stream().forEach(settlement -> { 212 settlements.stream().forEach(settlement -> {
212 log.info("mark settlement to paid, settle id is {}", settlement.getId()); 213 log.info("mark settlement to paid, settle id is {}", settlement.getId());
  214 + settlement.setPaidTime(DateUtil.getCurrentTimeSecond());
213 settlement.setStatus(InviteSettlement.STATUS_PAID); 215 settlement.setStatus(InviteSettlement.STATUS_PAID);
214 inviteSettlementMapper.updateByUidAndId(settlement); 216 inviteSettlementMapper.updateByUidAndId(settlement);
215 inviteSettlementItemMapper.updateStatusByUidAndInviteSettlementId(settlement.getUid(), settlement.getId(), InviteSettlementItem.STATUS_PAID); 217 inviteSettlementItemMapper.updateStatusByUidAndInviteSettlementId(settlement.getUid(), settlement.getId(), InviteSettlementItem.STATUS_PAID);