From 10ee47b2668374436f4ce0ab1665818a573e3f87 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 20 十一月 2018 13:15:13 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
index 7aad2bb..b25417e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
@@ -272,7 +272,10 @@
HongBao.TYPE_SHARE_GOODS, HongBao.STATE_BUKELINGQU, new Date().getTime(),
new Date().getTime(), 0, "192.168.1.1", "绯荤粺娣诲姞");
hongBao.setOrderId(order.getOrderId());
- hongBao.setPayMoney(order.getPayMoney());
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(order.getState()))
+ hongBao.setPayMoney(order.getFinalMoney());
+ else
+ hongBao.setPayMoney(order.getPayMoney());
if (order.getBalanceTime() != null)
hongBao.setBalanceTime(order.getBalanceTime());
--
Gitblit v1.8.0