Merge branch 'hotfix-invite-activity-2' into gray

LUOXC
Commit c8f76f85033ba4449392fd629572ee31d122d2e1 2 parents 1b3e3dad 179e58b1
Showing 1 changed file with 1 additions and 1 deletions
order/src/main/java/com/yohoufo/order/service/impl/InviteSettlementServiceImpl.java
--- a/order/src/main/java/com/yohoufo/order/service/impl/InviteSettlementServiceImpl.java
View file @c8f76f8
+++ b/order/src/main/java/com/yohoufo/order/service/impl/InviteSettlementServiceImpl.java
View file @c8f76f8
@@ -146,7 +146,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();
     }