From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/jd/NYouHuiServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/jd/NYouHuiServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/jd/NYouHuiServiceImpl.java
index 918f0f5..608cfcd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/jd/NYouHuiServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/jd/NYouHuiServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.impl.goods.jd;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -24,7 +25,7 @@
 		if (goods.getSkuId() == null || StringUtil.isNullOrEmpty(goods.getDesc())
 				|| StringUtil.isNullOrEmpty(goods.getName()))
 			return;
-		if(goods.getUpdateTime()==null)
+		if (goods.getUpdateTime() == null)
 			goods.setUpdateTime(new Date());
 		nyouHuiGoodsDao.save(goods);
 	}
@@ -34,4 +35,14 @@
 		return nyouHuiGoodsDao.selectByName(name);
 	}
 
+	@Override
+	public List<NYouHuiGoods> list(int page, int pageSize) {
+		return nyouHuiGoodsDao.list((page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public long count() {
+		return nyouHuiGoodsDao.count();
+	}
+
 }

--
Gitblit v1.8.0