From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java | 6 ++++++
1 files changed, 6 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..e70e7da 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());
}
@@ -65,4 +66,9 @@
return pddList;
}
+ @Override
+ public List<PDDOrder> listByStatus(Integer status, int page, int pageSize) {
+ return pddOrderMapper.listByStatus(status, (page - 1) * pageSize, pageSize);
+ }
+
}
--
Gitblit v1.8.0