From e97065519838a1ebbee870eefae6eae9f5d91647 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 十一月 2019 14:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 8c63aa1..45dbbbf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -494,6 +494,9 @@
order.setVipOrder(false);
} else
order.setVipOrder(false);
+
+ if(order.isVipOrder())
+ order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
}
for (CommonOrderVO order : listOrder) {
--
Gitblit v1.8.0