From 7f2f5ef5637a6871f4329e464eeba97eb59e94a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 10:45:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java
index db4bd04..bba8948 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java
@@ -42,6 +42,7 @@
 				update.setGoodsName(order.getGoodsName());
 				update.setGoodsPrice(order.getGoodsPrice());
 				update.setUpdateTime(new Date());
+				update.setOrderReceiveTime(order.getOrderReceiveTime());
 				pddOrderMapper.updateByPrimaryKeySelective(update);
 				return pddOrderMapper.selectByPrimaryKey(old.getId());
 			}

--
Gitblit v1.8.0