Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 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();

   }



}